[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sd/source

[Szymon Kłos]

 sd/source/ui/func/fusel.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 5a96d3e88560609540191bff95fae5ad80845012
Author: Szymon Kłos <szymon.klos at collabora.com>
Date:   Tue Nov 28 20:15:47 2017 +0100

    tdf#76646 Ctrl-click required for hyperlinks in draw/impress
    
    If "Ctrl-click required to follow hyperlinks" is set in
    Options -> LibreOffice -> Security -> Options
    open the link only with Ctrl key pressed.
    
    Change-Id: Icf57b4deedabd51f31f04021ba3f6bddc3829931
    Reviewed-on: https://gerrit.libreoffice.org/45437
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/45554
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 2979c9099416..425a4d9c857d 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -27,6 +27,7 @@
 #include <svtools/imapobj.hxx>
 #include <svl/urihelper.hxx>
 #include <unotools/localfilehelper.hxx>
+#include <unotools/securityoptions.hxx>
 #include <svx/svxids.hrc>
 #include <svx/xfillit0.hxx>
 #include <sfx2/app.hxx>
@@ -269,6 +270,11 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
                       aVEvt.eEvent == SDREVENT_EXECUTEURL )
              {
                 mpWindow->ReleaseMouse();
+
+                SvtSecurityOptions aSecOpt;
+                if (!rMEvt.IsMod1() && aSecOpt.IsOptionSet(SvtSecurityOptions::E_CTRLCLICK_HYPERLINK))
+                    return true;
+
                 SfxStringItem aStrItem(SID_FILE_NAME, aVEvt.pURLField->GetURL());
                 SfxStringItem aReferer(SID_REFERER, mpDocSh->GetMedium()->GetName());
                 SfxBoolItem aBrowseItem( SID_BROWSE, true );