diff options
| author | sb <sb@openoffice.org> | 2009-11-13 16:15:18 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2009-11-13 16:15:18 +0100 |
| commit | fdaee92fd598e9dba08566d47a45c69ba344a975 (patch) | |
| tree | 1e5f4a92d27e0f8ba8adfa1664bb4e7821208d52 /configmgr/source | |
| parent | 808a34c462d400aeb964400252606ab31ca57cbc (diff) | |
sb111: #i101955# missing second part of HG -c f7af6e98007d (call the extension manager's bookkeeping file configmgr.ini on all platforms, instead of configmgrrc)
Diffstat (limited to 'configmgr/source')
| -rw-r--r-- | configmgr/source/components.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index c374dabcab32..b2480e855ada 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -356,7 +356,7 @@ Components::Components( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno") ":UNO_SHARED_PACKAGES_CACHE}/registry/" "com.sun.star.comp.deployment.configuration." - "PackageRegistryBackend/configmgrrc")))); + "PackageRegistryBackend/configmgr.ini")))); parseXcsXcuLayer( //TODO: migrate 11, expand( @@ -374,7 +374,7 @@ Components::Components( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno") ":UNO_USER_PACKAGES_CACHE}/registry/" "com.sun.star.comp.deployment.configuration." - "PackageRegistryBackend/configmgrrc")))); + "PackageRegistryBackend/configmgr.ini")))); // reading the old user xcs/xcu layer ("${$BRAND_BASE_DIR/program/" + // SAL_CONFIGFILE("bootstrap") + ":UserInstallation}/user/registry") would // potentially fail, anyway, as xcu files in that layer used the xsi |