Undo basis/brand split: move presets/ from basis to brand.

Also let utl::Bootstrap::locateBaseInstallation return
$BRAND_BASE_DIR instead of $OOO_BASE_DIR, so that things match again.

1 files changed, 4 insertions, 7 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 );