scp2/source/ooo/common_brand.scp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7fdfba8ad95972686ba29667d6eb7d7c326a0b87
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Aug 21 16:22:41 2015 +0200
Missing #undef
Change-Id: Ifd546c3dbc383fd6234c5a1b9ddce7701038823f
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 65aee37..1a30bd6 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1139,6 +1139,7 @@ ProfileItem
gid_Brand_Profileitem_Fundamental_Configuration_Layers
End
#undef CONFIGURATION_LAYERS_DCONF
#undef CONFIGURATION_LAYERS_WINREG
+#undef CONFIGURATION_LAYERS_WINUSERREG
#if !defined MACOSX
ProfileItem gid_Brand_Profileitem_Redirect_Ure_Bootstrap
commit ecaba09c7e1109d3d29bb859722dcd2ef886e6f5
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Aug 21 16:21:10 2015 +0200
Use CONFIGURATION_LAYERS_DCONF
...missing from ecc617e797aa5ed329668114e54ec7ffa5c0e87b "configmgr: support
reading from a dconf layer (WIP)"
Change-Id: I4e9f2fd216a3ef49d0cadb6d5fa6b2517a6bcdb6
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index ca165b7..65aee37 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1135,7 +1135,7 @@ ProfileItem
gid_Brand_Profileitem_Fundamental_Configuration_Layers
ModuleID = gid_Module_Root_Brand;
Section = "Bootstrap";
Key = "CONFIGURATION_LAYERS";
- Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry
res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry"
CONFIGURATION_LAYERS_WINREG " bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER
"/" PROFILENAME(louno)
":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno)
":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
userext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno)
":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
" CONFIGURATION_LAYERS_WINUSERREG " user:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER
"/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu";
+ Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry
res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry"
CONFIGURATION_LAYERS_DCONF CONFIGURATION_LAYERS_WINREG "
bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno)
":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno)
":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
userext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno)
":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
" CONFIGURATION_LAYERS_WINUSERREG " user:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER
"/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu";
End
#undef CONFIGURATION_LAYERS_DCONF
#undef CONFIGURATION_LAYERS_WINREG
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
