ScGlobal::OpenURL: rearrange item init
authorEike Rathke <erack@redhat.com>
Tue, 10 Jul 2018 21:18:51 +0000 (23:18 +0200)
committerBastien Roucariès <rouca@debian.org>
Fri, 29 Dec 2023 09:39:36 +0000 (09:39 +0000)
Preparing for additional URL handling.

Change-Id: I7897a2c0771b42c02911d8a979c0064410ebd792

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

sc/source/core/data/global.cxx

index 08e0deacae7442d06b5b8981725d0f45a3251a21..2b703392b89889b9788fc444cf7858d514003fea 100644 (file)
@@ -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 );