diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-12-05 12:21:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-12-05 15:03:49 +0100 |
| commit | e535633ee715ea527938aff7b980b1ea7db4f656 (patch) | |
| tree | 3702bc2ab7c55815a38fa569acc7cccff9f3a3e6 | |
| parent | 03562cedea2f0c4cc0bbeeddce8224de7c23386d (diff) | |
Drop support for old ...configuration.PackageRegistryBackend/registry layer
...that cannot appear in a LO 4 user profile.
Change-Id: I91eaf50289119fd26a54a99067ecfd3f323d61d6
(cherry picked from commit 67338cc75dea10dd7643d23ee794300e0ebe8936)
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index ebfb49f80fa5..7ba7e76d1bc7 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1278,11 +1278,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Configuration_Layers ModuleID = gid_Module_Root_Brand; Section = "Bootstrap"; Key = "CONFIGURATION_LAYERS"; - Value = "xcsxcu:${BRAND_BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini xcsxcu:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry userext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu"; - // "xcsxcu:${${BRAND_BASE_DIR}/program/"PROFILENAME(uno) - // ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment." - // "configuration.PackageRegistryBackend/registry" can be dropped once - // old UserInstallation format can no longer exist (probably OOo 4) + Value = "xcsxcu:${BRAND_BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu"; End #if !defined MACOSX |