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 /sw | |
| parent | ffbd3846d40eaf3dc8e8fa37e57d48ff7da88a5b (diff) | |
simplify LocalFileHelper::ConvertURLToPhysicalName
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/swg/SwXMLTextBlocks.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index 360376dd5407..5a19bc612bad 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -529,11 +529,11 @@ sal_Bool SwXMLTextBlocks::IsOnlyTextBlock( sal_uInt16 nIdx ) const sal_Bool SwXMLTextBlocks::IsFileUCBStorage( const String & rFileName) { - String aName( rFileName ); + rtl::OUString aName( rFileName ); INetURLObject aObj( aName ); if ( aObj.GetProtocol() == INET_PROT_NOT_VALID ) { - String aURL; + rtl::OUString aURL; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aURL ); aObj.SetURL( aURL ); aName = aObj.GetMainURL( INetURLObject::NO_DECODE ); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 0ab1cf6e175a..c14e189f93db 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4251,11 +4251,11 @@ void SwWW8ImplReader::ReadDocInfo() aSttb.Print( stderr ); #endif String sPath = aSttb.getStringAtIndex( 0x1 ); - String aURL; + rtl::OUString aURL; // attempt to convert to url ( won't work for obvious reasons on linux if ( sPath.Len() ) ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPath, aURL ); - if ( aURL.Len() ) + if (!aURL.getLength()) xDocProps->setTemplateURL( aURL ); else xDocProps->setTemplateURL( sPath ); |