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

1 files changed, 8 insertions, 8 deletions

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>