summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2010-05-07 17:02:22 +0200
committerJoachim Lingner <jl@openoffice.org>2010-05-07 17:02:22 +0200
commitdc9d30e6e99da3e63f9255a0c5dd046015437665 (patch)
tree27b2e1171521ec06ef9468fdba1dc2ef157c8dff /configmgr
parentcbe7eeb41f84acf01241189b67d17b8a4bb4954b (diff)
jl152 #i77196# adapting configuration backend to changes introduced by SB on DEV300 branch concering different handling of configuration files in extensions, also fixed writing of compiled help files into the user installation
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 48f90fa8382e..7ef1bd3ee3e7 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -368,22 +368,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