diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:56:03 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:56:03 +0000 |
| commit | a42a27ec57294990766d7dcb9bae8c301740085e (patch) | |
| tree | 07604c1cf1a8ede3ad40129f79bff5010177fd3e /svx/source/dialog/hyprlink.cxx | |
| parent | 3dc991dbdff53b2fb1ba7d2118d59d3f27a1daf2 (diff) | |
INTEGRATION: CWS sb19 (1.3.290); FILE MERGED
2004/12/21 15:52:29 sb 1.3.290.3: #i10000# Cleaned up merge conflict.
2004/12/08 22:51:39 sb 1.3.290.2: RESYNC: (1.3-1.4); FILE MERGED
2004/10/27 07:30:31 mba 1.3.290.1: #110407#: remove static BaseURL
Diffstat (limited to 'svx/source/dialog/hyprlink.cxx')
| -rw-r--r-- | svx/source/dialog/hyprlink.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx index 77eacd00b5ba..e68629a22788 100644 --- a/svx/source/dialog/hyprlink.cxx +++ b/svx/source/dialog/hyprlink.cxx @@ -2,9 +2,9 @@ * * $RCSfile: hyprlink.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2004-11-17 18:08:07 $ + * last change: $Author: rt $ $Date: 2005-01-11 12:56:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,6 +92,7 @@ #include <sfx2/dispatch.hxx> #endif #include <svtools/urihelper.hxx> +#include <sfx2/objsh.hxx> #ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include <comphelper/processfactory.hxx> #endif @@ -415,9 +416,10 @@ IMPL_LINK( SvxHyperlinkDlg, TBSelectHdl, ToolBox *, pBox ) if ( !sName.Len() ) sName = aUrlCB.GetText(); + String aBase = GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL(); SfxStringItem aName( SID_BOOKMARK_TITLE, sName ); SfxStringItem aURL( SID_BOOKMARK_URL, - URIHelper::SmartRelToAbs( aUrlCB.GetText(), FALSE, + URIHelper::SmartRel2Abs( INetURLObject(aBase), aUrlCB.GetText(), URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ) ); GetBindings().GetDispatcher()->Execute( @@ -666,7 +668,8 @@ void SvxHyperlinkDlg::SendToApp(USHORT nType) if ( !sURL.Len() ) return; - INetURLObject aObj( URIHelper::SmartRelToAbs( sURL, FALSE, + String aBase = GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL(); + INetURLObject aObj( URIHelper::SmartRel2Abs( INetURLObject(aBase), sURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ) ); sURL = aObj.GetMainURL( INetURLObject::NO_DECODE ); |