diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-18 18:49:34 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-18 18:49:34 +0200 |
| commit | d0a0513a9cbd25b2bcd933ec337f6366c86917cb (patch) | |
| tree | fc3d308ba9d06a7dc9c5ddd4417ac99c79f36d27 /framework | |
| parent | d34a819233de940dcfe389fc87baebfbcbc7da66 (diff) | |
Undo basis/brand split: move program/{addin,filter,plugin} from basis to brand.
And let $(prog), $(progpath), $(progurl) point to brand program/
instead of basis program/.
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index e7648d262c8a..d7e45ef2e8b5 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -1186,12 +1186,6 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable ::utl::Bootstrap::PathStatus aState; ::rtl::OUString sVal ; - rtl::OUString basis(RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR")); - rtl::Bootstrap::expandMacros(basis); - if( basis.isEmpty() ) { - LOG_ERROR( "SubstitutePathVariables::SetPredefinedPathVariables", "Bootstrap code has no value for OOO_BASE_DIR!"); - } - 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. @@ -1215,7 +1209,8 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable // Detect the program directory // Set $(prog), $(progpath), $(progurl) - INetURLObject aProgObj( basis ); + INetURLObject aProgObj( + aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] ); if ( !aProgObj.HasError() && aProgObj.insertName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("program")) ) ) { aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] = aProgObj.GetMainURL(INetURLObject::NO_DECODE); |