[Libreoffice-commits] core.git: svx/source sw/source

[Caolán McNamara]

 svx/source/sidebar/area/AreaPropertyPanelBase.cxx     |    3 +--
 svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx |    2 +-
 svx/source/sidebar/text/TextCharacterSpacingPopup.cxx |    2 +-
 svx/source/sidebar/text/TextUnderlinePopup.cxx        |    2 +-
 sw/source/uibase/sidebar/PageColumnPopup.cxx          |    2 +-
 sw/source/uibase/sidebar/PageMarginPopup.cxx          |    2 +-
 sw/source/uibase/sidebar/PageOrientationPopup.cxx     |    2 +-
 sw/source/uibase/sidebar/PageSizePopup.cxx            |    2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 43b13e9b73e425683977473ab171e1e140dba6cc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 5 14:27:40 2016 +0100

    NoAppFocusClose is for menus that have submenus
    
    and don't want the parent menu to be auto popped down
    when the submenu gains focus.
    
    or floating windows that explicitly don't want to go away when they lose focus,
    which all these popups aren't
    
    Change-Id: I53f1f3ac586ff295597c4b9046032d3d976d053e

diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index d65d2bd..a62d414 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -1325,8 +1325,7 @@ IMPL_LINK( AreaPropertyPanelBase, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void )
         mxTrGrPopup = VclPtr<AreaTransparencyGradientPopup>::Create(pToolBox, *this);
     mxTrGrPopup->Rearrange(mpFloatTransparenceItem.get());
     OSL_ASSERT( pToolBox->GetItemCommand(pToolBox->GetCurItemId()) == UNO_SIDEBARGRADIENT);
-    mxTrGrPopup->StartPopupMode(pToolBox, FloatWinPopupFlags::Down |
-                                          FloatWinPopupFlags::NoAppFocusClose);
+    mxTrGrPopup->StartPopupMode(pToolBox, FloatWinPopupFlags::Down);
 }
 
 IMPL_LINK_NOARG(AreaPropertyPanelBase, ChangeTrgrTypeHdl_Impl, ListBox&, void)
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
index 14684e9..d8c549f 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
@@ -41,7 +41,7 @@ VclPtr<SfxPopupWindow> ParaLineSpacingPopup::CreatePopupWindow()
 {
     VclPtr<ParaLineSpacingControl> pControl = VclPtr<ParaLineSpacingControl>::Create(GetSlotId());
 
-    pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoAppFocusClose);
+    pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus);
 
     SetPopupWindow(pControl);
 
diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
index 266b9d3..7ce654f 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
@@ -40,7 +40,7 @@ VclPtr<SfxPopupWindow> TextCharacterSpacingPopup::CreatePopupWindow()
 {
     VclPtr<TextCharacterSpacingControl> pControl = VclPtr<TextCharacterSpacingControl>::Create(GetSlotId());
 
-    pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoAppFocusClose);
+    pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus);
 
     SetPopupWindow(pControl);
 
diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx
index 975861cf..c8fdd69 100644
--- a/svx/source/sidebar/text/TextUnderlinePopup.cxx
+++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx
@@ -45,7 +45,7 @@ void TextUnderlinePopup::initialize( const css::uno::Sequence< css::uno::Any >&
 VclPtr<SfxPopupWindow> TextUnderlinePopup::CreatePopupWindow()
 {
     VclPtr<TextUnderlineControl> pControl = VclPtr<TextUnderlineControl>::Create(GetSlotId());
-    pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoAppFocusClose);
+    pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus);
     SetPopupWindow(pControl);
 
     return pControl;
diff --git a/sw/source/uibase/sidebar/PageColumnPopup.cxx b/sw/source/uibase/sidebar/PageColumnPopup.cxx
index a07f712..f9e970c 100644
--- a/sw/source/uibase/sidebar/PageColumnPopup.cxx
+++ b/sw/source/uibase/sidebar/PageColumnPopup.cxx
@@ -36,7 +36,7 @@ PageColumnPopup::~PageColumnPopup()
 VclPtr<SfxPopupWindow> PageColumnPopup::CreatePopupWindow()
 {
     VclPtr<sw::sidebar::PageColumnControl> pControl = VclPtr<sw::sidebar::PageColumnControl>::Create(GetSlotId());
-    pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoAppFocusClose);
+    pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus);
     SetPopupWindow(pControl);
 
     return pControl;
diff --git a/sw/source/uibase/sidebar/PageMarginPopup.cxx b/sw/source/uibase/sidebar/PageMarginPopup.cxx
index 29bf801..e8e890d 100644
--- a/sw/source/uibase/sidebar/PageMarginPopup.cxx
+++ b/sw/source/uibase/sidebar/PageMarginPopup.cxx
@@ -36,7 +36,7 @@ PageMarginPopup::~PageMarginPopup()
 VclPtr<SfxPopupWindow> PageMarginPopup::CreatePopupWindow()
 {
     VclPtr<sw::sidebar::PageMarginControl> pControl = VclPtr<sw::sidebar::PageMarginControl>::Create(GetSlotId());
-    pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoAppFocusClose);
+    pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus);
     SetPopupWindow(pControl);
 
     return pControl;
diff --git a/sw/source/uibase/sidebar/PageOrientationPopup.cxx b/sw/source/uibase/sidebar/PageOrientationPopup.cxx
index 2ab1f04..ab9f5fb 100644
--- a/sw/source/uibase/sidebar/PageOrientationPopup.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationPopup.cxx
@@ -36,7 +36,7 @@ PageOrientationPopup::~PageOrientationPopup()
 VclPtr<SfxPopupWindow> PageOrientationPopup::CreatePopupWindow()
 {
     VclPtr<sw::sidebar::PageOrientationControl> pControl = VclPtr<sw::sidebar::PageOrientationControl>::Create(GetSlotId());
-    pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoAppFocusClose);
+    pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus);
     SetPopupWindow(pControl);
 
     return pControl;
diff --git a/sw/source/uibase/sidebar/PageSizePopup.cxx b/sw/source/uibase/sidebar/PageSizePopup.cxx
index c3b20ac..178a4a7 100644
--- a/sw/source/uibase/sidebar/PageSizePopup.cxx
+++ b/sw/source/uibase/sidebar/PageSizePopup.cxx
@@ -36,7 +36,7 @@ PageSizePopup::~PageSizePopup()
 VclPtr<SfxPopupWindow> PageSizePopup::CreatePopupWindow()
 {
     VclPtr<sw::sidebar::PageSizeControl> pControl = VclPtr<sw::sidebar::PageSizeControl>::Create(GetSlotId());
-    pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoAppFocusClose);
+    pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus);
     SetPopupWindow(pControl);
 
     return pControl;