[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/core/data/global.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 86ca9badf9be518be3456afde70271bc1f956065
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jul 10 23:18:51 2018 +0200

    ScGlobal::OpenURL: rearrange item init
    
    Preparing for additional URL handling.
    
    Change-Id: I7897a2c0771b42c02911d8a979c0064410ebd792

diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 495abb6ac49a..dde79f5d8482 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -814,10 +814,6 @@ void ScGlobal::OpenURL(const OUString& rURL, const OUString& rTarget)
     if (!pViewFrm)
         return;
 
-    SfxStringItem aUrl( SID_FILE_NAME, rURL );
-    SfxStringItem aTarget( SID_TARGETNAME, rTarget );
-    if ( nScClickMouseModifier & KEY_SHIFT )     // control-click -> into new window
-        aTarget.SetValue("_blank");
     SfxViewFrame* pFrame = nullptr;
     OUString aReferName;
     if ( pScActiveViewShell )
@@ -828,6 +824,11 @@ void ScGlobal::OpenURL(const OUString& rURL, const OUString& rTarget)
             aReferName = pMed->GetName();
     }
 
+    SfxStringItem aUrl( SID_FILE_NAME, rURL );
+    SfxStringItem aTarget( SID_TARGETNAME, rTarget );
+    if ( nScClickMouseModifier & KEY_SHIFT )     // control-click -> into new window
+        aTarget.SetValue("_blank");
+
     SfxFrameItem aFrm( SID_DOCFRAME, pFrame );
     SfxStringItem aReferer( SID_REFERER, aReferName );