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

[Szymon Kłos (via logerrit)]

 sfx2/source/control/dispatch.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 3af29fec6e9bfa14ee94a7e0b630435da289ca0e
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Nov 7 11:18:04 2023 +0100
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Nov 7 14:47:30 2023 +0100

    lok: notebookbar: fix unit-copy-paste in online
    
    we can't remove hack in SfxDispatcher::Update_Impl yet
    because this made unit-copy-paste test in online broken
    
    reverts part of:
    commit 1a6d16cb14342f9a66f99960e96027af6e5369ef
    lok: notebookbar: query SID_NOTEBOOKBAR only when requested to switch UI
    
    Signed-off-by: Szymon Kłos <szymon.k...@collabora.com>
    Change-Id: I8cd801bbc912f2ab3f710f5c7133445f07c4e5de
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159062
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 3915644e0d2a..9d85075de433 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1120,8 +1120,7 @@ void SfxDispatcher::Update_Impl( bool bForce )
     if ( xLayoutManager.is() )
         xLayoutManager->unlock();
 
-    if ( !comphelper::LibreOfficeKit::isActive() &&
-        SfxViewShell::Current() && SfxViewShell::Current()->GetDispatcher() )
+    if ( SfxViewShell::Current() && SfxViewShell::Current()->GetDispatcher() )
     {
         const SfxPoolItem *pItem;
         SfxViewShell::Current()->GetDispatcher()->QueryState(SID_NOTEBOOKBAR, 
pItem);