sw/source/uibase/wrtsh/wrtsh2.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 27a8c0d921a5a6cb7e2f430cdb62ab934b57233f
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Jun 10 12:18:18 2016 +0200
sw: implement per-view LOK_CALLBACK_HYPERLINK_CLICKED
So that the view that initiated the mouse click gets the hyperlink
value.
Change-Id: Ibef1c5df3f27f782ce6e24c9650f92c96b8b79e3
Reviewed-on: https://gerrit.libreoffice.org/26156
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 700c302..e35df9d 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -473,7 +473,10 @@ void LoadURL( SwViewShell& rVSh, const OUString& rURL,
sal_uInt16 nFilter,
// We are doing tiledRendering, let the client handles the URL loading.
if (comphelper::LibreOfficeKit::isActive())
{
- rVSh.libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
rURL.toUtf8().getStr());
+ if (comphelper::LibreOfficeKit::isViewCallback())
+
rVSh.GetSfxViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
rURL.toUtf8().getStr());
+ else
+ rVSh.libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
rURL.toUtf8().getStr());
return;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
