summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-10-05 14:27:40 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-05 14:47:29 +0100
commit43b13e9b73e425683977473ab171e1e140dba6cc (patch)
treeddc37334272fb10dc732be6b77527fe0a3c84359 /sw/source/uibase
parenteb6d4547a044b3eb7cb8945977e45647a37df28f (diff)
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
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/sidebar/PageColumnPopup.cxx2
-rw-r--r--sw/source/uibase/sidebar/PageMarginPopup.cxx2
-rw-r--r--sw/source/uibase/sidebar/PageOrientationPopup.cxx2
-rw-r--r--sw/source/uibase/sidebar/PageSizePopup.cxx2
4 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/sidebar/PageColumnPopup.cxx b/sw/source/uibase/sidebar/PageColumnPopup.cxx
index a07f712d9843..f9e970c2b698 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 29bf80111bf7..e8e890db29ea 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 2ab1f04eff8f..ab9f5fbd523d 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 c3b20acd0496..178a4a7e5666 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;