mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't let the PathSubstitution service null relative paths

Browse Source
This commit is contained in:
Michael Meeks
2011-09-11 09:19:40 +02:00
parent 0f690c3495
commit 59b36fc62e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
framework/source/services/substitutepathvars.cxx
View File

@@ -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;
}