summaryrefslogtreecommitdiff
path: root/configmgr/source
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
commit1e7ad9a8a466f00b8159dba98c05cc90557ba28e (patch)
tree7482308ef80d03c1a3a7a8650db9f60affb04cda /configmgr/source
parentf1d9a98fab2c2c9ae1d3cde2f82dae42606726a0 (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/source')
-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 48f90fa838..f7f39a9403 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