From 9d548d56cf19b01273f719b52a45f48ab13ed45a Mon Sep 17 00:00:00 2001 From: "Chr. Rossmanith" Date: Tue, 19 Mar 2013 23:07:53 +0100 Subject: Replace String with OUString (unotools) Change-Id: I9a0677cb36805d0a27514824c937901f73fee1c8 Reviewed-on: https://gerrit.libreoffice.org/2864 Reviewed-by: Noel Power Tested-by: Noel Power --- cui/source/dialogs/hldocntp.cxx | 16 ++++++++-------- cui/source/dialogs/hldoctp.cxx | 6 +++--- cui/source/dialogs/hltpbase.cxx | 4 ++-- cui/source/dialogs/multipat.cxx | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'cui/source') diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 6e1a971750a1..203257707898 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -402,13 +402,13 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl) uno::Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext); - String aStrURL; - String aTempStrURL( maCbbPath.GetText() ); + OUString aStrURL; + OUString aTempStrURL( maCbbPath.GetText() ); utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, maCbbPath.GetBaseURL(), aStrURL ); String aStrPath = aStrURL; - sal_Bool bZeroPath = ( aStrPath.Len() == 0 ); - sal_Bool bHandleFileName = bZeroPath; // when path has length of 0, then the rest should always be handled + sal_Bool bZeroPath = ( aStrPath.Len() == 0 ); + sal_Bool bHandleFileName = bZeroPath; // when path has length of 0, then the rest should always be handled // as file name, otherwise we do not yet know if( bZeroPath ) @@ -427,13 +427,13 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl) INetURLObject aURL( aStrURL, INET_PROT_FILE ); String aStrName; if( bHandleFileName ) - aStrName = bZeroPath? aTempStrURL : String(aURL.getName()); + aStrName = bZeroPath? aTempStrURL : OUString(aURL.getName()); maCbbPath.SetBaseURL( xFolderPicker->getDirectory() ); - String aStrTmp( xFolderPicker->getDirectory() ); + OUString aStrTmp( xFolderPicker->getDirectory() ); - if( aStrTmp.GetChar( aStrTmp.Len() - 1 ) != sSlash[0] ) - aStrTmp.AppendAscii( sSlash ); + if( aStrTmp[ aStrTmp.getLength() - 1 ] != sSlash[0] ) + aStrTmp += OUString( sSlash ); // append old file name if( bHandleFileName ) diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 21fcce53551a..a7db3c3a5a58 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -120,7 +120,7 @@ void SvxHyperlinkDocTp::FillDlgFields ( String& aStrURL ) String SvxHyperlinkDocTp::GetCurrentURL () { // get data from dialog-controls - String aStrURL; + OUString aStrURL; String aStrPath ( maCbbPath.GetText() ); const String aBaseURL ( maCbbPath.GetBaseURL() ); String aStrMark( maEdTarget.GetText() ); @@ -140,7 +140,7 @@ String SvxHyperlinkDocTp::GetCurrentURL () if( aStrMark != aEmptyStr ) { - aStrURL.AppendAscii( sHash ); + aStrURL += OUString( sHash ); aStrURL += aStrMark; } @@ -213,7 +213,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl) if ( ERRCODE_NONE == nError ) { String aURL( aDlg.GetPath() ); - String aPath; + OUString aPath; utl::LocalFileHelper::ConvertURLToSystemPath( aURL, aPath ); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index dfb0037b29eb..9df36a8892ff 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -515,7 +515,7 @@ sal_Bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut) String SvxHyperlinkTabPageBase::CreateUiNameFromURL( const String& aStrURL ) { - String aStrUiURL; + OUString aStrUiURL; INetURLObject aURLObj( aStrURL ); switch(aURLObj.GetProtocol()) @@ -536,7 +536,7 @@ String SvxHyperlinkTabPageBase::CreateUiNameFromURL( const String& aStrURL ) aStrUiURL = aURLObj.GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS); } } - if(!aStrUiURL.Len()) + if(aStrUiURL.isEmpty()) return aStrURL; return aStrUiURL; } diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 1b2f13911f24..3dad7487d74a 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -88,7 +88,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl) INetURLObject aPath( xFolderPicker->getDirectory() ); aPath.removeFinalSlash(); String aURL = aPath.GetMainURL( INetURLObject::NO_DECODE ); - String sInsPath; + OUString sInsPath; ::utl::LocalFileHelper::ConvertURLToSystemPath( aURL, sInsPath ); if ( pImpl->bIsRadioButtonMode ) @@ -278,14 +278,14 @@ void SvxMultiPathDialog::SetPath( const String& rPath ) for ( sal_uInt16 i = 0; i < nCount; ++i ) { String sPath = rPath.GetToken( i, cDelim ); - String sSystemPath; + OUString sSystemPath; sal_Bool bIsSystemPath = ::utl::LocalFileHelper::ConvertURLToSystemPath( sPath, sSystemPath ); if ( pImpl->bIsRadioButtonMode ) { rtl::OUString sEntry( '\t' ); - sEntry += (bIsSystemPath ? sSystemPath : sPath); + sEntry += (bIsSystemPath ? sSystemPath : OUString(sPath)); SvTreeListEntry* pEntry = aRadioLB.InsertEntry( sEntry ); String* pURL = new String( sPath ); pEntry->SetUserData( pURL ); -- cgit