Drop support for old ...configuration.PackageRegistryBackend/registry layer

...that cannot appear in a LO 4 user profile. Change-Id: I91eaf50289119fd26a54a99067ecfd3f323d61d6

Drop support for old ...configuration.PackageRegistryBackend/registry layer
...that cannot appear in a LO 4 user profile. Change-Id: I91eaf50289119fd26a54a99067ecfd3f323d61d6
67338cc7 · Stephan Bergmann · f4d8090a · 67338cc7
Kaydet (Commit) 67338cc7 authored Ara 05, 2012 tarafından Stephan Bergmann
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

common_brand.scp scp2/source/ooo/common_brand.scp +1 -5

No files found.
--- 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