Undo basis/brand split: fold brand.xcd into main.xcd.

6 files changed, 16 insertions, 36 deletions

diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index 7633907172a3..97dc0c11ff39 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -154,7 +154,6 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
 	org/openoffice/Inet-macosx.xcu \
 	org/openoffice/Inet-unixdesktop.xcu \
 	org/openoffice/Inet-wnt.xcu \
-	org/openoffice/Setup-brand.xcu \
 	org/openoffice/Setup-writer.xcu \
 	org/openoffice/Setup-calc.xcu \
 	org/openoffice/Setup-draw.xcu \
@@ -168,7 +167,6 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
 	org/openoffice/VCL-unixdesktop.xcu \
 	org/openoffice/Office/Accelerators-macosx.xcu \
 	org/openoffice/Office/Accelerators-unxwnt.xcu \
-	org/openoffice/Office/Common-brand.xcu \
 	org/openoffice/Office/Common-writer.xcu \
 	org/openoffice/Office/Common-calc.xcu \
 	org/openoffice/Office/Common-draw.xcu \
@@ -201,7 +199,6 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
 	org/openoffice/Office/Embedding-math.xcu \
 	org/openoffice/Office/Embedding-base.xcu \
 	org/openoffice/Office/Embedding-writer.xcu \
-	org/openoffice/Office/UI-brand.xcu \
 	org/openoffice/Office/Recovery-gconflockdown.xcu \
 	org/openoffice/TypeDetection/UISort-writer.xcu \
 	org/openoffice/TypeDetection/UISort-calc.xcu \
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 998ab38f2cf3..5b94fcf74728 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -124,17 +124,16 @@
   </node>
   <node oor:name="Help">
     <node oor:name="StartCenter">
-        <prop oor:name="AddFeatureURL" oor:type="xs:string"
-                install:module="brand">
+        <prop oor:name="AddFeatureURL" oor:type="xs:string">
             <value>${STARTCENTER_ADDFEATURE_URL}</value>
         </prop>
-        <prop oor:name="InfoURL" oor:type="xs:string" install:module="brand">
+        <prop oor:name="InfoURL" oor:type="xs:string">
             <value>${STARTCENTER_INFO_URL}</value>
         </prop>
         <prop oor:name="TemplateRepositoryURL" oor:type="xs:string">
             <value>${STARTCENTER_TEMPLREP_URL}</value>
         </prop>
-        <prop oor:name="StartCenterLayoutStyle" oor:type="xs:int" install:module="brand">
+        <prop oor:name="StartCenterLayoutStyle" oor:type="xs:int">
             <value>${STARTCENTER_LAYOUT_STYLE}</value>
         </prop>
     </node>
@@ -142,7 +141,7 @@
       <prop oor:name="TemplateURL">
         <value/>
       </prop>
-      <prop oor:name="URL" install:module="brand">
+      <prop oor:name="URL">
         <value>${REGISTRATIONURL}</value>
       </prop>
       <prop oor:name="ReminderDate">
@@ -158,7 +157,7 @@
     </prop>
   </node>
   <node oor:name="Dictionaries">
-    <prop oor:name="RepositoryURL" install:module="brand">
+    <prop oor:name="RepositoryURL">
       <value>${DICT_REPO_URL}</value>
     </prop>
   </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu b/officecfg/registry/data/org/openoffice/Office/UI.xcu
index a79e8a352581..a49ec98b2bb5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu
@@ -282,12 +282,11 @@
         </node>
     </node>
     <node oor:name="ColorScheme">
-        <prop oor:name="CurrentColorScheme" install:module="brand">
+        <prop oor:name="CurrentColorScheme">
             <value>${PRODUCTNAME}</value>
         </prop>
         <node oor:name="ColorSchemes">
-            <node oor:name="${PRODUCTNAME}" oor:op="replace"
-                    install:module="brand">
+            <node oor:name="${PRODUCTNAME}" oor:op="replace">
                 <node oor:name="DocColor">
                     <prop oor:name="Color">
                         <value xsi:nil="true"/>
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 7ce906575ada..fc7affa664ea 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -28,29 +28,29 @@
 <!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
 <oor:component-data oor:name="Setup" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <node oor:name="Product">
