summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-07-01 18:05:43 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-07-21 10:21:34 +0200
commit2ca45663bf74e82fe508c2577613627741cf14f6 (patch)
tree5fb6fdaa4d21db1c4958ded2897701965b1c7850 /svx/source
parent606ad3c7961ced06a9c4278d64a7913090f03abe (diff)
svx lok: add LOK_CALLBACK_GRAPHIC_VIEW_SELECTION
So a view can be aware where the graphic selections of other views are. Change-Id: I0cc420cfe4bf3824fbfa1a58da889cac5e9a7b60 Reviewed-on: https://gerrit.libreoffice.org/26863 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 3ebfc5b95559a9bcb2fc0508b51fd00e8eb20260)
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/svdraw/svdmrkv.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index db1b683f14e9..df1abb7f3632 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -53,6 +53,7 @@
#include <editeng/editdata.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <comphelper/lok.hxx>
+#include <sfx2/lokhelper.hxx>
#include <sfx2/viewsh.hxx>
using namespace com::sun::star;
@@ -714,7 +715,10 @@ void SdrMarkView::SetMarkHandles()
{
// Suppress handles -> empty graphic selection.
if(SfxViewShell* pViewShell = SfxViewShell::Current())
+ {
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_GRAPHIC_SELECTION, "EMPTY");
+ SfxLokHelper::notifyOtherViews(pViewShell, LOK_CALLBACK_GRAPHIC_VIEW_SELECTION, "selection", "EMPTY");
+ }
}
return;
}
@@ -735,7 +739,10 @@ void SdrMarkView::SetMarkHandles()
{
// The table shape has selected cells, which provide text selection already -> no graphic selection.
if(SfxViewShell* pViewShell = SfxViewShell::Current())
+ {
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_GRAPHIC_SELECTION, "EMPTY");
+ SfxLokHelper::notifyOtherViews(pViewShell, LOK_CALLBACK_GRAPHIC_VIEW_SELECTION, "selection", "EMPTY");
+ }
return;
}
}
@@ -768,7 +775,10 @@ void SdrMarkView::SetMarkHandles()
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION, "");
}
if(SfxViewShell* pViewShell = SfxViewShell::Current())
+ {
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_GRAPHIC_SELECTION, sSelection.getStr());
+ SfxLokHelper::notifyOtherViews(pViewShell, LOK_CALLBACK_GRAPHIC_VIEW_SELECTION, "selection", sSelection);
+ }
}
if (bFrmHdl)