From 2ff63bcdeac45ca10a6c6ac72ac8c9faf9301aa2 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 7 Oct 2011 21:12:30 +0200
Subject: Undo basis/brand split: merge basis share/ into brand share/.

---
 configmgr/source/components.cxx | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

(limited to 'configmgr/source')

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 488792881acf..650df69836de 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -529,32 +529,22 @@ Components::Components(
         0,
         expand(
             rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/registry"))));
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "$BRAND_BASE_DIR/share/registry"))));
     parseModuleLayer(
         2,
         expand(
             rtl::OUString(
                 RTL_CONSTASCII_USTRINGPARAM(
-                    "$OOO_BASE_DIR/share/registry/modules"))));
+                    "$BRAND_BASE_DIR/share/registry/modules"))));
     parseResLayer(
         3,
-        expand(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/share/registry"))));
-    parseXcsXcuLayer(
-        4,
         expand(
             rtl::OUString(
                 RTL_CONSTASCII_USTRINGPARAM(
                     "$BRAND_BASE_DIR/share/registry"))));
-    parseModuleLayer(
-        6,
-        expand(
-            rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM(
-                    "$BRAND_BASE_DIR/share/registry/modules"))));
     parseXcsXcuIniLayer(
-        7,
+        4,
         expand(
             rtl::OUString(
                 RTL_CONSTASCII_USTRINGPARAM(
@@ -564,7 +554,7 @@ Components::Components(
                     "PackageRegistryBackend/configmgr.ini"))),
         false);
     parseXcsXcuIniLayer(
-        9,
+        6,
         expand(
             rtl::OUString(
                 RTL_CONSTASCII_USTRINGPARAM(
@@ -574,7 +564,7 @@ Components::Components(
                     "PackageRegistryBackend/configmgr.ini"))),
         true);
     parseXcsXcuLayer(
-        11,
+        8,
         expand(
             rtl::OUString(
                 RTL_CONSTASCII_USTRINGPARAM(
@@ -585,7 +575,7 @@ Components::Components(
         // can be dropped once old UserInstallation format can no longer exist
         // (probably OOo 4)
     parseXcsXcuIniLayer(
-        13,
+        10,
         expand(
             rtl::OUString(
                 RTL_CONSTASCII_USTRINGPARAM(
-- 
cgit