-        <prop oor:name="ooName" install:module="brand">
+        <prop oor:name="ooName">
             <value >${PRODUCTNAME}</value>
         </prop>
-        <prop oor:name="ooSetupVersion" install:module="brand">
+        <prop oor:name="ooSetupVersion">
             <value >${PRODUCTVERSION}</value>
         </prop>
-        <prop oor:name="ooSetupVersionAboutBox" install:module="brand">
+        <prop oor:name="ooSetupVersionAboutBox">
             <value>${ABOUTBOXPRODUCTVERSION}</value>
         </prop>
-        <prop oor:name="ooVendor" install:module="brand">
+        <prop oor:name="ooVendor">
             <value>${OOOVENDOR}</value>
         </prop>
 
-        <prop oor:name="ooSetupExtension" install:module="brand">
+        <prop oor:name="ooSetupExtension">
             <value >${PRODUCTEXTENSION}</value>
         </prop>
-        <prop oor:name="ooXMLFileFormatVersion" install:module="brand">
+        <prop oor:name="ooXMLFileFormatVersion">
             <value >${FILEFORMATVERSION}</value>
         </prop>
-        <prop oor:name="ooXMLFileFormatName" install:module="brand">
+        <prop oor:name="ooXMLFileFormatName">
             <value >${FILEFORMATNAME}</value>
         </prop>
-        <prop oor:name="ooOpenSourceContext" install:module="brand">
+        <prop oor:name="ooOpenSourceContext">
             <value >${OPENSOURCE}</value>
         </prop>
     </node>
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index c2dafb14e37c..d82c9ef1bb09 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -35,7 +35,6 @@ MY_MOD = registry/spool
 
 MY_XCDS = \
     $(MISC)/base.xcd \
-    $(MISC)/brand.xcd \
     $(MISC)/calc.xcd \
     $(MISC)/cjk.xcd \
     $(MISC)/ctl.xcd \
@@ -64,13 +63,6 @@ MY_FILES_base = \
     $(MY_MOD)/org/openoffice/Office/Common-base.xcu \
     $(MY_MOD)/org/openoffice/Setup-base.xcu
 
-MY_DEPS_brand = main
-MY_FILES_brand = \
-    $(MY_XCU)/Office/Compatibility.xcu \
-    $(MY_MOD)/org/openoffice/Office/Common-brand.xcu \
-    $(MY_MOD)/org/openoffice/Office/UI-brand.xcu \
-    $(MY_MOD)/org/openoffice/Setup-brand.xcu
-
 MY_DEPS_calc = main
 MY_FILES_calc = \
     $(MY_XCS)/Office/UI/CalcCommands.xcs \
@@ -224,6 +216,7 @@ MY_FILES_main = \
     $(MY_XCU)/Office/Calc.xcu \
     $(MY_XCU)/Office/Canvas.xcu \
     $(MY_XCU)/Office/Common.xcu \
+    $(MY_XCU)/Office/Compatibility.xcu \
     $(MY_XCU)/Office/DataAccess.xcu \
     $(MY_XCU)/Office/Embedding.xcu \
     $(MY_XCU)/Office/ExtensionManager.xcu \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index e7925ba8b699..830f7eaad68f 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -87,7 +87,6 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Lib_Npsoplugin,
              gid_Brand_File_Lib_Subscrib_C05,
              gid_Brand_File_ServicesRdb,
-             gid_Brand_File_Share_Registry_Brand_Xcd,
              gid_Brand_File_Share_Registry_O5oo_Xcd,
              gid_Brand_File_Script_Unopkg,
              gid_Brand_File_Share_Xdg_Base,
@@ -679,13 +678,6 @@ File gid_Brand_File_Txt_Package
     Styles = (PACKED);
 End
 
-File gid_Brand_File_Share_Registry_Brand_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED, SCPZIP_REPLACE);
-    Dir = gid_Brand_Dir_Share_Registry;
-    Name = "brand.xcd";
-End
-
 File gid_Brand_File_Share_Registry_Cjk_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED,MAKE_LANG_SPECIFIC);