diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-31 23:47:02 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-31 23:47:02 +0100 |
| commit | 1635f66a3dd35c5bf34143956940ec44fda751c2 (patch) | |
| tree | 40f0e970ed966dba9ea7ea2071e5a8c41badc036 /scp2 | |
| parent | update first ScMarkData before setting cursor (fdo#42432) (diff) | |
| download | core-1635f66a3dd35c5bf34143956940ec44fda751c2.tar.gz core-1635f66a3dd35c5bf34143956940ec44fda751c2.zip | |
Moved CONFIGURATION_LAYERS from soffice to fundamental ini.
...so that unopkg uses it, too.
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index d9baffadd402..9b75f369d578 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -927,18 +927,6 @@ ProfileItem gid_Brand_Profileitem_Soffice_Startlang End #endif -ProfileItem gid_Brand_Profileitem_Soffice_ConfigurationLayers - ProfileID = gid_Brand_Profile_Soffice_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Key = "CONFIGURATION_LAYERS"; - Value = "xcsxcu:${BRAND_BASE_DIR}/share/registry module:${BRAND_BASE_DIR}/share/registry/modules 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) -End - ProfileItem gid_Brand_Profileitem_Version_Buildid ProfileID = gid_Brand_Profile_Version_Ini; ModuleID = gid_Module_Root_Brand; @@ -1256,6 +1244,18 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Lib_Dir #endif End +ProfileItem gid_Brand_Profileitem_Fundamental_Configuration_Layers + ProfileID = gid_Brand_Profile_Fundamental_Ini; + ModuleID = gid_Module_Root_Brand; + Section = "Bootstrap"; + Key = "CONFIGURATION_LAYERS"; + Value = "xcsxcu:${BRAND_BASE_DIR}/share/registry module:${BRAND_BASE_DIR}/share/registry/modules 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) +End + #if !defined MACOSX ProfileItem gid_Brand_Profileitem_Redirect_Ure_Bootstrap ModuleID = gid_Module_Root_Brand; |