diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-03-19 23:07:53 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-03-20 12:10:09 +0000 |
| commit | 9d548d56cf19b01273f719b52a45f48ab13ed45a (patch) | |
| tree | 8b60dd5d056f93cb38bcd25c124b97e26c09a3f5 /sfx2/source/appl | |
| parent | 77c87c18697e19cb4606717af0e4b0e5ab2139bc (diff) | |
Replace String with OUString (unotools)
Change-Id: I9a0677cb36805d0a27514824c937901f73fee1c8
Reviewed-on: https://gerrit.libreoffice.org/2864
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/linkmgr2.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 32d3919cb822..b1ccfaf601df 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -585,15 +585,15 @@ sal_Bool LinkManager::GetGraphicFromAny( const String& rMimeType, // ---------------------------------------------------------------------- -String lcl_DDE_RelToAbs( const String& rTopic, const String& rBaseURL ) +String lcl_DDE_RelToAbs( const OUString& rTopic, const OUString& rBaseURL ) { - String sRet; + OUString sRet; INetURLObject aURL( rTopic ); if( INET_PROT_NOT_VALID == aURL.GetProtocol() ) utl::LocalFileHelper::ConvertSystemPathToURL( rTopic, rBaseURL, sRet ); - if( !sRet.Len() ) + if( sRet.isEmpty() ) sRet = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), rTopic, URIHelper::GetMaybeFileHdl(), true ); - return sRet; + return String(sRet); } sal_Bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) |