diff options
4 files changed, 8 insertions, 11 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index d4a20da2c22e..e7648d262c8a 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -1186,13 +1186,10 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable ::utl::Bootstrap::PathStatus aState; ::rtl::OUString sVal ; - rtl::OUString basis; - aState = utl::Bootstrap::locateBaseInstallation( sVal ); - if( aState==::utl::Bootstrap::PATH_EXISTS ) { - basis = ConvertOSLtoUCBURL( sVal ); - } - else { - LOG_ERROR( "SubstitutePathVariables::SetPredefinedPathVariables", "Bootstrap code has no value for instpath!"); + 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 ); diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index b505095076c7..2d523951c7e5 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -172,9 +172,9 @@ End Directory gid_Dir_User #if defined MACOSX - ParentID = gid_Brand_Dir_BasisLink; + ParentID = gid_Dir_Bundle_Contents; #else - ParentID = gid_Dir_Ooo_Basis; + ParentID = gid_Dir_Brand_Root; #endif DosName = "presets"; End diff --git a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx index 94351180c8af..1e30c4611245 100644 --- a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx +++ b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx @@ -244,7 +244,7 @@ extern "C" UINT __stdcall RemoveExtensions(MSIHANDLE handle) return ERROR_SUCCESS; } - // Removing complete directory "Basis\presets\bundled" + // Removing complete directory "Basis\prereg\bundled" std::_tstring sCacheDir = sInstDir + TEXT("share\\prereg\\bundled"); diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index c2398541b126..1f960cff3315 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -58,7 +58,7 @@ #define BOOTSTRAP_ITEM_VERSIONFILE "Location" #define BOOTSTRAP_ITEM_BUILDID "buildid" -#define BOOTSTRAP_ITEM_BASEINSTALLATION "BaseInstallation" +#define BOOTSTRAP_ITEM_BASEINSTALLATION "BRAND_BASE_DIR" #define BOOTSTRAP_ITEM_USERINSTALLATION "UserInstallation" #define BOOTSTRAP_ITEM_SHAREDIR "SharedDataDir" |