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 /framework | |
| parent | ffbd3846d40eaf3dc8e8fa37e57d48ff7da88a5b (diff) | |
simplify LocalFileHelper::ConvertURLToPhysicalName
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/classes/droptargetlistener.cxx | 2 | ||||
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/classes/droptargetlistener.cxx b/framework/source/classes/droptargetlistener.cxx index 98e159a8add3..c1a422f466f1 100644 --- a/framework/source/classes/droptargetlistener.cxx +++ b/framework/source/classes/droptargetlistener.cxx @@ -219,7 +219,7 @@ sal_Bool DropTargetListener::implts_IsDropFormatSupported( SotFormatStringId nFo void DropTargetListener::implts_OpenFile( const String& rFilePath ) { - String aFileURL; + rtl::OUString aFileURL; if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFilePath, aFileURL ) ) aFileURL = rFilePath; diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 51ec80fd4c49..7ef9502114dc 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -689,17 +689,17 @@ IMPL_LINK( SubstitutePathVariables, implts_ConfigurationNotify, SubstitutePathNo rtl::OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const rtl::OUString& aOSLCompliantURL ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::ConvertOSLtoUCBURL" ); - String aResult; + rtl::OUString aResult; rtl::OUString aTemp; osl::FileBase::getSystemPathFromFileURL( aOSLCompliantURL, aTemp ); utl::LocalFileHelper::ConvertPhysicalNameToURL( aTemp, aResult ); // Not all OSL URL's can be mapped to UCB URL's! - if ( aResult.Len() == 0 ) + if ( aResult.isEmpty() ) return aOSLCompliantURL; else - return rtl::OUString( aResult ); + return aResult; } rtl::OUString SubstitutePathVariables::GetWorkPath() const |