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

[Mert Tumer (via logerrit)]

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

New commits:
commit b606764ce2a042f2a38c98820d7236661149d20c
Author:     Mert Tumer <mert.tumer at collabora.com>
AuthorDate: Fri Aug 6 12:42:16 2021 +0300
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Aug 6 15:26:03 2021 +0200

    lok: Avoid redundant call to UpdateConfigurations
    
    We call doc_setView each time we send an event to LOK such as keystroke
    and SidebarController::notifyContextChange event is triggered after that
    UpdateConfigurations() call causes layout reallocating for whole sidebar
    and we end up keep doing it. It takes significant amount of cpu time for
    lok case for no reason.
    
    Signed-off-by: Mert Tumer <mert.tumer at collabora.com>
    Change-Id: I8f456156af841fdeaba1934498863a07a7d4554e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120112
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 266a69f5dcbe..db4f9679e34a 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -333,7 +333,8 @@ void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::Contex
                                              // calling with held
                                              // solarmutex
         // TODO: this call is redundant but mandatory for unit test to update context on document loading
-        UpdateConfigurations();
+        if (!comphelper::LibreOfficeKit::isActive())
+            UpdateConfigurations();
     }
 }