Kaydet (Commit) e6b18c1d authored tarafından Eike Rathke's avatar Eike Rathke

ScGlobal::OpenURL: support relative references as URI references in hyperlinks

Instead of failing with "is not an absolute URL" error.

For example in the HYPERLINK() spreadsheet function where Excel
supports it, but also anywhere else that calls OpenURL(). A
relative reference is relative to the current document, or for yet
unsaved documents or if no object shell is available relative to
the work path, as usual.

Additional benefit is that "\\" UNC path names are accepted as
smb:// Samba shares and DOS \ path name separators resolved for a
proper file:// URI.

Users are asking for this, found no related tdf# bug/RFE. See
https://ask.libreoffice.org/en/question/160280/relative-and-absolute-hyperlinks/
and other linked q&a therein.

Change-Id: Ib314b71d68fbe1793ec614cbf7c0c058fad14a10
Reviewed-on: https://gerrit.libreoffice.org/57277Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
Tested-by: Jenkins
üst 4dfc014c
......@@ -814,17 +814,36 @@ void ScGlobal::OpenURL(const OUString& rURL, const OUString& rTarget)
if (!pViewFrm)
return;
OUString aUrlName( rURL );
SfxViewFrame* pFrame = nullptr;
const SfxObjectShell* pObjShell = nullptr;
OUString aReferName;
if ( pScActiveViewShell )
{
pFrame = pScActiveViewShell->GetViewFrame();
SfxMedium* pMed = pFrame->GetObjectShell()->GetMedium();
pObjShell = pFrame->GetObjectShell();
const SfxMedium* pMed = pObjShell->GetMedium();
if (pMed)
aReferName = pMed->GetName();
}
SfxStringItem aUrl( SID_FILE_NAME, rURL );
// Don't fiddle with fragments pointing into current document.
if (!aUrlName.startsWith("#"))
{
// Any relative reference would fail with "not an absolute URL"
// error, try to construct an absolute URI with the path relative
// to the current document's path or work path, as usual for all
// external references.
// This then also, as ScGlobal::GetAbsDocName() uses
// INetURLObject::smartRel2Abs(), supports "\\" UNC path names as
// smb:// Samba shares and DOS path separators converted to proper
// file:// URI.
const OUString aNewUrlName( ScGlobal::GetAbsDocName( aUrlName, pObjShell));
if (!aNewUrlName.isEmpty())
aUrlName = aNewUrlName;
}
SfxStringItem aUrl( SID_FILE_NAME, aUrlName );
SfxStringItem aTarget( SID_TARGETNAME, rTarget );
if ( nScClickMouseModifier & KEY_SHIFT ) // control-click -> into new window
aTarget.SetValue("_blank");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment