summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-03-11 09:26:10 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-03-11 18:34:35 +0100
commit3dfb8552eb84eaf831c4c3eb59c398afc87e9174 (patch)
tree63c0b06f6d2e127291f156735673ba0678397645
parent071df4770dfe421d96d3df748af751eaae6982c3 (diff)
check current floating state of DockingWindow
regression from... commit cf234dc05a3a75199890e953d789bd19b02c1725 Date: Tue Mar 9 20:15:28 2021 +0000 rename SfxChildWindowContext::GetFloatingWindow to what it does Change-Id: Ie52946739439ef66c224f2e388fc407912783bb9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112328 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sfx2/source/appl/childwin.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 35d3f2ecbaf2..b60c53486a3f 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -438,7 +438,7 @@ bool ParentIsFloatingWindow(vcl::Window *pParent)
if (!pParent)
return false;
if (pParent->GetType() == WindowType::DOCKINGWINDOW || pParent->GetType() == WindowType::TOOLBOX)
- return true;
+ return static_cast<DockingWindow*>(pParent)->GetFloatingWindow() != nullptr;
if (pParent->GetType() == WindowType::FLOATINGWINDOW)
return true;
return false;