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

[Libreoffice Gerrit user]

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

New commits:
commit dc30fdcf7277d2d86f45b1c36384d8b54be29111
Author:     Pranav Kant <pranavk at collabora.co.uk>
AuthorDate: Tue Dec 5 02:20:13 2017 +0530
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Jul 13 18:47:30 2018 +0200

    lokdialog: Don't hide dialogs in case of LOK
    
    We change views (using setView) a lot in case of LOK. Changing the view,
    without this patch, leads to InitShow on the dialog which means
    invalidation of the whole dialog even though there is nothing to
    invalidate. This decreases performance as it increases the dialog paint
    traffic through the LOK API. We don't need to hide the dialog once it's
    opened in case of LOK.
    
    This patch improves the multiview dialog performance considerably
    (can easily be noticed in GTV).
    
    Change-Id: If2b4ceb945ccd86da3d90bbbb0a0b9fbade43f30
    Reviewed-on: https://gerrit.libreoffice.org/57401
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 3f6f3ca0a1e1..af5d0cdb4bbf 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <config_features.h>
+#include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 
 #include <sfx2/docfile.hxx>
@@ -1482,6 +1483,9 @@ bool SfxWorkWindow::IsVisible_Impl()
 
 void SfxWorkWindow::HidePopups_Impl(bool bHide, bool bParent, sal_uInt16 nId )
 {
+    if (comphelper::LibreOfficeKit::isActive() && bHide)
+        return;
+
     for (SfxChildWin_Impl* i : aChildWins)
     {
         SfxChildWindow *pCW = i->pWin;
@@ -1494,7 +1498,8 @@ void SfxWorkWindow::HidePopups_Impl(bool bHide, bool bParent, sal_uInt16 nId )
                 pChild->nVisible &= ~SfxChildVisibility::ACTIVE;
                 pCW->Hide();
             }
-            else
+            else if ( !comphelper::LibreOfficeKit::isActive() ||
+                      SfxChildVisibility::ACTIVE != (pChild->nVisible & SfxChildVisibility::ACTIVE) )
             {
                 pChild->nVisible |= SfxChildVisibility::ACTIVE;
                 if ( SfxChildVisibility::VISIBLE == (pChild->nVisible & SfxChildVisibility::VISIBLE) )