summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2024-06-24 16:17:54 +0500
committerMike Kaganski <mike.kaganski@collabora.com>2024-06-25 12:03:32 +0200
commit2c2d84fefc5b3cc35c1db0d8244902362dc0531c (patch)
tree7e77148c03149c0d3d1b5b60c28c3b6bce6467c2 /sd
parent2d208c4e42595bb85fd0ef726a89e10dd32b48b1 (diff)
Revert "LOK: Introduce LOK_CALLBACK_STATUS_UPDATE"
This reverts commit bbd32b39eae24e99d135ed5c48586db8c9b0fb23. A following commit will implement an alternative method without a new enum member. Change-Id: Id00a4a0abe68fc69b1a3a81c731c8085e3dbca2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169467 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/view/drviews1.cxx6
-rw-r--r--sd/source/ui/view/drviewse.cxx9
2 files changed, 12 insertions, 3 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 00560836cb7f..df004aa0610e 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -405,9 +405,6 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
pTitledDockingWindow->SetTitle(SdResId(aId));
};
- if (comphelper::LibreOfficeKit::isActive())
- GetViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_STATUS_UPDATE, {});
-
if (meEditMode == EditMode::Page)
{
/******************************************************************
@@ -454,6 +451,9 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive)
setLeftPaneTitleIfPaneExists(SID_LEFT_PANE_DRAW, STR_LEFT_PANE_DRAW_TITLE_MASTER);
setLeftPaneTitleIfPaneExists(SID_LEFT_PANE_IMPRESS, STR_LEFT_PANE_IMPRESS_TITLE_MASTER);
+ if (comphelper::LibreOfficeKit::isActive())
+ GetViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED,
+ ".uno:SlideMasterPage=true"_ostr);
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 622dd2cad93c..f594fb1f7fcf 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1036,6 +1036,10 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
case SID_MASTERPAGE: // BASIC
{
+ if (comphelper::LibreOfficeKit::isActive())
+ GetViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED,
+ ".uno:SlideMasterPage=true"_ostr);
+
// AutoLayouts needs to be finished
GetDoc()->StopWorkStartupDelay();
@@ -1070,6 +1074,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"_ostr);
+
Broadcast (
ViewShellHint(ViewShellHint::HINT_CHANGE_EDIT_MODE_START));