diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-07 14:52:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-07 14:52:18 +0100 |
| commit | 0076e925427bd988708e378e26ebc0def39cf85e (patch) | |
| tree | 2c112cfd7d21c13d8cc4c280f81674d60b9416d9 | |
| parent | 96c3c11c4110c63dcf3d792eea0a5bab63961df2 (diff) | |
drop commented out FloatWinPopupFlags lines
Change-Id: I6063e0e5fdf53245dee610c72f8b9fa4543d9cae
| -rw-r--r-- | vcl/source/window/floatwin.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/menu.cxx | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index b3af6f0835de..a4abcfba78e9 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -733,11 +733,8 @@ void FloatingWindow::StartPopupMode( ToolBox* pBox, FloatWinPopupFlags nFlags ) nFlags |= FloatWinPopupFlags::NoFocusClose | -// FloatWinPopupFlags::NoMouseClose | FloatWinPopupFlags::AllMouseButtonClose | -// FloatWinPopupFlags::NoMouseRectClose | // #105968# floating toolboxes should close when clicked in (parent's) float rect FloatWinPopupFlags::NoMouseUpClose; -// | FloatWinPopupFlags::NoAppFocusClose; /* * FloatWinPopupFlags::NoKeyClose | diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index b3b2bc1e8fb0..a457784d66bd 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2936,9 +2936,6 @@ sal_uInt16 PopupMenu::ImplExecute( const VclPtr<vcl::Window>& pW, const Rectangl nPopupModeFlags |= FloatWinPopupFlags::NewLevel; nPopupModeFlags |= FloatWinPopupFlags::NoKeyClose | FloatWinPopupFlags::AllMouseButtonClose; - // could be useful during debugging. - // nPopupModeFlags |= FloatWinPopupFlags::NoFocusClose; - bInCallback = true; // set it here, if Activate overridden Activate(); bInCallback = false; |