summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
Diffstat (limited to 'framework')
-rw-r--r--framework/source/services/substitutepathvars.cxx5
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;
}