diff options
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 9 | ||||
| -rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 6 |
2 files changed, 5 insertions, 10 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); diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 726834a85025..836e79ac168d 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -127,7 +127,7 @@ End Directory gid_Dir_Addin Styles = (CREATE); - ParentID = gid_Dir_Program; + ParentID = gid_Brand_Dir_Program; DosName = "addin"; End @@ -137,7 +137,7 @@ Directory gid_Dir_Addin_Source End Directory gid_Dir_Filter - ParentID = gid_Dir_Program; + ParentID = gid_Brand_Dir_Program; DosName = "filter"; End @@ -344,7 +344,7 @@ Directory gid_Dir_Work End Directory gid_Dir_Plugin - ParentID = gid_Dir_Program; + ParentID = gid_Brand_Dir_Program; DosName = "plugin"; Styles = (WORKSTATION, CREATE); End |