diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-09-11 09:19:40 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-09-11 09:27:09 +0200 |
| commit | 59b36fc62e21cce62fd63f0dcc79ff9cb66b35b8 (patch) | |
| tree | f635598a1b78589cd5dd31178cd3fc789f40c47f /framework | |
| parent | 0f690c3495fe66b22aa224ca229ca7b46941deac (diff) | |
Don't let the PathSubstitution service null relative paths
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index bded3d54af72..afcd1e0f19cc 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -1007,7 +1007,6 @@ throw ( NoSuchElementException, RuntimeException ) rtl::OUString SubstitutePathVariables::impl_reSubstituteVariables( const ::rtl::OUString& rURL ) throw ( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::impl_reSubstituteVariables" ); rtl::OUString aURL; INetURLObject aUrl( rURL ); @@ -1021,7 +1020,11 @@ throw ( RuntimeException ) { aTemp = ConvertOSLtoUCBURL( aTemp ); if ( aTemp.getLength() ) + { aURL = INetURLObject( aTemp ).GetMainURL( INetURLObject::NO_DECODE ); + if( !aURL.getLength() ) + return rURL; + } else return rURL; } |