[Libreoffice-commits] core.git: Branch 'feature/lok_dialog2' - sfx2/source

[Pranav Kant]

 sfx2/source/appl/workwin.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 24f8a2ae3b1f8962f69375a507af6fade2be2230
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Tue Dec 5 16:00:46 2017 +0530

    fixup! lokdialog: Don't hide dialogs in case of LOK
    
    Make it more readable and safe.
    
    Change-Id: I871ed8f3115d2137e47660bd9fc198216e7f9fc2

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index bdd99728d55e..3b8fdf127c83 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1477,7 +1477,8 @@ void SfxWorkWindow::HidePopups_Impl(bool bHide, bool bParent, sal_uInt16 nId )
                 pChild->nVisible &= ~SfxChildVisibility::ACTIVE;
                 pCW->Hide();
             }
-            else if ( SfxChildVisibility::VISIBLE != (pChild->nVisible & SfxChildVisibility::VISIBLE) )
+            else if ( !comphelper::LibreOfficeKit::isActive() ||
+                      SfxChildVisibility::ACTIVE != (pChild->nVisible & SfxChildVisibility::ACTIVE) )
             {
                 pChild->nVisible |= SfxChildVisibility::ACTIVE;
                 if ( SfxChildVisibility::VISIBLE == (pChild->nVisible & SfxChildVisibility::VISIBLE) )