core.git: Branch 'distro/collabora/co-24.04' - sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/control/dispatch.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3ef653dc57015c17894163b0aedce362149cd530
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Dec 8 14:10:11 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Feb 7 22:15:55 2024 +0100

    kit mode is similar to !HAVE_FEATURE_DESKTOP mode wrt menubar
    
    in that it is not used.
    
    SfxDispatcher: :SetMenu_Impl is 3.1% of long-profiling use
    Change-Id: I07bf0f130791795a49835e91ac8b8c5bec749f33
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162465
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index fe7271677fbf..461de314d577 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1010,6 +1010,9 @@ void SfxDispatcher::SetMenu_Impl()
     if ( !xImp->pFrame )
         return;
 
+    if (comphelper::LibreOfficeKit::isActive())
+        return;
+
     SfxViewFrame* pTop = xImp->pFrame->GetTopViewFrame();
     if ( !pTop || pTop->GetBindings().GetDispatcher() != this )
         return;