summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Kłos <eszkadev@gmail.com>2022-05-20 19:18:11 +0200
committerMichael Meeks <michael.meeks@collabora.com>2022-05-20 22:27:11 +0200
commit08891ae798b1e59719684d1b0343767c9d136a11 (patch)
treec624c6826cbcca44a47a34846b34259e40df86b3
parent55f65c4d6cf7d1f68fe9c39c42431e6a15d903e6 (diff)
lok: sidebar: notebookbar: don't change view mode for other views
We should change view mode (notebookbar/toolbars) only for current view. This prevents the closed sidebar from showing when other view joins the session. Change-Id: Iaeec1bee0afab7552e223f17dd7afac27d288db9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134690 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
-rw-r--r--sfx2/source/appl/appserv.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 2e41b999cf70..6dec63520128 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -813,6 +813,14 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
pViewFrame = SfxViewFrame::GetFirst();
while( pViewFrame )
{
+ // in LOK case we want to apply changes only to the current view
+ if (comphelper::LibreOfficeKit::isActive() &&
+ pViewFrame != SfxViewShell::Current()->GetViewFrame())
+ {
+ pViewFrame = SfxViewFrame::GetNext( *pViewFrame );
+ continue;
+ }
+
Reference<XFrame> xFrame = pViewFrame->GetFrame().GetFrameInterface();
// We want to change mode only for a current app module, ignore other apps