[Libreoffice-commits] core.git: 2 commits - sfx2/source vcl/jsdialog

[Szymon Kłos (via logerrit)]

 sfx2/source/appl/appserv.cxx     |    8 ++++++++
 vcl/jsdialog/jsdialogbuilder.cxx |    6 ++++++
 2 files changed, 14 insertions(+)

New commits:
commit 55aece054255a57506b0c2921d8bc34ca7b5f610
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Jun 8 14:56:46 2022 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed Jun 29 08:47:27 2022 +0200

    jsdialog: be sure we send close popup message when destroyed
    
    use different m_sTypeOfJSON for popups so we can later
    detect popup closing
    
    Change-Id: Id0086815317011b142b49f4e1421b76e1e663358
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135497
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136594
    Tested-by: Jenkins

diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 25885ce11aee..810425a7cf40 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -512,7 +512,10 @@ JSInstanceBuilder::JSInstanceBuilder(weld::Widget* 
pParent, const OUString& rUIR
 {
     // when it is a popup we initialize sender in weld_popover
     if (bPopup)
+    {
+        m_sTypeOfJSON = "popup";
         return;
+    }
 
     vcl::Window* pRoot = m_xBuilder->get_widget_root();
 
@@ -659,6 +662,9 @@ JSInstanceBuilder::CreateFormulabarBuilder(vcl::Window* 
pParent, const OUString&
 
 JSInstanceBuilder::~JSInstanceBuilder()
 {
+    if (m_sTypeOfJSON == "popup")
+        sendClosePopup(m_nWindowId);
+
     if (m_aWindowToRelease)
     {
         m_aWindowToRelease->ReleaseLOKNotifier();
commit efc1b8a911599218a68992f568c98382ac77f52d
Author:     Szymon Kłos <eszka...@gmail.com>
AuthorDate: Fri May 20 19:18:11 2022 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed Jun 29 08:47:13 2022 +0200

    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 <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Michael Meeks <michael.me...@collabora.com>
    (cherry picked from commit 08891ae798b1e59719684d1b0343767c9d136a11)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135001
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136592
    Tested-by: Jenkins

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 66ac22ee133a..ed08854e6db6 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -771,6 +771,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