summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorHenry Castro <hcastro@collabora.com>2020-09-16 16:51:23 -0400
committerAndras Timar <andras.timar@collabora.com>2020-09-22 14:52:03 +0200
commit716f308bcaa961109027bf26a44fd4dfc4b24702 (patch)
tree1b0d8de6ab45f4f3118ee0d32b1110abf598cf3a /sfx2
parent2fa5ba8346b484d45d143a982bc6d44586de2d6c (diff)
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@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com> (cherry picked from commit e7c3678e309b59479be24be2b7c57f8b20dce4dd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102942 Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/sidebar/ContextChangeBroadcaster.cxx3
1 files changed, 2 insertions, 1 deletions
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)));
}
}