diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-09 21:05:46 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-10 10:09:28 +0000 |
| commit | 3c62fbcdd78e472d3dde604eff33be54cb3e21be (patch) | |
| tree | 12a45fa393c2ce35a1fdff7efc0a63ef7600b7cd /sd | |
| parent | ffbd3846d40eaf3dc8e8fa37e57d48ff7da88a5b (diff) | |
simplify LocalFileHelper::ConvertURLToPhysicalName
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/html/htmlex.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview4.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 41a53630a892..c2aec1e395c3 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -3270,7 +3270,7 @@ sal_uLong EasyFile::createFileName( const String& rURL, String& rFileName ) if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { - String aURLStr; + rtl::OUString aURLStr; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rURL, aURLStr ); aURL = INetURLObject( aURLStr ); } diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 2e8493dbd6e2..203d2f3bfd43 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1986,12 +1986,12 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const String ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const { - String aRetVal; + rtl::OUString aRetVal; DffRecordHeader* pHd( const_cast<ImplSdPPTImport*>(this)->aDocRecManager.GetRecordHeader( PPT_PST_ExObjList, SEEK_FROM_BEGINNING ) ); if ( pHd ) { pHd->SeekToContent( rStCtrl ); - while ( ( rStCtrl.Tell() < pHd->GetRecEndFilePos() ) && !aRetVal.Len() ) + while ( ( rStCtrl.Tell() < pHd->GetRecEndFilePos() ) && aRetVal.isEmpty() ) { DffRecordHeader aHdMovie; rStCtrl >> aHdMovie; diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 84d223773911..54c675c00ffb 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -585,7 +585,7 @@ sal_Bool SdNavigatorWin::InsertFile(const String& rFileName) if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { - String aURLStr; + rtl::OUString aURLStr; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFileName, aURLStr ); aURL = INetURLObject( aURLStr ); } diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index f42ad34cbc24..9b686bc0f30f 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -393,7 +393,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { - String aURLStr; + rtl::OUString aURLStr; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aCurrentDropFile, aURLStr ); aURL = INetURLObject( aURLStr ); } |