summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2010-06-30 15:38:26 +0200
committersb <sb@openoffice.org>2010-06-30 15:38:26 +0200
commite96293e65a972a440aa5435bf22268a7ae4cef23 (patch)
treedb1f4e4b6ef586e00320f2d71704da7f8caa4857 /configmgr
parentb9e345f57f4ecf2b27a71b0bea344ec83ecfd50a (diff)
parenta2e7c2e0d002d75a6b77a629a4e904ab54bf8375 (diff)
sb126: merged in DEV300_m84
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/components.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 5b30e9491eb4..04e6317c959d 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -369,22 +369,22 @@ Components::Components(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"$BRAND_BASE_DIR/share/registry/modules"))));
- parseXcsXcuLayer( //TODO: migrate
+ parseXcsXcuIniLayer(
7,
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")
- ":UNO_SHARED_PACKAGES_CACHE}/registry/"
+ ":BUNDLED_EXTENSIONS_USER}/registry/"
"com.sun.star.comp.deployment.configuration."
- "PackageRegistryBackend/registry"))));
+ "PackageRegistryBackend/configmgr.ini"))));
parseXcsXcuIniLayer(
9,
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
"${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")
- ":UNO_SHARED_PACKAGES_CACHE}/registry/"
+ ":SHARED_EXTENSIONS_USER}/registry/"
"com.sun.star.comp.deployment.configuration."
"PackageRegistryBackend/configmgr.ini"))));
parseXcsXcuLayer( //TODO: migrate