svx/source/svdraw/svdmrkv.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
New commits: commit 213b15fa59ce768086c41dbcdc5c29109a09ad9d Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Fri Jun 10 10:22:39 2016 +0200 svx: implement per-view LOK_CALLBACK_TEXT_SELECTION for graphic sel 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 <vmik...@collabora.co.uk> Tested-by: Jenkins <c...@libreoffice.org> diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 1323abd..5cb8371 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -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()) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits