From 0f96c76362874c6eb76f4cd956ba8311d06a2ed1 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 17 Oct 2011 18:49:48 +0200
Subject: Undo basis/brand split: fold brand.xcd into main.xcd.

---
 officecfg/Configuration_officecfg.mk                     |  3 ---
 officecfg/registry/data/org/openoffice/Office/Common.xcu | 11 +++++------
 officecfg/registry/data/org/openoffice/Office/UI.xcu     |  5 ++---
 officecfg/registry/data/org/openoffice/Setup.xcu         | 16 ++++++++--------
 4 files changed, 15 insertions(+), 20 deletions(-)

(limited to 'officecfg')

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>
-- 
cgit