Undo basis/brand split: merge basis program/resource/ into brand program/resource/.

scp2/inc/macros.inc

@@ -190,14 +190,6 @@
         Styles  = (PACKED); \
     End
 
-#define BRAND_RES_FILE(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        RESFILE_ALL_LANG(name); \
-        Dir     = gid_Brand_Dir_Program_Resource; \
-        Styles  = (PACKED); \
-    End
-
 #define STD_RES_FILE_PATCH(id,name) \
     File id \
         TXT_FILE_BODY; \

scp2/source/ooo/common_brand.scp

@@ -120,7 +120,6 @@ Module gid_Module_Langpack_Brand_Template
     InstallOrder = "1050";
     Dirs = (gid_Brand_Dir_Program,
             gid_Brand_Dir_Program_Shell,
-            gid_Brand_Dir_Program_Resource,
             gid_Brand_Dir_Readme);
     Files = (gid_Brand_File_Res_Iso,
              gid_Brand_File_Res_Ooo,
@@ -147,11 +146,6 @@ Directory gid_Brand_Dir_Program
 #endif
 End
 
-Directory gid_Brand_Dir_Program_Resource
-    ParentID = gid_Brand_Dir_Program;
-    DosName = "resource";
-End
-
 Directory gid_Brand_Dir_Program_Shell
     ParentID = gid_Brand_Dir_Program;
     DosName = "shell";

scp2/source/ooo/directory_ooo.scp

@@ -142,7 +142,7 @@ Directory gid_Dir_Filter
 End
 
 Directory gid_Dir_Resource
-    ParentID = gid_Dir_Program;
+    ParentID = gid_Brand_Dir_Program;
     DosName = "resource";
 End
 

tools/source/rc/resmgr.cxx

@@ -207,10 +207,6 @@ void ResMgrContainer::init()
         RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/resource"));
     rtl::Bootstrap::expandMacros(uri);
     aDirs.push_back(uri);
-    uri = rtl::OUString(
-        RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program/resource"));
-    rtl::Bootstrap::expandMacros(uri);
-    aDirs.push_back(uri);
 
     // 2. in STAR_RESOURCEPATH
     const sal_Char* pEnv = getenv( "STAR_RESOURCEPATH" );