diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-12-13 11:20:02 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-12-13 11:20:02 +0000 |
| commit | 8efdeb2107d258ec4817b90d46a239fe6ed5988b (patch) | |
| tree | 2b07a23bfa6efc9754364efdbc59582856c3f0f2 /svx/source/svxlink | |
| parent | 2d380ff7d2efecafb7d9cdeece066b899a4af492 (diff) | |
INTEGRATION: CWS ineturl1 (1.20.98); FILE MERGED
2004/10/29 13:13:02 cmc 1.20.98.1: #i34006# update to SRC680_m58
Diffstat (limited to 'svx/source/svxlink')
| -rw-r--r-- | svx/source/svxlink/linkmgr.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/svxlink/linkmgr.cxx b/svx/source/svxlink/linkmgr.cxx index 47a2976a4221..dd97ed546ff7 100644 --- a/svx/source/svxlink/linkmgr.cxx +++ b/svx/source/svxlink/linkmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: linkmgr.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: kz $ $Date: 2004-10-04 17:55:57 $ + * last change: $Author: hr $ $Date: 2004-12-13 12:20:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -321,7 +321,7 @@ String lcl_DDE_RelToAbs( const String& rTopic, const String& rReferer ) String sRet; INetURLObject aURL( rTopic ); if( INET_PROT_NOT_VALID == aURL.GetProtocol() ) - utl::LocalFileHelper::ConvertSystemPathToURL( rTopic, rReferer.Len() ? rReferer : INetURLObject::GetBaseURL(), sRet ); + utl::LocalFileHelper::ConvertSystemPathToURL( rTopic, rReferer.Len() ? rtl::OUString(rReferer) : INetURLObject::GetBaseURL(), sRet ); if( !sRet.Len() ) sRet = URIHelper::SmartRelToAbs( rTopic ); return sRet; |