diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2016-03-28 22:08:25 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2016-03-28 22:08:25 +0100 |
| commit | 24f351bda04a0a6198336981c54c5438c6dad723 (patch) | |
| tree | d7bed69878d0e28ce49dd409baea9b5c11f7864b /framework | |
| parent | ec60e33dd83b1bdec01b2c4a1dbaa15e92c9f6b5 (diff) | |
handle failure to expand ~ in path elements.
This can occur in some online corner-cases.
Change-Id: Id8b419179d775a21110d682ba76d8a02f45eb828
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index acead687f975..190ef3af73c1 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -841,9 +841,8 @@ OUString SubstitutePathVariables::GetHomeVariableValue() const OUString SubstitutePathVariables::GetPathVariableValue() const { - OUString aRetStr; - const char* pEnv = getenv( "PATH" ); + const char* pEnv = getenv( "PATH" ); if ( pEnv ) { @@ -857,9 +856,10 @@ OUString SubstitutePathVariables::GetPathVariableValue() const do { OUString sToken = aPathList.getToken(0, SAL_PATHSEPARATOR, nToken); - if (!sToken.isEmpty()) + if (!sToken.isEmpty() && + osl::FileBase::getFileURLFromSystemPath( sToken, aTmp ) == + osl::FileBase::RC::E_None ) { - osl::FileBase::getFileURLFromSystemPath( sToken, aTmp ); if ( bAppendSep ) aPathStrBuffer.appendAscii( ";" ); // Office uses ';' as path separator aPathStrBuffer.append( aTmp ); |