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

[Henry Castro (via logerrit)]

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

New commits:
commit 716f308bcaa961109027bf26a44fd4dfc4b24702
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Wed Sep 16 16:51:23 2020 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Sep 22 14:52:03 2020 +0200

    lok:sidebar: deactivate the shell with no default context
    
    When a different view deactivates to current shell,
    then it is set to default context that cause a side
    effect into another view with different panels
    in the sidebar.
    
    Change-Id: Ie99cde89bdfdb08e1ac93aed947cf13048800c0a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102887
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    (cherry picked from commit e7c3678e309b59479be24be2b7c57f8b20dce4dd)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102942
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
index 3a182d14f368..aece2861fcf2 100644
--- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
+++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
@@ -60,7 +60,8 @@ void ContextChangeBroadcaster::Deactivate (const css::uno::Reference<css::frame:
         BroadcastContextChange(
             rxFrame,
             GetModuleName(rxFrame),
-            vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Default));
+            (comphelper::LibreOfficeKit::isActive() ? msContextName:
+             vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Default)));
     }
 }