From: Eike Rathke <erack@redhat.com>
Date: Tue, 10 Jul 2018 21:18:51 +0000 (+0200)
Subject: ScGlobal::OpenURL: rearrange item init
X-Git-Tag: archive/raspbian/1%6.1.5-3+rpi1+deb10u11^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4b0ff4651d433f66a21a37ab57caa7cf50a21f52;p=libreoffice.git

ScGlobal::OpenURL: rearrange item init

Preparing for additional URL handling.

Change-Id: I7897a2c0771b42c02911d8a979c0064410ebd792

Gbp-Pq: Name 0086-ScGlobal-OpenURL-rearrange-item-init.patch
---

diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 08e0deacae7..2b703392b89 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -829,10 +829,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 )
@@ -843,6 +839,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 );