diff options
author | obo <obo@openoffice.org> | 2011-03-16 10:11:17 +0100 |
---|---|---|
committer | obo <obo@openoffice.org> | 2011-03-16 10:11:17 +0100 |
commit | ae8ebca63dca37e1ef6584577d375248681b3d90 (patch) | |
tree | e46aa30fdccfed41b81657e30ac85d603f09843b /framework | |
parent | b7d4d897a9fb26df5d4cd63dcba1839f63d412cb (diff) | |
parent | 7df9c3ee7869860e42d50a9fbb6f3ee46682dd75 (diff) |
CWS-TOOLING: integrate CWS jl164
Diffstat (limited to 'framework')
-rwxr-xr-x[-rw-r--r--] | framework/source/services/substitutepathvars.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index df4768caf9..9c55ceb992 100644..100755 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -1176,12 +1176,12 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable } aState = utl::Bootstrap::locateUserData( sVal ); + //There can be the valid case that there is no user installation. For example, "unopkg sync" + //is currently (OOo3.4) run as part of the setup. Then no user installation is required. + //Therefore we do not assert here. if( aState == ::utl::Bootstrap::PATH_EXISTS ) { aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ] = ConvertOSLtoUCBURL( sVal ); } - else { - LOG_ERROR( "SubstitutePathVariables::SetPredefinedPathVariables", "Bootstrap code has no value for userpath"); - } // Set $(inst), $(instpath), $(insturl) aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; |