From 0076e925427bd988708e378e26ebc0def39cf85e Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 7 Jul 2016 14:52:18 +0100
Subject: drop commented out FloatWinPopupFlags lines

Change-Id: I6063e0e5fdf53245dee610c72f8b9fa4543d9cae
---
 vcl/source/window/floatwin.cxx | 3 ---
 vcl/source/window/menu.cxx     | 3 ---
 2 files changed, 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;
-- 
cgit