[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sd/source
Mert Tumer (via logerrit)
logerrit at kemper.freedesktop.org
Wed Mar 18 11:00:17 UTC 2020
sd/source/ui/func/fusel.cxx | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 18ac91043d2e90b89ac56e3230d687fffeeb25a9
Author: Mert Tumer <mert.tumer at collabora.com>
AuthorDate: Wed Mar 18 13:17:32 2020 +0300
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Mar 18 11:59:54 2020 +0100
mobile: fix hyperlinks are not clickable on impress
Change-Id: I77a0ef263814359607d9c1d863f93c55f3493dbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90687
Tested-by: Andras Timar <andras.timar at collabora.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 81988e00a351..b5e49ef8112f 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -269,6 +269,14 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
{
mpWindow->ReleaseMouse();
+ // If tiled rendering, let client handles URL execution and early returns.
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ SfxViewShell& rSfxViewShell = mpViewShell->GetViewShellBase();
+ rSfxViewShell.libreOfficeKitViewCallback(LOK_CALLBACK_HYPERLINK_CLICKED, aVEvt.pURLField->GetURL().toUtf8().getStr());
+ return true;
+ }
+
SvtSecurityOptions aSecOpt;
if (!rMEvt.IsMod1() && aSecOpt.IsOptionSet(SvtSecurityOptions::EOption::CtrlClickHyperlink))
return true;
@@ -281,14 +289,6 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
SfxViewFrame* pFrame = mpViewShell->GetViewFrame();
mpWindow->ReleaseMouse();
- // If tiled rendering, let client handles URL execution and early returns.
- if (comphelper::LibreOfficeKit::isActive())
- {
- SfxViewShell& rSfxViewShell = mpViewShell->GetViewShellBase();
- rSfxViewShell.libreOfficeKitViewCallback(LOK_CALLBACK_HYPERLINK_CLICKED, aVEvt.pURLField->GetURL().toUtf8().getStr());
- return true;
- }
-
if (rMEvt.IsMod1())
{
// Open in new frame
More information about the Libreoffice-commits
mailing list