sd/source/ui/func/fusel.cxx | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit a61b7b81556c7ed3adc7022d488865f878237fb7
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Jun 13 18:10:13 2016 +0200
sd: implement per-view LOK_CALLBACK_HYPERLINK_CLICKED
Change-Id: If0759525326f963b497a6e011027719fc376eaf9
Reviewed-on: https://gerrit.libreoffice.org/26226
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 2979c90..3681a46 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -278,8 +278,13 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
// If tiled rendering, let client handles URL execution and
early returns.
if (comphelper::LibreOfficeKit::isActive())
{
-
mpDoc->libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
- aVEvt.pURLField->GetURL().toUtf8().getStr());
+ if (comphelper::LibreOfficeKit::isViewCallback())
+ {
+ SfxViewShell& rSfxViewShell =
mpViewShell->GetViewShellBase();
+
rSfxViewShell.libreOfficeKitViewCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
aVEvt.pURLField->GetURL().toUtf8().getStr());
+ }
+ else
+
mpDoc->libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
aVEvt.pURLField->GetURL().toUtf8().getStr());
return true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
