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

[Ashod Nakashian (via logerrit)]

 sd/source/ui/view/drviews1.cxx |    4 ++++
 sd/source/ui/view/drviewse.cxx |    6 ++++++
 2 files changed, 10 insertions(+)

New commits:
commit 3e949896a0d2382c034a927c20da8f654f16630f
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Wed Dec 12 10:46:13 2018 -0500
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Tue Apr 23 03:41:37 2019 +0200

    sd: LOK: publish statechange on entering master view
    
    Change-Id: Ib736800544b9669e3708da0c01370af22cdf3e97
    Reviewed-on: https://gerrit.libreoffice.org/69617
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 405804acff33..1a3578945356 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -419,6 +419,10 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
             GetViewFrame()->SetChildWindow(
                 AnimationChildWindow::GetChildWindowId(), false );
 
+            if (comphelper::LibreOfficeKit::isActive())
+                GetViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED,
+                                                           ".uno:SlideMasterPage=true");
+
             if (!mpActualPage)
             {
                 // as long as there is no mpActualPage, take first
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 96daaffc9334..3bfb5bed4ece 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -30,6 +30,7 @@
 #include <comphelper/processfactory.hxx>
 
 #include <comphelper/lok.hxx>
+#include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <undo/undomanager.hxx>
 #include <vcl/waitobj.hxx>
 #include <svl/aeitem.hxx>
@@ -1030,6 +1031,11 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
 
         case SID_CLOSE_MASTER_VIEW:
         {
+            // Notify of disabling master view, which is enabled in DrawViewShell::ChangeEditMode.
+            if (comphelper::LibreOfficeKit::isActive())
+                GetViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED,
+                                                           ".uno:SlideMasterPage=false");
+
             Broadcast (
                 ViewShellHint(ViewShellHint::HINT_CHANGE_EDIT_MODE_START));