mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svx: implement per-view LOK_CALLBACK_TEXT_SELECTION for graphic sel

Browse Source 
Handle multiple views when clicking on a graphic, and thus sending a
"text selection is now empty" callback. This avoids an assert when
clicking on a Writer image in gtktiledviewer.

Change-Id: I2b6d7e561ccc4a6e0782fdad37d4b104c08f1eeb
Reviewed-on: https://gerrit.libreoffice.org/26152
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Miklos Vajna
2016-06-10 10:22:39 +02:00
parent 9e52ec96d7
commit 213b15fa59
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
svx/source/svdraw/svdmrkv.cxx
View File

@@ -773,7 +773,13 @@ void SdrMarkView::SetMarkHandles()
sSelection = aSelection.toString();
// hide the text selection too
GetModel()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, "");
if (comphelper::LibreOfficeKit::isViewCallback())
{
if(SfxViewShell* pViewShell = SfxViewShell::Current())
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION, "");
}
else
GetModel()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, "");
}
if (comphelper::LibreOfficeKit::isViewCallback())
{