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.

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 );

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

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");
 

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"