diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-07 21:12:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-07 22:06:28 +0200 |
| commit | 2ff63bcdeac45ca10a6c6ac72ac8c9faf9301aa2 (patch) | |
| tree | 1119c8730bd6628f10923dc3357ecae7d71bad28 /configmgr | |
| parent | 29e11dd13efc2d1325b0f424788484bc8ecf0ce1 (diff) | |
Undo basis/brand split: merge basis share/ into brand share/.
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/components.cxx | 24 |
1 files changed, 7 insertions, 17 deletions
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( |