[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sfx2/source

[Szymon Kłos (via logerrit)]

 sfx2/source/sidebar/SidebarController.cxx |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 89ceb3504c74e6f7875785d436a378a991ba2f8a
Author:     Szymon Kłos <eszka...@gmail.com>
AuthorDate: Mon May 23 14:51:07 2022 +0200
Commit:     Michael Meeks <michael.me...@collabora.com>
CommitDate: Mon May 23 15:41:37 2022 +0200

    Revert "lok: sidebar: avoid async call to switch context"
    
    Async call was introduced so we will not switch panels multiple times
    in a row, but only one time. That patch was bad for performance.
    
    This reverts commit 55f65c4d6cf7d1f68fe9c39c42431e6a15d903e6.
    
    Change-Id: I710d9c4bf0881750ca763d53cd1928068721cc82
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134821
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Michael Meeks <michael.me...@collabora.com>

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index ba1c968d022f..db4f9679e34a 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -332,9 +332,8 @@ void SAL_CALL SidebarController::notifyContextChangeEvent 
(const css::ui::Contex
         maContextChangeUpdate.RequestCall(); // async call, not a prob
                                              // calling with held
                                              // solarmutex
-        if (comphelper::LibreOfficeKit::isActive())
-            maContextChangeUpdate.Sync();
-        else // TODO: this call is redundant but mandatory for unit test to 
update context on document loading
+        // TODO: this call is redundant but mandatory for unit test to update 
context on document loading
+        if (!comphelper::LibreOfficeKit::isActive())
             UpdateConfigurations();
     }
 }
@@ -374,8 +373,6 @@ void SAL_CALL SidebarController::statusChanged (const 
css::frame::FeatureStateEv
         mnRequestedForceFlags |= SwitchFlag_ForceSwitch;
         maContextChangeUpdate.RequestCall(); // async call, ok to call
                                              // with held solarmutex
-        if (comphelper::LibreOfficeKit::isActive())
-            maContextChangeUpdate.Sync();
     }
 }
 
@@ -1031,8 +1028,6 @@ IMPL_LINK(SidebarController, WindowEventHandler, 
VclWindowEvent&, rEvent, void)
                 mpParentWindow->Invalidate();
                 mnRequestedForceFlags |= SwitchFlag_ForceNewDeck | 
SwitchFlag_ForceNewPanels;
                 maContextChangeUpdate.RequestCall();
-                if (comphelper::LibreOfficeKit::isActive())
-                    maContextChangeUpdate.Sync();
                 break;
 
             case VclEventId::ObjectDying: