From 08891ae798b1e59719684d1b0343767c9d136a11 Mon Sep 17 00:00:00 2001 From: Szymon Kłos Date: Fri, 20 May 2022 19:18:11 +0200 Subject: 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 Reviewed-by: Michael Meeks --- sfx2/source/appl/appserv.cxx | 8 ++++++++ 1 file changed, 8 insertions(+) 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 = pViewFrame->GetFrame().GetFrameInterface(); // We want to change mode only for a current app module, ignore other apps -- cgit v1.2.3