[Libreoffice-commits] core.git: sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/appl/childwin.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3dfb8552eb84eaf831c4c3eb59c398afc87e9174
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Mar 11 09:26:10 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Mar 11 18:34:35 2021 +0100

    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 at redhat.com>

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;