diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-12-12 10:46:13 -0500 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-25 09:29:37 +0200 |
| commit | ae2720ab206c2ff4a677e7fad147a3037f07a9be (patch) | |
| tree | 2031719190bff38693d0e86e66ca1805a13b579b /sd | |
| parent | f696e535872e76f0854d475354fed11fbce4bb54 (diff) | |
sd: LOK: publish statechange on entering master view
Change-Id: Ib736800544b9669e3708da0c01370af22cdf3e97
Reviewed-on: https://gerrit.libreoffice.org/69617
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/73498
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviews1.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewse.cxx | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 67a651122497..4fb136fa9838 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -441,6 +441,9 @@ 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 9cebd8c4f0d8..924b27aeb4bb 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/uno/Any.hxx> #include <comphelper/lok.hxx> +#include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <undo/undomanager.hxx> #include <vcl/waitobj.hxx> #include <svl/aeitem.hxx> @@ -1064,6 +1065,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)); |