Adding upstream version 4:24.2.0.upstream/4%24.2.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

157 files changed, 19548 insertions, 0 deletions

diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
new file mode 100644
index 0000000000..4cfcbde8c8
--- /dev/null
+++ b/scp2/AutoInstall.mk
@@ -0,0 +1,58 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AutoInstall_AutoInstall))
+
+$(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYTABLE))
+$(eval $(call gb_AutoInstall_add_module,activex,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,activexwin64,LIBO_LIB_FILE_COMPONENTCONDITION,,,,"VersionNT64"))
+$(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE,LIBO_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
+$(eval $(call gb_AutoInstall_add_module,extensions_numbertext,,,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE))
+$(eval $(call gb_AutoInstall_add_module,firebirdsdbc,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE,LIBO_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,impress_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE,LIBO_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,libreofficekit,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,math_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,LIBO_EXECUTABLE_COMPONENTCONDITION,,PACKAGE_FILELIST_COMPONENTCONDITION,"ISCHECKFORPRODUCTUPDATES=1"))
+$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,ooo_fonts,,,,PACKAGE_FILELIST_FONT))
+$(eval $(call gb_AutoInstall_add_module,ooo_images,,,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
+$(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,python_scriptprovider,,,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,python_librelogo,,,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE,,SDK_PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,spsuppfiles,LIBO_LIB_FILE,LIBO_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
+$(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE))
+ifeq ($(BUILD_X64),TRUE)
+$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_X64_LIB_FILE_COMPONENTCONDITION,,,PACKAGE_FILELIST_COMPONENTCONDITION,"VersionNT64"))
+endif
+$(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,xsltfilter,,,,PACKAGE_FILELIST))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/CustomTarget_langmacros.mk b/scp2/CustomTarget_langmacros.mk
new file mode 100644
index 0000000000..48cb596335
--- /dev/null
+++ b/scp2/CustomTarget_langmacros.mk
@@ -0,0 +1,23 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,scp2/macros))
+
+$(call gb_CustomTarget_get_target,scp2/macros) : $(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc
+
+$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc :| $(call gb_CustomTarget_get_workdir,scp2/macros)/.dir
+
+$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc : $(SRCDIR)/scp2/macros/macro.pl $(BUILDDIR)/config_host.mk.stamp
+	$(call gb_Helper_abbreviate_dirs,\
+		export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \
+		export HELP_LANGS='$(gb_HELP_LANGS)' && \
+		$(PERL) $< -verbose -o $@ -c $(BUILDDIR)/config_host.mk.stamp \
+	)
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_activex.mk b/scp2/InstallModule_activex.mk
new file mode 100644
index 0000000000..ea9b473131
--- /dev/null
+++ b/scp2/InstallModule_activex.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/activex))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/activex,\
+	activexbinarytable \
+	activex \
+	activexwin64 \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/activex,\
+    scp2/source/activex/module_activex \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
new file mode 100644
index 0000000000..709d1493e0
--- /dev/null
+++ b/scp2/InstallModule_base.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/base))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,\
+	base \
+	base_brand \
+	firebirdsdbc \
+	postgresqlsdbc \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/base,\
+	ENABLE_MACOSX_SANDBOX \
+	ENABLE_FIREBIRD_SDBC \
+	SYSTEM_FIREBIRD \
+))
+
+$(eval $(call gb_InstallModule_add_templates,scp2/base,\
+    scp2/source/templates/module_langpack_base \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/base,\
+    scp2/source/base/file_base \
+    scp2/source/base/firebird \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/base,\
+    scp2/source/base/module_base \
+    scp2/source/base/postgresqlsdbc \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk
new file mode 100644
index 0000000000..0484fac317
--- /dev/null
+++ b/scp2/InstallModule_calc.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/calc))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/calc,\
+	calc \
+	calc_brand \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/calc,\
+	ENABLE_MACOSX_SANDBOX \
+))
+
+ifneq (,$(ENABLE_COINMP)$(ENABLE_LPSOLVE))
+$(eval $(call gb_InstallModule_add_defs,scp2/calc,\
+	-DWITH_LPSOLVER \
+))
+endif
+
+$(eval $(call gb_InstallModule_add_templates,scp2/calc,\
+    scp2/source/templates/module_langpack_calc \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/calc,\
+    scp2/source/calc/file_calc \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/calc,\
+    scp2/source/calc/module_calc \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk
new file mode 100644
index 0000000000..a7c02bef4b
--- /dev/null
+++ b/scp2/InstallModule_draw.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/draw))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/draw,\
+	draw_brand \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/draw,\
+	ENABLE_MACOSX_SANDBOX \
+))
+
+$(eval $(call gb_InstallModule_add_templates,scp2/draw,\
+    scp2/source/templates/module_langpack_draw \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/draw,\
+    scp2/source/draw/file_draw \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/draw,\
+    scp2/source/draw/module_draw \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk
new file mode 100644
index 0000000000..fe5a969d69
--- /dev/null
+++ b/scp2/InstallModule_extensions.mk
@@ -0,0 +1,24 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/extensions))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_bsh))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_rhino))
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/extensions,extensions_numbertext))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/extensions,\
+    scp2/source/extensions/file_extensions \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/extensions,\
+    scp2/source/extensions/module_extensions \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
new file mode 100644
index 0000000000..c33f4f52d6
--- /dev/null
+++ b/scp2/InstallModule_gnome.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/gnome))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/gnome,\
+    scp2/source/gnome/file_gnome \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/gnome,\
+    scp2/source/gnome/module_gnome \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_graphicfilter.mk b/scp2/InstallModule_graphicfilter.mk
new file mode 100644
index 0000000000..05e86c843c
--- /dev/null
+++ b/scp2/InstallModule_graphicfilter.mk
@@ -0,0 +1,26 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/graphicfilter))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/graphicfilter,graphicfilter))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/graphicfilter,\
+	ENABLE_MACOSX_SANDBOX \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/graphicfilter,\
+	scp2/source/graphicfilter/file_graphicfilter \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/graphicfilter,\
+    scp2/source/graphicfilter/module_graphicfilter \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk
new file mode 100644
index 0000000000..fc097b5e13
--- /dev/null
+++ b/scp2/InstallModule_impress.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/impress))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/impress,\
+	impress \
+	impress_brand \
+	ogltrans \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/impress,\
+	ENABLE_MACOSX_SANDBOX \
+))
+
+$(eval $(call gb_InstallModule_add_templates,scp2/impress,\
+    scp2/source/templates/module_langpack_impress \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/impress,\
+    scp2/source/impress/file_impress \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/impress,\
+	$(if $(filter TRUE,$(ENABLE_OPENGL_TRANSITIONS)),\
+		scp2/source/impress/module_ogltrans \
+	) \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/impress,\
+    scp2/source/impress/module_impress \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_kde.mk b/scp2/InstallModule_kde.mk
new file mode 100644
index 0000000000..9130b62070
--- /dev/null
+++ b/scp2/InstallModule_kde.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/kde))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/kde,kde))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/kde,\
+    scp2/source/kde/module_kde \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_math.mk b/scp2/InstallModule_math.mk
new file mode 100644
index 0000000000..3b2d33f5e7
--- /dev/null
+++ b/scp2/InstallModule_math.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/math))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/math,\
+	math \
+	math_brand \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/math,\
+	ENABLE_MACOSX_SANDBOX \
+))
+
+$(eval $(call gb_InstallModule_add_templates,scp2/math,\
+    scp2/source/templates/module_langpack_math \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/math,\
+    scp2/source/math/file_math \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/math,\
+    scp2/source/math/module_math \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_onlineupdate.mk b/scp2/InstallModule_onlineupdate.mk
new file mode 100644
index 0000000000..bcafd2f812
--- /dev/null
+++ b/scp2/InstallModule_onlineupdate.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/onlineupdate))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/onlineupdate,onlineupdate))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/onlineupdate,\
+    scp2/source/onlineupdate/file_onlineupdate \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/onlineupdate,\
+    scp2/source/onlineupdate/module_onlineupdate \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
new file mode 100644
index 0000000000..9a6f3eb4cb
--- /dev/null
+++ b/scp2/InstallModule_ooo.mk
@@ -0,0 +1,97 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/ooo))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
+	brand \
+	libreofficekit \
+	ooo \
+	ooo_fonts \
+	ooo_images \
+	ooobinarytable \
+	pdfimport \
+	reportbuilder \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
+	ENABLE_MACOSX_SANDBOX \
+	ENABLE_ONLINE_UPDATE \
+	MPL_SUBSET \
+	SYSTEM_CURL \
+	SYSTEM_HSQLDB \
+	SYSTEM_LIBXSLT \
+	SYSTEM_REDLAND \
+	WITH_GALLERY_BUILD \
+	WITH_MYSPELL_DICTS \
+))
+
+$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
+	$(if $(SYSTEM_HSQLDB),\
+		-DHSQLDB_JAR=\""$(call gb_Helper_make_url,$(HSQLDB_JAR))"\" \
+	) \
+))
+
+ifeq ($(USING_X11),TRUE)
+$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
+	-DUSING_X11 \
+))
+endif
+
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
+	-DDBCONNECTIVITY \
+))
+endif
+
+$(eval $(call gb_InstallModule_add_templates,scp2/ooo,\
+    scp2/source/templates/module_helppack \
+    scp2/source/templates/module_helppack_root \
+    scp2/source/templates/module_langpack \
+    scp2/source/templates/module_langpack_root \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
+    scp2/source/ooo/common_brand \
+    scp2/source/ooo/directory_ooo \
+    scp2/source/ooo/directory_ooo_macosx \
+    scp2/source/ooo/file_extra_ooo \
+    scp2/source/ooo/file_library_ooo \
+    scp2/source/ooo/file_ooo \
+    scp2/source/ooo/installation_ooo \
+    scp2/source/ooo/module_help_template \
+    scp2/source/ooo/module_hidden_ooo \
+    scp2/source/ooo/module_lang_template \
+    scp2/source/ooo/profileitem_ooo \
+    scp2/source/ooo/scpaction_ooo \
+    $(if $(filter-out MACOSX WNT,$(OS)), \
+		scp2/source/ooo/module_libreofficekit \
+	) \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/ooo,\
+    scp2/source/ooo/module_helppack \
+    scp2/source/ooo/module_langpack \
+    scp2/source/ooo/module_ooo \
+    scp2/source/ooo/module_systemint \
+))
+
+ifeq ($(ENABLE_PDFIMPORT),TRUE)
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
+    scp2/source/ooo/module_pdfimport \
+))
+endif
+
+ifeq ($(ENABLE_REPORTBUILDER),TRUE)
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/ooo,\
+    scp2/source/ooo/module_reportbuilder \
+))
+endif
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk
new file mode 100644
index 0000000000..e4f3bd5f7d
--- /dev/null
+++ b/scp2/InstallModule_python.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/python))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,\
+	python \
+	python_scriptprovider \
+	$(call gb_Helper_optional,LIBRELOGO,python_librelogo) \
+))
+
+ifeq ($(DISABLE_PYTHON),TRUE)
+$(eval $(call gb_InstallModule_add_defs,scp2/python,\
+	-DDISABLE_PYUNO \
+))
+else ifneq ($(SYSTEM_PYTHON),)
+$(eval $(call gb_InstallModule_add_defs,scp2/python,\
+	-DSYSTEM_PYTHON \
+))
+
+else
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/python,\
+	ENABLE_MACOSX_SANDBOX \
+))
+
+$(eval $(call gb_InstallModule_add_defs,scp2/python,\
+	-DPYVERSION=$(PYTHON_VERSION) \
+	$(call gb_Helper_optional,LIBRELOGO,-DENABLE_LIBRELOGO=1) \
+))
+endif
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/python,\
+    scp2/source/python/file_python \
+	$(call gb_Helper_optional,LIBRELOGO,scp2/source/python/file_python_librelogo) \
+    scp2/source/python/module_python \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/python,\
+	$(call gb_Helper_optional,LIBRELOGO,scp2/source/python/module_python_librelogo) \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_quickstart.mk b/scp2/InstallModule_quickstart.mk
new file mode 100644
index 0000000000..8ac14c9ae9
--- /dev/null
+++ b/scp2/InstallModule_quickstart.mk
@@ -0,0 +1,24 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/quickstart))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/quickstart,\
+	quickstart \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/quickstart,\
+    scp2/source/quickstart/registryitem_quickstart \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/quickstart,\
+    scp2/source/quickstart/module_quickstart \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_sdkoo.mk b/scp2/InstallModule_sdkoo.mk
new file mode 100644
index 0000000000..4c2881f351
--- /dev/null
+++ b/scp2/InstallModule_sdkoo.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/sdkoo))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/sdkoo,sdk))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\
+    scp2/source/sdkoo/sdkoo \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_spsupp.mk b/scp2/InstallModule_spsupp.mk
new file mode 100644
index 0000000000..7d01a7b020
--- /dev/null
+++ b/scp2/InstallModule_spsupp.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/spsupp))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/spsupp,\
+    spsuppfiles \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/spsupp,\
+    scp2/source/spsupp/module_spsupp \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_ure.mk b/scp2/InstallModule_ure.mk
new file mode 100644
index 0000000000..6a994ff15e
--- /dev/null
+++ b/scp2/InstallModule_ure.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/ure))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ure,ure))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/ure,\
+	ENABLE_MACOSX_SANDBOX \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/ure,\
+    scp2/source/ooo/ure \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_windows.mk b/scp2/InstallModule_windows.mk
new file mode 100644
index 0000000000..bd6e478e77
--- /dev/null
+++ b/scp2/InstallModule_windows.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/windows))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/windows,\
+	BUILD_X64 \
+))
+
+$(eval $(call gb_InstallModule_add_defs,scp2/windows,\
+	$(if $(WINDOWS_SDK_HOME),\
+		-DHAVE_WINDOWS_SDK \
+	) \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/windows,\
+    scp2/source/ooo/folder_ooo \
+    $(if $(MSM_PATH),scp2/source/ooo/vc_redist) \
+    $(if $(UCRT_REDISTDIR),scp2/source/ooo/ucrt) \
+    scp2/source/ooo/windowscustomaction_ooo \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/windows,\
+    scp2/source/base/folderitem_base \
+    scp2/source/base/registryitem_base \
+    scp2/source/calc/folderitem_calc \
+    scp2/source/calc/registryitem_calc \
+    scp2/source/draw/folderitem_draw \
+    scp2/source/draw/registryitem_draw \
+    scp2/source/impress/folderitem_impress \
+    scp2/source/impress/registryitem_impress \
+    scp2/source/math/folderitem_math \
+    scp2/source/math/registryitem_math \
+    scp2/source/ooo/folderitem_ooo \
+    scp2/source/ooo/registryitem_ooo \
+    scp2/source/writer/folderitem_writer \
+    scp2/source/writer/registryitem_writer \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_winexplorerext.mk b/scp2/InstallModule_winexplorerext.mk
new file mode 100644
index 0000000000..c3da66809a
--- /dev/null
+++ b/scp2/InstallModule_winexplorerext.mk
@@ -0,0 +1,31 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/winexplorerext))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/winexplorerext,\
+	BUILD_X64 \
+))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/winexplorerext,\
+	winexplorerextbinarytable \
+	winexplorerext \
+	$(if $(filter TRUE,$(BUILD_X64)),winexplorerextwin64) \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/winexplorerext,\
+    scp2/source/winexplorerext/file_winexplorerext \
+    scp2/source/winexplorerext/registryitem_winexplorerext \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/winexplorerext,\
+    scp2/source/winexplorerext/module_winexplorerext \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_writer.mk b/scp2/InstallModule_writer.mk
new file mode 100644
index 0000000000..cfc4d9a95d
--- /dev/null
+++ b/scp2/InstallModule_writer.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/writer))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/writer,\
+	writer \
+	writer_brand \
+))
+
+$(eval $(call gb_InstallModule_define_if_set,scp2/writer,\
+	ENABLE_MACOSX_SANDBOX \
+))
+
+$(eval $(call gb_InstallModule_add_templates,scp2/writer,\
+    scp2/source/templates/module_langpack_writer \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/writer,\
+    scp2/source/writer/file_writer \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/writer,\
+    scp2/source/writer/module_writer \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_xsltfilter.mk b/scp2/InstallModule_xsltfilter.mk
new file mode 100644
index 0000000000..7835254f52
--- /dev/null
+++ b/scp2/InstallModule_xsltfilter.mk
@@ -0,0 +1,24 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallModule_InstallModule,scp2/xsltfilter))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/xsltfilter,\
+	xsltfilter \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/xsltfilter,\
+    scp2/source/xsltfilter/file_xsltfilter \
+))
+
+$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/xsltfilter,\
+    scp2/source/xsltfilter/module_xsltfilter \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallScript_sdkoo.mk b/scp2/InstallScript_sdkoo.mk
new file mode 100644
index 0000000000..94d80345d6
--- /dev/null
+++ b/scp2/InstallScript_sdkoo.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallScript_InstallScript,sdkoo))
+
+$(eval $(call gb_InstallScript_use_modules,sdkoo,\
+    scp2/sdkoo \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
new file mode 100644
index 0000000000..6f7b582042
--- /dev/null
+++ b/scp2/InstallScript_setup_osl.mk
@@ -0,0 +1,47 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_InstallScript_InstallScript,setup_osl))
+
+$(eval $(call gb_InstallScript_use_modules,setup_osl,\
+	scp2/base \
+	scp2/calc \
+	scp2/draw \
+	scp2/graphicfilter \
+	scp2/impress \
+	scp2/math \
+	scp2/ooo \
+	scp2/python \
+	scp2/ure \
+	scp2/writer \
+	scp2/xsltfilter \
+	$(if $(filter WNT,$(OS)),\
+		scp2/activex \
+		scp2/quickstart \
+		scp2/spsupp \
+		scp2/windows \
+		$(if $(filter MSC,$(COM)),\
+			scp2/winexplorerext \
+		) \
+	) \
+	$(if $(WITH_EXTENSION_INTEGRATION),\
+		scp2/extensions \
+	) \
+	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK3)),\
+		scp2/gnome \
+	) \
+	$(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_KF5) $(ENABLE_GTK3_KDE5)),\
+		scp2/kde \
+	) \
+	$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
+		scp2/onlineupdate \
+	) \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/Makefile b/scp2/Makefile
new file mode 100644
index 0000000000..ccb1c85a04
--- /dev/null
+++ b/scp2/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
new file mode 100644
index 0000000000..25ae8167df
--- /dev/null
+++ b/scp2/Module_scp2.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,scp2))
+
+$(eval $(call gb_Module_add_targets,scp2,\
+	AutoInstall \
+	CustomTarget_langmacros \
+	InstallModule_base \
+	InstallModule_calc \
+	InstallModule_draw \
+	InstallModule_extensions \
+	InstallModule_graphicfilter \
+	InstallModule_impress \
+	InstallModule_math \
+	InstallModule_onlineupdate \
+	InstallModule_ooo \
+	InstallModule_python \
+	InstallModule_spsupp \
+	InstallModule_ure \
+	InstallModule_writer \
+	InstallModule_xsltfilter \
+	InstallScript_setup_osl \
+	$(if $(filter ODK,$(BUILD_TYPE)), \
+		InstallModule_sdkoo \
+		InstallScript_sdkoo \
+	) \
+	$(if $(filter WNT,$(OS)),\
+		InstallModule_activex \
+		InstallModule_quickstart \
+		InstallModule_windows \
+		InstallModule_winexplorerext \
+	) \
+	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK3)),\
+		InstallModule_gnome \
+	) \
+	$(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_KF5) $(ENABLE_GTK3_KDE5)),\
+		InstallModule_kde \
+	) \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/README.md b/scp2/README.md
new file mode 100644
index 0000000000..162e736b94
--- /dev/null
+++ b/scp2/README.md
@@ -0,0 +1,6 @@
+# SCript Particle Installer
+
+This contains code that describes which pieces of the project should
+be packaged and installed - it is used to build among other things
+a `setup_osl.inf` or `.ins` file - that is used by `solenv/bin/make_installer.pl`
+to build the installation.
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
new file mode 100644
index 0000000000..8f507c5103
--- /dev/null
+++ b/scp2/inc/macros.inc
@@ -0,0 +1,611 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef MACROS_INC
+#define MACROS_INC
+/* =====================================================
+ * global helper macros
+ * =====================================================*/
+
+#define DOSTRING( x )                           #x
+#define STRING( x )                             DOSTRING( x )
+#define DOCONCAT2( x, y )                       x##y
+#define CONCAT2( x, y)                          DOCONCAT2(x,y)
+#define DOCONCAT3( x, y, z )                    x##y##z
+#define CONCAT3( x, y, z )                      DOCONCAT3(x,y,z)
+#define DOCONCAT4( x, y, z, a )                 x##y##z##a
+#define CONCAT4( x, y, z, a )                   DOCONCAT4(x,y,z,a)
+#define DOCONCAT5( x, y, z, a, b )              x##y##z##a##b
+#define CONCAT5( x, y, z, a, b )                DOCONCAT5(x,y,z,a,b)
+#define DOCONCAT6( x, y, z, a, b, c )           x##y##z##a##b##c
+#define CONCAT6( x, y, z, a, b, c )             DOCONCAT6(x,y,z,a,b,c)
+#define DOCONCAT7( x, y, z, a, b, c, u)         x##y##z##a##b##c##u
+#define CONCAT7( x, y, z, a, b, c, u)           DOCONCAT7(x,y,z,a,b,c,u)
+#define DOCONCAT8( x, y, z, a, b, c, u, v)      x##y##z##a##b##c##u##v
+#define CONCAT8( x, y, z, a, b, c, u, v)        DOCONCAT8(x,y,z,a,b,c,u,v)
+#define DOCONCAT9( x, y, z, a, b, c, u, v, w)   x##y##z##a##b##c##u##v##w
+#define CONCAT9( x, y, z, a, b, c, u, v, w)     DOCONCAT9(x,y,z,a,b,c,u,v,w)
+
+#define MOD_NAME_DESC(id) \
+        ALL_LANG(Name,STR_NAME_##id); \
+        ALL_LANG(Description,STR_DESC_##id)
+
+#define REG_VALUE_LNG(id) \
+        ALL_LANG(Value,STR_REG_VAL_##id);
+
+#ifdef UNX
+    #ifdef MACOSX
+        #define UNXSUFFIX .dylib
+    #else
+        #define UNXSUFFIX .so
+    #endif
+#endif
+
+#ifdef UNX
+    #define PROFILENAME(name)                 STRING(CONCAT2(name,rc))
+#else
+    #define PROFILENAME(name)                 STRING(CONCAT2(name,.ini))
+#endif
+
+#ifdef MACOSX
+    #define GID_BRAND_DIR_ETC gid_Brand_Dir_Share
+    #define GID_DIR_PY gid_Brand_Dir_Share
+    #define GID_DIR_URE_LIB gid_Dir_Frameworks
+#else
+    #define GID_BRAND_DIR_ETC gid_Brand_Dir_Program
+    #define GID_DIR_PY gid_Brand_Dir_Program
+    #define GID_DIR_URE_LIB gid_Brand_Dir_Program
+#endif
+
+#define RESFILENAME(name,lang)                STRING(CONCAT3(name,lang,.res))
+#define READMETXTFILENAME(name,lang,ext)      STRING(CONCAT4(name,lang,.,ext))
+#define READMEFILENAME(name,lang)             STRING(CONCAT2(name,lang))
+#define EXTRAFILENAME(name,lang)              STRING(CONCAT3(name,lang,.zip))
+#define EXTRAFILELISTNAME(prefix,name,lang)   STRING(CONCAT4(prefix,name,lang,.filelist))
+#define CONFIGLANGFILENAME(name,lang,ext)     STRING(CONCAT4(name,lang,.,ext))
+
+#define SCP2_OOO_BIN_DIR gid_Brand_Dir_Program
+
+#ifdef MACOSX
+    #define SCP2_OOO_LIB_DIR gid_Dir_Frameworks
+#else
+    #define SCP2_OOO_LIB_DIR SCP2_OOO_BIN_DIR
+#endif
+
+#define BIN_FILE_BODY \
+        UnixRights   = 755
+
+#define LIB_FILE_BODY \
+        UnixRights   = 755
+
+#define TXT_FILE_BODY \
+        UnixRights   = 644
+
+#define USER_FILE_BODY \
+        UnixRights   = 644
+
+#define PACKED_TXT_FILE_BODY \
+        TXT_FILE_BODY; \
+        Styles = (PACKED)
+
+#ifdef WITH_HELPPACK_INTEGRATION
+#define FILELIST_TXT_FILE_BODY_HELPPACK \
+        TXT_FILE_BODY; \
+        Styles = (FILELIST,FORCEHELPPACK,LANGUAGEMODULE)
+#else
+#define FILELIST_TXT_FILE_BODY_HELPPACK \
+        TXT_FILE_BODY; \
+        Styles = (FILELIST,HELPPACK,LANGUAGEMODULE)
+#endif
+
+#define PACKAGE_FILELIST(id,name) \
+File id \
+    Dir = FILELIST_DIR; \
+    Name = name; \
+    Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
+End
+
+#define PACKAGE_FILELIST_COMPONENTCONDITION(id,name,cond) \
+File id \
+    Dir = FILELIST_DIR; \
+    Name = name; \
+    Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
+    ComponentCondition = cond; \
+End
+
+#ifdef WNT
+#define PACKAGE_FILELIST_FONT(id,name) \
+File id \
+    Dir = FILELIST_DIR; \
+    Name = name; \
+    Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED, FONT); \
+End
+#else
+#define PACKAGE_FILELIST_FONT PACKAGE_FILELIST
+#endif // WNT
+
+#define SDK_PACKAGE_FILELIST(id,name) \
+File id \
+    Dir = FILELIST_SDK_DIR; \
+    Name = name; \
+    Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
+End
+
+#define PACKED_LIB_FILE_BODY \
+        LIB_FILE_BODY; \
+        Styles = (PACKED); \
+        Dir    = SCP2_OOO_LIB_DIR
+
+#define LIBO_LIB_FILE(id,name) \
+    File id \
+        Name = name; \
+        PACKED_LIB_FILE_BODY; \
+    End
+
+#define LIBO_LIB_FILE_BINARYTABLE(id,name) \
+    File id \
+        Name = name; \
+        PACKED_LIB_FILE_BODY; \
+        Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); \
+    End
+
+#define LIBO_LIB_FILE_COMPONENTCONDITION(id,name,cond) \
+    File id \
+        Name = name; \
+        PACKED_LIB_FILE_BODY; \
+        ComponentCondition = cond; \
+    End
+
+#define SHLXTHDL_LIB_FILE(id,name) \
+    File id \
+        Name = name; \
+        LIB_FILE_BODY; \
+        Styles = (PACKED); \
+        Dir    = gid_Dir_Shlxthdl; \
+    End
+
+#define SHLXTHDL_X64_LIB_FILE_COMPONENTCONDITION(id,name,cond) \
+    File id \
+        Name = name; \
+        LIB_FILE_BODY; \
+        Styles = (PACKED); \
+        Dir    = gid_Dir_Shlxthdl_x64; \
+        ComponentCondition = cond; \
+    End
+
+#ifdef MACOSX
+// links are created at configure time by odk/config/setsdkenv_unix.sh.in
+#define SDK_LIBRARY_LINK(id,name,target)
+#elif defined(WNT)
+#define SDK_LIBRARY_LINK(id,name,target) \
+    File id \
+        TXT_FILE_BODY; \
+        Styles = (PACKED); \
+        Dir = gid_Dir_Lib_Sdk; \
+        Name = name; \
+    End
+#else
+#define SDK_LIBRARY_LINK(id,name,target) \
+    Unixlink id \
+     BIN_FILE_BODY; \
+     Styles = (); \
+     Dir = gid_Dir_Lib_Sdk; \
+     Name = name; \
+     Target = target; \
+    End
+#endif
+
+#define LIBO_JAR_FILE(id,name) \
+    File id \
+        TXT_FILE_BODY; \
+        Name = name; \
+        Dir = gid_Dir_Classes; \
+        Styles = (PACKED); \
+    End
+
+#define URE_JAR_FILE(id,name) \
+    File id \
+        TXT_FILE_BODY; \
+        Name = name; \
+        Dir = gid_Dir_Classes; \
+        Styles = (PACKED); \
+    End
+
+#define CONDITIONAL_MODULE_ENTRY(name,modid) \
+    Module gid_Module_Root_Reg_##name \
+	ParentID = modid; \
+	Name = STRING(CONCAT2(gid_Module_Root_,name)); \
+	Description = STRING(CONCAT2(gid_Module_Root_,name)); \
+	Default = YES; \
+	Styles = (HIDDEN_ROOT); \
+End
+
+#define REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \
+    RegistryItem gid_Regitem_OpenOffice_##cond##_OpenWith_##doc_type \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = modid; \
+        Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
+        Name = STRING(CONCAT2(LibreOffice.,name)); \
+        Value = " "; \
+    End
+
+#define REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \
+    RegistryItem gid_Regitem_OpenOffice_##cond##_OpenWith_##doc_type \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = modid; \
+        Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
+        Name = STRING(CONCAT2(LibreOffice.,name)); \
+        Value = " "; \
+    End
+
+#define CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
+    RegistryItem gid_Regitem__##name \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = gid_Module_Root_Reg_##name; \
+        Subkey = STRING(CONCAT2(.,key)); \
+        Value = STRING(CONCAT2(LibreOffice.,name)); \
+        ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
+    End
+
+#define CONDITIONAL_REGISTRY_ENTRY_EXT_MEDIATYPE(name,cond,key,mediatype) \
+    RegistryItem gid_Regitem__MediaType_##name \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = gid_Module_Root_Reg_##name; \
+        Subkey = STRING(CONCAT2(.,key)); \
+        Name = STRING(Content Type); \
+        Value = STRING(mediatype); \
+        ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
+    End
+
+#define REGISTRY_ENTRY_DOC(name,modid,disp_name) \
+    RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = modid; \
+        Subkey = STRING(CONCAT2(LibreOffice.,name)); \
+        REG_VALUE_LNG(disp_name) \
+    End
+
+#define REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \
+    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_AppUserModelID) \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = modid; \
+        Subkey = STRING(CONCAT2(LibreOffice.,name)); \
+        Name = STRING(AppUserModelID); \
+        Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \
+    End
+
+#define REGISTRY_ENTRY_ICON(name,modid,icon_id) \
+    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = modid; \
+        Subkey = STRING(CONCAT3(LibreOffice.,name,\DefaultIcon)); \
+        Value = "<progpath>\program\soffice.bin," STRING(icon_id); \
+    End
+
+#define REGISTRY_ENTRY_SHELL(name,default,modid) \
+    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = modid; \
+        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell)); \
+        Value = STRING(default); \
+    End
+
+#define REGISTRY_ENTRY_NEW_CMD_PPA(name,modid,progpath_program_app) \
+    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = modid; \
+        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new)); \
+        REG_VALUE_LNG(NEW) \
+    End \
+    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = modid; \
+        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new\command)); \
+        Value = "\"" STRING(progpath_program_app) "\" -n \"%1\""; \
+    End
+
+#define REGISTRY_ENTRY_NEW_CMD(name,modid,app) \
+	REGISTRY_ENTRY_NEW_CMD_PPA(name,modid,<progpath>\program\app)
+
+#define REGISTRY_ENTRY_OPEN_CMD_PPA(name,modid,progpath_program_app) \
+    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = modid; \
+        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\open\command)); \
+        Value = "\"" STRING(progpath_program_app) "\" -o \"%1\""; \
+    End
+
+#define REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
+	REGISTRY_ENTRY_OPEN_CMD_PPA(name,modid,<progpath>\program\app)
+
+#define REGISTRY_ENTRY_PRINT_CMD_PPA(name,modid,progpath_program_app) \
+    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = modid; \
+        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\print\command)); \
+        Value = "\"" STRING(progpath_program_app) "\" -p \"%1\""; \
+    End
+
+#define REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
+	REGISTRY_ENTRY_PRINT_CMD_PPA(name,modid,<progpath>\program\app)
+
+#define REGISTRY_ENTRY_PRINTTO_CMD_PPA(name,modid,progpath_program_app) \
+    RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \
+        ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+        ModuleID = modid; \
+        Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\printto\command)); \
+        Value = "\"" STRING(progpath_program_app) "\" -pt \"%2\" \"%1\""; \
+    End
+
+#define REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
+	REGISTRY_ENTRY_PRINTTO_CMD_PPA(name,modid,<progpath>\program\app)
+
+#define REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
+    RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_,name) \
+        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
+        ModuleID = modid; \
+        Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
+        Name = STRING(CONCAT2(.,key)); \
+        Value = STRING(CONCAT2(LibreOffice.,name)); \
+        Styles = (); \
+    End
+
+#define REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \
+    RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_,name) \
+        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
+        ModuleID = modid; \
+        Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
+        Name = STRING(CONCAT2(.,key)); \
+        Value = STRING(CONCAT2(LibreOffice.,name)); \
+        Styles = (); \
+    End
+
+#define REGISTRY_ENTRY_CAPABILITIES_URL(scheme,name,modid,handler) \
+    RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_URLAssociations_,name) \
+        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
+        ModuleID = modid; \
+        Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\URLAssociations); \
+        Name = scheme; \
+        Value = handler; \
+        Styles = (); \
+    End
+
+#define CONDITIONAL_REGISTER_DOC_OPEN_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
+    CONDITIONAL_MODULE_ENTRY(name,modid) \
+    REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \
+    CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
+    REGISTRY_ENTRY_DOC(name,modid,disp_name) \
+    REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \
+    REGISTRY_ENTRY_ICON(name,modid,icon_id) \
+    REGISTRY_ENTRY_SHELL(name,default,modid) \
+    REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
+    REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
+
+#define CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
+    CONDITIONAL_REGISTER_DOC_OPEN_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
+    REGISTRY_ENTRY_NEW_CMD(name,modid,app) \
+    REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
+    REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
+
+#define CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \
+    CONDITIONAL_MODULE_ENTRY(name,modid) \
+    REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \
+    CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \
+    REGISTRY_ENTRY_DOC(name,modid,disp_name) \
+    REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \
+    REGISTRY_ENTRY_ICON(name,modid,icon_id) \
+    REGISTRY_ENTRY_SHELL(name,default,modid) \
+    REGISTRY_ENTRY_NEW_CMD(name,modid,app) \
+    REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
+    REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
+    REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
+    REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \
+
+#ifdef _MSC_VER
+
+#ifdef BUILD_X64
+
+#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \
+    RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \
+        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
+        ModuleID = gid_Module_Optional_Winexplorerext; \
+        Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \
+        Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
+    End \
+\
+    RegistryItem CONCAT3(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension,_x64) \
+        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
+        ModuleID = gid_Module_Optional_Winexplorerext_x64; \
+        ComponentCondition = "VersionNT64"; \
+        Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \
+        Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
+    End
+
+#else
+
+#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \
+    RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \
+        ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
+        ModuleID = gid_Module_Optional_Winexplorerext; \
+        Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \
+        Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
+    End
+
+#endif
+
+#else
+#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) // empty
+#endif
+
+
+#define SCP2_URE_DL_DIR GID_DIR_URE_LIB
+#if defined WNT
+#define SCP2_URE_DL_NORMAL(n) n ".dll"
+#define SCP2_URE_DL_VER(n, v) n v ".dll"
+#define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
+#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
+#else
+#define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX)
+#define SCP2_URE_DL_VER(n, v) "lib" n STRING(UNXSUFFIX) "." v
+#define SCP2_URE_DL_UNO_VER(n, v) "libuno_" n STRING(UNXSUFFIX) "." v
+#define SCP2_URE_DL_UNO_NORMAL(n) "libuno_" n STRING(UNXSUFFIX)
+#define SCP2_URE_DL_UNO_COMID_VER(n, v)	\
+    "libuno_" n STRING(COMID) STRING(UNXSUFFIX) "." v
+#define SCP2_URE_DL_UNO_COMID_NORMAL(n)	\
+    "libuno_" n STRING(COMID) STRING(UNXSUFFIX)
+#endif
+#if defined MACOSX
+#define SCP2_URE_JDL_NORMAL(n) "lib" n ".jnilib"
+#else
+#define SCP2_URE_JDL_NORMAL(n) SCP2_URE_DL_NORMAL(n)
+#endif
+
+#if defined MACOSX
+#define FILELIST_DIR PREDEFINED_PROGDIR
+#define FILELIST_SDK_DIR PREDEFINED_PROGDIR
+#else
+#define FILELIST_DIR gid_Dir_Brand_Root
+#if defined WNT
+#define FILELIST_SDK_DIR gid_Dir_Sdkoo_Root
+#else
+#define FILELIST_SDK_DIR PREDEFINED_PROGDIR
+#endif
+#endif
+
+#define UI_FILELIST(name, file) \
+    File CONCAT2(gid_File_Share_Config_Sofficecfg_uiconfig_, name) \
+        TXT_FILE_BODY; \
+        Styles = (FILELIST); \
+        Dir = FILELIST_DIR; \
+        Name = file; \
+    End
+
+#include <langmacros.inc>
+
+#define MO_FILELIST_ALL_LANG(name) \
+    File CONCAT3(gid_File_Res_, name, _Lang) \
+        TXT_FILE_BODY; \
+        Styles = (PACKED); \
+        Dir = gid_Dir_Resource; \
+        MO_ALL_LANG_EXCEPT_EN_US_AND_QTZ(name); \
+    End
+
+#define URE_PRIVATE_LIB(id,name) \
+    File id \
+        LIB_FILE_BODY; \
+        Dir = SCP2_URE_DL_DIR; \
+        Name = name; \
+        Styles = (PACKED); \
+    End
+
+#define URE_EXECUTABLE(id,name) \
+    File id \
+        BIN_FILE_BODY; \
+        Dir = gid_Brand_Dir_Program; \
+        Name = name; \
+        Styles = (PACKED); \
+    End
+
+#define LIBO_EXECUTABLE(id,name) \
+    File id \
+        BIN_FILE_BODY; \
+        Dir = gid_Brand_Dir_Program; \
+        Name = name; \
+        Styles = (PACKED); \
+    End
+
+#define LIBO_EXECUTABLE_COMPONENTCONDITION(id,name,cond) \
+    File id \
+        BIN_FILE_BODY; \
+        Dir = gid_Brand_Dir_Program; \
+        Name = name; \
+        Styles = (PACKED); \
+        ComponentCondition = cond; \
+    End
+
+#define SDK_EXECUTABLE(id,name) \
+    File id \
+        BIN_FILE_BODY; \
+        Dir = gid_Dir_Sdkoo_Bin; \
+        Name = name; \
+        Styles = (PACKED); \
+    End
+
+#define GALLERY_NAME(id) \
+
+#define GALLERY_FILELIST(id) \
+File gid_File_Extra_Gall##id \
+    Dir = FILELIST_DIR; \
+    TXT_FILE_BODY; \
+    Styles = (FILELIST, WORKSTATION); \
+    Name = STRING(CONCAT3(Gallery/,id,.filelist)); \
+End \
+File gid_File_Extra_GallFiles##id \
+    Dir = FILELIST_DIR; \
+    TXT_FILE_BODY; \
+    Styles = (FILELIST, WORKSTATION); \
+    Name = STRING(CONCAT3(Gallery/Files/,id,.filelist)); \
+End
+
+#define REGISTER_URI_HANDLER_IMPL(protocol,protid,modid,cond) \
+RegistryItem CONCAT2(gid_Regitem_,protid) \
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+    ModuleID = modid; \
+    Subkey = STRING(protocol); \
+    Value = "URL:" STRING(protocol) " Protocol"; \
+    cond \
+End \
+RegistryItem CONCAT3(gid_Regitem_,protid,_URL_Protocol) \
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+    ModuleID = modid; \
+    Subkey = STRING(protocol); \
+    Name = "URL Protocol"; \
+End \
+RegistryItem CONCAT3(gid_Regitem_,protid,_UseOriginalUrlEncoding) \
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+    ModuleID = modid; \
+    Subkey = STRING(protocol); \
+    Name = "UseOriginalUrlEncoding"; \
+    Value = "#1"; \
+End \
+RegistryItem CONCAT3(gid_Regitem_,protid,_DefaultIcon) \
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+    ModuleID = modid; \
+    Subkey = STRING(CONCAT2(protocol,\DefaultIcon)); \
+    Value = "<progpath>\program\soffice.bin,0"; \
+End \
+RegistryItem CONCAT3(gid_Regitem_,protid,_shell_open_command) \
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
+    ModuleID = modid; \
+    Subkey = STRING(CONCAT2(protocol,\shell\open\command)); \
+    Value = "\"<progpath>\program\soffice.exe\" \"%1\""; \
+End
+
+#define REG_COND(cond) \
+    ComponentCondition = STRING(CONCAT2(cond,=1));
+
+#define REG_EMPTY_COND
+
+#define REGISTER_URI_HANDLER(protocol,protid,modid) \
+    REGISTER_URI_HANDLER_IMPL(protocol,protid,modid,REG_EMPTY_COND)
+
+#define CONDITIONAL_REGISTER_URI_HANDLER(protocol,protid,modid,cond) \
+    CONDITIONAL_MODULE_ENTRY(protid,modid) \
+    REGISTER_URI_HANDLER_IMPL(protocol,protid,gid_Module_Root_Reg_##protid,REG_COND(cond))
+
+#endif // MACROS_INC
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
new file mode 100644
index 0000000000..38ea02eb31
--- /dev/null
+++ b/scp2/macros/macro.pl
@@ -0,0 +1,260 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+
+my $outfile;
+my $destfile;
+my $config_stamp;
+my $lastcompletelangiso_var;
+my $completelangiso_var = $ENV{COMPLETELANGISO_VAR};
+my $help_langs_var = $ENV{HELP_LANGS};
+
+if ( !defined $completelangiso_var) {
+    print STDERR "ERROR: No language defined!\n";
+    exit 1;
+}
+
+if (!args_require_build()) {
+    print STDERR "No new languages, or config. Keeping old file\n";
+    exit 0;
+}
+
+my @completelangiso = split " +", $completelangiso_var;
+my @helplangs = split " +", $help_langs_var;
+
+open OUTFILE, ">$outfile" or die "$0 ERROR: cannot open $outfile for writing!\n";
+
+print OUTFILE "// generated file, do not edit\n\n";
+print OUTFILE "// languages used for last time generation\n";
+print OUTFILE "// completelangiso: $completelangiso_var\n\n";
+print OUTFILE "// help_langs: $help_langs_var\n\n";
+write_ITERATE_ALL_LANG();
+write_ALL_LANG();
+write_OTHER_LANGS();
+write_DIR_ISOLANGUAGE_ALL_LANG_2();
+write_DIR_ISOLANGUAGE_ALL_LANG();
+write_EXTRA_ALL_LANG();
+write_EXTRA_ALL_LANG_BUT_EN_US();
+write_MO_ALL_LANG_EXCEPT_EN_US_AND_QTZ();
+write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG();
+write_RESFILE_ALL_LANG();
+write_README_ALL_LANG();
+write_README_TXT_ALL_LANG();
+write_FILE_ALL_LANG_LETTER();
+
+close OUTFILE;
+
+rename $outfile, $destfile;
+
+sub write_ITERATE_ALL_LANG
+{
+    print OUTFILE "#define ITERATE_ALL_LANG_FILE(gid,dir,macro,name,ext) ";
+    foreach $lang (@helplangs) {
+        my $shortlang = $lang;
+        $shortlang = "en" if $shortlang eq "en-US";
+        my $speciallang = $lang;
+        $speciallang =~ s/-/_/;
+        print OUTFILE "\\\nFile CONCAT3(gid_File_,gid,_$speciallang)";
+        print OUTFILE "\\\n\tDir = CONCAT3(gid_Dir_,dir,_$speciallang);";
+        print OUTFILE "\\\n\tmacro;";
+        print OUTFILE "\\\n\tName = STRING(CONCAT3(name,_$lang,ext)); ";
+        print OUTFILE "\\\nEnd ";
+        print OUTFILE "\\\n";
+    }
+    print OUTFILE "\n\n";
+}
+
+sub write_ALL_LANG
+{
+    print OUTFILE "#define ALL_LANG(ident, resid) ";
+    foreach $lang (@completelangiso) {
+        print OUTFILE "\\\n\tident ($lang) = resid";
+        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
+    }
+    print OUTFILE "\n\n";
+}
+
+sub write_OTHER_LANGS
+{
+    print OUTFILE "#define OTHER_LANGS ";
+    foreach $lang (@completelangiso) {
+        next if ( $lang eq "en-US");
+        print OUTFILE "\\\n\tDosName ($lang) = \"$lang\"";
+        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
+    }
+        print OUTFILE "\n\n";
+}
+
+sub write_DIR_ISOLANGUAGE_ALL_LANG_2
+{
+    print OUTFILE "#define DIR_ISOLANGUAGE_ALL_LANG_2 ";
+    print OUTFILE "\\\n\tDosName (en-US) = \"en-US\"; \\\n\t";
+    print OUTFILE "OTHER_LANGS";
+        print OUTFILE "\n\n";
+}
+
+sub write_DIR_ISOLANGUAGE_ALL_LANG
+{
+    print OUTFILE "#define DIR_ISOLANGUAGE_ALL_LANG ";
+    print OUTFILE "\\\n\tDosName (en-US) = \"en\"; \\\n\t";
+    print OUTFILE "OTHER_LANGS";
+        print OUTFILE "\n\n";
+}
+
+sub write_EXTRA_ALL_LANG
+{
+    print OUTFILE "#define EXTRA_ALL_LANG(name,ext) ";
+    foreach $lang (@completelangiso) {
+        print OUTFILE "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)";
+        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
+    }
+    print OUTFILE "\n\n";
+}
+
+sub write_EXTRA_ALL_LANG_BUT_EN_US
+{
+    print OUTFILE "#define EXTRA_ALL_LANG_BUT_EN_US(name,ext) ";
+    my $first = 1;
+    foreach $lang (@completelangiso) {
+        if ($lang ne "en-US") {
+            print OUTFILE "; " unless $first;
+            $first = 0;
+            print OUTFILE
+                "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)";
+        }
+    }
+    print OUTFILE "\n\n";
+}
+
+sub write_MO_ALL_LANG_EXCEPT_EN_US_AND_QTZ
+{
+    print OUTFILE "#define MO_ALL_LANG_EXCEPT_EN_US_AND_QTZ(name) ";
+    my $first = 1;
+    foreach $lang (@completelangiso) {
+        if (($lang ne "en-US") and ($lang ne "qtz")) {
+            print OUTFILE "; " unless $first;
+            $first = 0;
+            my $SRC_ROOT = $ENV{"SRC_ROOT"};
+            my $langdir = `$SRC_ROOT/solenv/bin/localestr $lang`;
+            chomp $langdir;
+            print OUTFILE
+                "\\\n\tName ($lang) = STRING(CONCAT3($langdir/LC_MESSAGES/,name,.mo))";
+        }
+    }
+    print OUTFILE "\n\n";
+}
+
+sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG
+{
+    my $first = 1;
+    my $source;
+    if ($ENV{'ENABLE_HTMLHELP'} eq 'TRUE') {
+        $source = 'html-help'; # found in instsetoo_native/util/openoffice.lst.in's {filelistpath}/CustomTarget/helpcontent2/help3xsl/filelists
+    } else {
+        $source = 'HelpTarget';
+    }
+    print OUTFILE "#define EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(name) ";
+    foreach $lang (@helplangs) {
+        print OUTFILE ";" unless $first;
+        $first = 0;
+        print OUTFILE "\\\n\tName ($lang) = EXTRAFILELISTNAME($source/,name,/$lang)";
+    }
+    print OUTFILE "\n\n";
+}
+
+sub write_RESFILE_ALL_LANG
+{
+    print OUTFILE "#define RESFILE_ALL_LANG(name) ";
+    foreach $lang (@completelangiso) {
+        print OUTFILE "\\\n\tName ($lang) = RESFILENAME(name,$lang)";
+        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
+    }
+    print OUTFILE "\n\n";
+}
+
+sub write_README_ALL_LANG
+{
+    print OUTFILE "#define README_ALL_LANG(key, name) ";
+    foreach $lang (@completelangiso) {
+        print OUTFILE "\\\n\tkey ($lang) = READMEFILENAME(name,_$lang)";
+        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
+    }
+    print OUTFILE "\n\n";
+}
+
+sub write_README_TXT_ALL_LANG
+{
+    print OUTFILE "#define README_TXT_ALL_LANG(key, name, ext) ";
+    foreach $lang (@completelangiso) {
+        print OUTFILE "\\\n\tkey ($lang) = READMETXTFILENAME(name,_$lang,ext)";
+        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
+    }
+    print OUTFILE "\n\n";
+}
+
+sub write_FILE_ALL_LANG_LETTER
+{
+    print OUTFILE "#define FILE_ALL_LANG_LETTER(name, ext) ";
+    foreach $lang (@completelangiso) {
+        print OUTFILE "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,$lang,ext)";
+        print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]);
+    }
+    print OUTFILE "\n\n";
+}
+
+sub args_require_build
+{
+    while (@ARGV) {
+        $opt = shift @ARGV;
+        $destfile = shift @ARGV if ($opt eq '-o');
+        $config_stamp = shift @ARGV if ($opt eq '-c');
+    }
+    usage() if (!defined ($destfile) || !defined ($config_stamp));
+    $outfile = "$destfile.tmp";
+
+    if ( -f "$destfile" ) {
+        # changed script - run always
+        return 1 if (stat($0))[9] > (stat("$destfile"))[9] ;
+
+        # changed config timestamp - run always
+        if (-f "$config_stamp") {
+            return 1 if (stat($config_stamp))[9] > (stat($destfile))[9];
+        }
+
+        open OLDFILE, "$destfile" or die "$0 - ERROR: $outfile exists but isn't readable.\n";
+        while ( $line = <OLDFILE> ) {
+            if ( $line =~ /^\/\/.*completelangiso:/ ) {
+                $lastcompletelangiso_var = $line;
+                chomp $lastcompletelangiso_var;
+                $lastcompletelangiso_var =~ s/^\/\/.*completelangiso:\s*//;
+                last;
+            }
+
+        }
+        close OLDFILE;
+
+        return 0 if ( "$completelangiso_var" eq "$lastcompletelangiso_var" );
+    }
+    return 1;
+}
+
+sub usage
+{
+    print STDERR "Generate language dependent macros use in *.scp files\n";
+    print STDERR "perl $0 -o <outputfile> -c <config_stamp_file>\n";
+    exit  1;
+}
diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp
new file mode 100644
index 0000000000..2f6645593b
--- /dev/null
+++ b/scp2/source/activex/module_activex.scp
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/activexbinarytable"
+#include "AutoInstall/activex"
+#include "AutoInstall/activexwin64"
+
+Module gid_Module_Optional_Activexcontrol
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC ( MODULE_OPTIONAL_ACTIVEXCONTROL );
+    Sortkey = "1000";
+    Default = NO;
+    ParentID = gid_Module_Optional;
+    Files = (auto_activexbinarytable_ALL,
+        auto_activex_ALL,
+        auto_activexwin64_ALL);
+End
diff --git a/scp2/source/activex/module_activex.ulf b/scp2/source/activex/module_activex.ulf
new file mode 100644
index 0000000000..eb8a045d70
--- /dev/null
+++ b/scp2/source/activex/module_activex.ulf
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACTIVEXCONTROL]
+en-US = "ActiveX Control"
+
+[STR_DESC_MODULE_OPTIONAL_ACTIVEXCONTROL]
+en-US = "Deprecated Component (see release notes) to enable Microsoft Internet Explorer to display %PRODUCTNAME documents."
+
+
+
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
new file mode 100644
index 0000000000..e2a8d364bb
--- /dev/null
+++ b/scp2/source/base/file_base.scp
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#if defined WITH_HELPPACKS
+File gid_File_Help_Sdatabase_Zip
+    Dir = FILELIST_DIR;
+    FILELIST_TXT_FILE_BODY_HELPPACK;
+    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdatabase);
+End
+#endif
+
+File gid_File_Share_Registry_Base_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "base.xcd";
+End
diff --git a/scp2/source/base/firebird.scp b/scp2/source/base/firebird.scp
new file mode 100644
index 0000000000..61cfff9cc4
--- /dev/null
+++ b/scp2/source/base/firebird.scp
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/firebirdsdbc"
+
+#if defined( ENABLE_FIREBIRD_SDBC ) && !defined( SYSTEM_FIREBIRD )
+
+Module gid_Module_Optional_Firebird
+    Name = "Firebird";
+    Description = "Firebird embedded database";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Root_Brand;
+    Files = (auto_firebirdsdbc_ALL);
+    Styles = (HIDDEN_ROOT);
+End
+
+#endif
diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp
new file mode 100644
index 0000000000..75e1d5d05b
--- /dev/null
+++ b/scp2/source/base/folderitem_base.scp
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#ifndef ENABLE_SILENT_MSI
+FolderItem gid_Folderitem_Sbase
+    Name = "%PRODUCTNAME Base";
+    ModuleID = gid_Module_Prg_Base_Bin;
+    FolderID = gid_Folder_Staroffice51;
+    FileID = auto_base_brand_exe_sbase;
+    IconFile = auto_base_brand_exe_sbase;
+    IconID = 0;
+    WkDir = gid_Brand_Dir_Program;
+    Parameter = "";
+    Styles = (NON_ADVERTISED);
+    ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
+End
+
+FolderItemProperty gid_Fip_Sbase_AppID
+    ShortcutID = gid_Folderitem_Sbase;
+    Key = "System.AppUserModel.ID";
+    Value = "TheDocumentFoundation.LibreOffice.Base";
+End
+#endif
diff --git a/scp2/source/base/folderitem_base.ulf b/scp2/source/base/folderitem_base.ulf
new file mode 100644
index 0000000000..ed7ad50c88
--- /dev/null
+++ b/scp2/source/base/folderitem_base.ulf
@@ -0,0 +1,21 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_FI_TOOLTIP_BASE]
+en-US = "Manage databases, create queries and reports to track and manage your information by using Base."
+
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
new file mode 100644
index 0000000000..783c8a49a0
--- /dev/null
+++ b/scp2/source/base/module_base.scp
@@ -0,0 +1,63 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/base"
+#include "AutoInstall/base_brand"
+
+Module gid_Module_Prg_Base
+    MOD_NAME_DESC(MODULE_PRG_BASE);
+    ParentID = gid_Module_Prg;
+    Sortkey = "500";
+    Styles =(APPLICATIONMODULE);
+End
+
+Module gid_Module_Prg_Base_Bin
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC ( MODULE_PRG_BASE_BIN );
+    ParentID = gid_Module_Prg_Base;
+    Sortkey = "100";
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+    Files = (auto_base_ALL,
+        gid_File_Share_Registry_Base_Xcd
+    );
+End
+
+Module gid_Module_Brand_Prg_Base
+    PackageInfo = "packinfo_brand.txt";
+    Name = "gid_Module_Brand_Prg_Base";
+    Description = "gid_Module_Brand_Prg_Base";
+    ParentID = gid_Module_Prg_Base;
+    Sortkey = "100";
+    InstallOrder = "1040";
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+    Files = (auto_base_brand_ALL);
+End
+
+Module gid_Module_Langpack_Base_Template
+    ParentID = gid_Module_Prg_Base_Bin;
+    Name = "gid_Module_Langpack_Base_Template";
+    Description = "gid_Module_Langpack_Base_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = ();
+End
+
+#include "alllangmodules_base.inc"
diff --git a/scp2/source/base/module_base.ulf b/scp2/source/base/module_base.ulf
new file mode 100644
index 0000000000..3b7bd81b89
--- /dev/null
+++ b/scp2/source/base/module_base.ulf
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_PRG_BASE]
+en-US = "%PRODUCTNAME Base"
+
+[STR_DESC_MODULE_PRG_BASE]
+en-US = "Create and edit databases by using %PRODUCTNAME Base."
+
+[STR_NAME_MODULE_PRG_BASE_BIN]
+en-US = "Program Module"
+
+[STR_DESC_MODULE_PRG_BASE_BIN]
+en-US = "The application %PRODUCTNAME Base"
+
+[STR_NAME_MODULE_PRG_BASE_HELP]
+en-US = "%PRODUCTNAME Base Help"
+
+[STR_DESC_MODULE_PRG_BASE_HELP]
+en-US = "Help about %PRODUCTNAME Base"
+
+
+
diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp
new file mode 100644
index 0000000000..94e6936771
--- /dev/null
+++ b/scp2/source/base/postgresqlsdbc.scp
@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/postgresqlsdbc"
+
+#if defined WITH_POSTGRESQL_SDBC
+
+Module gid_Module_Optional_PostgresqlSdbc
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_POSTGRESQLSDBC);
+    ParentID = gid_Module_Prg_Base_Bin;
+    Files = (auto_postgresqlsdbc_ALL,
+             gid_File_PostgresqlSdbc_Rdb,
+             gid_File_PostgresqlSdbc_Xcd);
+    Default = YES;
+    Styles = ();
+End
+
+File gid_File_PostgresqlSdbc_Rdb
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program_Services;
+    Name = "postgresql-sdbc.rdb";
+    Styles = (PACKED);
+End
+
+File gid_File_PostgresqlSdbc_Xcd
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "postgresql.xcd";
+    Styles = (PACKED);
+End
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/source/base/postgresqlsdbc.ulf b/scp2/source/base/postgresqlsdbc.ulf
new file mode 100644
index 0000000000..0d0d27f5fc
--- /dev/null
+++ b/scp2/source/base/postgresqlsdbc.ulf
@@ -0,0 +1,16 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_POSTGRESQLSDBC]
+en-US = "PostgreSQL Connector"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_POSTGRESQLSDBC]
+en-US = "PostgreSQL Connector"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
new file mode 100644
index 0000000000..ee7932ccd4
--- /dev/null
+++ b/scp2/source/base/registryitem_base.scp
@@ -0,0 +1,173 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+// new odb file extension
+
+RegistryItem gid_Regitem_Odb
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".odb";
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Value = "LibreOffice.DatabaseDocument.1";
+End
+
+RegistryItem gid_Regitem_Odb_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Subkey = ".odb\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Odb_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Subkey = ".odb\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_DatabaseDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Subkey = "LibreOffice.DatabaseDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Odb_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Subkey = ".odb";
+    Name = "Content Type";
+    Value = "application/vnd.sun.xml.base";
+End
+
+RegistryItem gid_Regitem_Odb_Mime_Database
+	ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+	ModuleID = gid_Module_Prg_Base_Bin;
+	Subkey = "MIME\Database\Content Type\application/vnd.sun.xml.base";
+	Name = "Extension";
+	Value = ".odb";
+End
+
+RegistryItem gid_Regitem_Openoffice_Databasedocument_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.DatabaseDocument.1";
+    ModuleID = gid_Module_Prg_Base_Bin;
+    REG_VALUE_LNG(OO_DATABASE)
+End
+
+RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.DatabaseDocument.1\DefaultIcon";
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Value = "<progpath>\program\soffice.bin,11";
+End
+
+RegistryItem gid_Regitem_Openoffice_Databasedocument_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Subkey = "LibreOffice.DatabaseDocument.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Base";
+End
+
+RegistryItem gid_Regitem_Openoffice_Databasedocument_1_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Subkey = "LibreOffice.DatabaseDocument.1";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(OO_DATABASE)
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_odb_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "LibreOffice.DatabaseDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_odb_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".odb";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.DatabaseDocument.1\shell";
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Value = "open";
+End
+
+// RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell_Open_Command
+//     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+//     Subkey = "LibreOffice.DatabaseDocument.1\shell\open\command";
+//     ModuleID = gid_Module_Prg_Base_Bin;
+//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+// End
+
+RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.DatabaseDocument.1\shell\open\command";
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Value = "\"<progpath>\program\sbase.exe\" -o \"%1\"";
+    Styles = ();
+End
+
+// "OpenWith" Windows Registry keys for .odb
+
+RegistryItem gid_Regitem_OpenOffice_ODB_OpenWith_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".odb\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Name = "LibreOffice.DatabaseDocument.1";
+    Value = " ";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Odb
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Name = ".odb";
+    Value = "LibreOffice.DatabaseDocument.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sbase_Exe
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\sbase.exe";
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Value = "<progpath>\program\sbase.exe";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sbase_Exepath
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\sbase.exe";
+    ModuleID = gid_Module_Prg_Base_Bin;
+    Name = "Path";
+    Value = "<progpath>";
+End
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odb )
diff --git a/scp2/source/base/registryitem_base.ulf b/scp2/source/base/registryitem_base.ulf
new file mode 100644
index 0000000000..454eb2d754
--- /dev/null
+++ b/scp2/source/base/registryitem_base.ulf
@@ -0,0 +1,20 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_REG_VAL_OO_DATABASE]
+en-US = "OpenDocument Database"
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
new file mode 100644
index 0000000000..84ffb5bfe3
--- /dev/null
+++ b/scp2/source/calc/file_calc.scp
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+File gid_File_Share_Registry_Calc_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "calc.xcd";
+End
+
+#if defined WITH_HELPPACKS
+File gid_File_Help_Scalc_Zip
+    Dir = FILELIST_DIR;
+    FILELIST_TXT_FILE_BODY_HELPPACK;
+    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(scalc);
+End
+#endif
+
diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp
new file mode 100644
index 0000000000..a41ade6958
--- /dev/null
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#ifndef ENABLE_SILENT_MSI
+FolderItem gid_Folderitem_Scalc
+    Name = "%PRODUCTNAME Calc";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    FolderID = gid_Folder_Staroffice51;
+    FileID = auto_calc_brand_exe_scalc;
+    IconFile = auto_calc_brand_exe_scalc;
+    IconID = 0;
+    WkDir = gid_Brand_Dir_Program;
+    Parameter = "";
+    Styles = (NON_ADVERTISED);
+    ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
+End
+
+FolderItemProperty gid_Fip_Scalc_AppID
+    ShortcutID = gid_Folderitem_Scalc;
+    Key = "System.AppUserModel.ID";
+    Value = "TheDocumentFoundation.LibreOffice.Calc";
+End
+#endif
diff --git a/scp2/source/calc/folderitem_calc.ulf b/scp2/source/calc/folderitem_calc.ulf
new file mode 100644
index 0000000000..34dd38f46c
--- /dev/null
+++ b/scp2/source/calc/folderitem_calc.ulf
@@ -0,0 +1,23 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_FI_NAME_TABELLENDOKUMENT]
+en-US = "Spreadsheet"
+
+[STR_FI_TOOLTIP_CALC]
+en-US = "Perform calculations, analyze information and manage lists in spreadsheets by using Calc."
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
new file mode 100644
index 0000000000..dd31007bb5
--- /dev/null
+++ b/scp2/source/calc/module_calc.scp
@@ -0,0 +1,88 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/calc"
+#include "AutoInstall/calc_brand"
+
+Module gid_Module_Prg_Calc
+    MOD_NAME_DESC ( MODULE_PRG_CALC );
+    ParentID = gid_Module_Prg;
+    Sortkey = "200";
+    Styles =(APPLICATIONMODULE);
+End
+
+Module gid_Module_Prg_Calc_Bin
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC ( MODULE_PRG_CALC_BIN );
+    ParentID = gid_Module_Prg_Calc;
+    Sortkey = "100";
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+    Files = (auto_calc_ALL,
+    gid_File_Share_Registry_Calc_Xcd,
+    gid_File_Lib_Lpsolve);
+End
+
+Module gid_Module_Prg_Calc_Addins
+    MOD_NAME_DESC ( MODULE_OPTIONAL_ADDINS );
+    Styles = (HIDDEN_ROOT);
+    ParentID = gid_Module_Prg_Calc_Bin;
+    Sortkey = "700";
+    Default = YES;
+    Files = (gid_File_Zip_Addin,gid_File_Lib_Rot);
+End
+
+Module gid_Module_Brand_Prg_Calc
+    PackageInfo = "packinfo_brand.txt";
+    Name = "gid_Module_Brand_Prg_Calc";
+    Description = "gid_Module_Brand_Prg_Calc";
+    ParentID = gid_Module_Prg_Calc;
+    Sortkey = "100";
+    InstallOrder = "1040";
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+    Files = (auto_calc_brand_ALL);
+End
+
+Module gid_Module_Langpack_Calc_Template
+    ParentID = gid_Module_Prg_Calc_Bin;
+    Name = "gid_Module_Langpack_Calc_Template";
+    Description = "gid_Module_Langpack_Calc_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = ();
+End
+
+Module gid_Module_Prg_Calc_MSO_Reg
+    ParentID = gid_Module_Prg_Calc;
+    Name = "gid_Module_Prg_Calc_MSO_Reg";
+    Description = "gid_Module_Prg_Calc_MSO_Reg";
+    Styles = (HIDDEN_ROOT);
+    Default = YES;
+End
+
+Module gid_Module_Prg_Calc_Other_Reg
+    ParentID = gid_Module_Prg_Calc;
+    Name = "gid_Module_Prg_Calc_Other_Reg";
+    Description = "gid_Module_Prg_Calc_Other_Reg";
+    Styles = (HIDDEN_ROOT);
+    Default = YES;
+End
+
+#include "alllangmodules_calc.inc"
diff --git a/scp2/source/calc/module_calc.ulf b/scp2/source/calc/module_calc.ulf
new file mode 100644
index 0000000000..fdac5de438
--- /dev/null
+++ b/scp2/source/calc/module_calc.ulf
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+[STR_NAME_MODULE_PRG_CALC]
+en-US = "%PRODUCTNAME Calc"
+
+[STR_DESC_MODULE_PRG_CALC]
+en-US = "Perform calculations, analyze information and manage lists in spreadsheets by using %PRODUCTNAME Calc."
+
+[STR_NAME_MODULE_PRG_CALC_BIN]
+en-US = "Program Module"
+
+[STR_DESC_MODULE_PRG_CALC_BIN]
+en-US = "The application %PRODUCTNAME Calc"
+
+[STR_NAME_MODULE_PRG_CALC_HELP]
+en-US = "%PRODUCTNAME Calc Help"
+
+[STR_DESC_MODULE_PRG_CALC_HELP]
+en-US = "Help about %PRODUCTNAME Calc"
+
+[STR_NAME_MODULE_OPTIONAL_ADDINS]
+en-US = "Add-in"
+
+[STR_DESC_MODULE_OPTIONAL_ADDINS]
+en-US = "Add-ins are additional programs that make new functions available in %PRODUCTNAME Calc."
+
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
new file mode 100644
index 0000000000..b6cf9c3df5
--- /dev/null
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -0,0 +1,1302 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+// MSOLE embedded object in SO7 file format
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c_
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}";
+    REG_VALUE_LNG(SO60_SPREADSHEET)
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Auxusertype_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\AuxUserType\2";
+    Value = "%PRODUCTNAME";
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Auxusertype_3
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\AuxUserType\3";
+    REG_VALUE_LNG(SO60_SPREADSHEET)
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Dataformats_Getset_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\DataFormats\GetSet\0";
+    Value = "Embed Source,1,8,1";
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Dataformats_Getset_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\DataFormats\GetSet\1";
+    Value = "3,1,32,1";
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Dataformats_Getset_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\DataFormats\GetSet\2";
+    Value = "2,1,16,1";
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,0";
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Inprochandler32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\InprocHandler32";
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\Insertable";
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Localserver32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\LocalServer32";
+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Miscstatus
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\MiscStatus";
+    Value = "16";
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Progid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\ProgID";
+    Value = "soffice.StarCalcDocument.6";
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Programmable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\Programmable";
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\verb\0";
+    Value = "&Edit,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\verb\-1";
+    Value = "Show,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\verb\-2";
+    Value = "Open,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Versionindependentprogid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\VersionIndependentProgID";
+    Value = "soffice.StarCalcDocument.6";
+End
+
+// MSOLE embedded object in OASIS file format
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8_
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}";
+    REG_VALUE_LNG(OO_CALC)
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Auxusertype_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\AuxUserType\2";
+    Value = "%PRODUCTNAME";
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Auxusertype_3
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\AuxUserType\3";
+    REG_VALUE_LNG(OO_CALC)
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Dataformats_Getset_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\DataFormats\GetSet\0";
+    Value = "Embed Source,1,8,1";
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Dataformats_Getset_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\DataFormats\GetSet\1";
+    Value = "3,1,32,1";
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Dataformats_Getset_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\DataFormats\GetSet\2";
+    Value = "2,1,16,1";
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,0";
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Inprochandler32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\InprocHandler32";
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\Insertable";
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Localserver32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\LocalServer32";
+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Miscstatus
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\MiscStatus";
+    Value = "16";
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Progid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\ProgID";
+    Value = "LibreOffice.CalcDocument.1";
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Programmable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\Programmable";
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\verb\0";
+    Value = "&Edit,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\verb\-1";
+    Value = "Show,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\verb\-2";
+    Value = "Open,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Versionindependentprogid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\VersionIndependentProgID";
+    Value = "LibreOffice.CalcDocument.1";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6";
+    REG_VALUE_LNG(SO60_SPREADSHEET)
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Clsid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6\CLSID";
+    Value = "{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,3";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Calc";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(SO60_SPREADSHEET)
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6\Insertable";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Protocol_Stdfileediting_Server
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6\protocol\StdFileEditing\server";
+    Value = "<progpath>\program\soffice.exe";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Protocol_Stdfileediting_Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6\protocol\StdFileEditing\verb\0";
+    Value = "&Edit";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Protocol_Stdfileediting_Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6\protocol\StdFileEditing\verb\-1";
+    Value = "&Show";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Protocol_Stdfileediting_Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6\protocol\StdFileEditing\verb\-2";
+    Value = "&Open";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6\shell";
+    Value = "open";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6\shell\new";
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6\shell\new\command";
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6\shell\open\command";
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6\shell\print\command";
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6\shell\printto\command";
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument\CurVer";
+    Value = "soffice.StarCalcDocument.6";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalctemplate_6
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarCalcTemplate.6";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    REG_VALUE_LNG(SO60_CALC_TEMPLATE)
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarCalcTemplate.6\DefaultIcon";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Value = "<progpath>\program\soffice.bin,4";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcTemplate.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Calc";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcTemplate.6";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(SO60_CALC_TEMPLATE)
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarCalcTemplate.6\shell";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Value = "new";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarCalcTemplate.6\shell\new";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarCalcTemplate.6\shell\new\command";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarCalcTemplate.6\shell\open\command";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarCalcTemplate.6\shell\print\command";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarCalcTemplate.6\shell\printto\command";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+RegistryItem gid_Regitem_Sxc_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".sxc\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Sxc_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".sxc\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Sxc_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".sxc\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_StarCalcDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Stc_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".stc\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Stc_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".stc\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Stc_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".stc\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_StarCalcTemplate_6_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "soffice.StarCalcTemplate.6\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Stc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".stc";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Value = "soffice.StarCalcTemplate.6";
+End
+
+RegistryItem gid_Regitem_Stc_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".stc";
+    Name = "Content Type";
+    Value = "application/vnd.sun.xml.calc.template";
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_stc_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "soffice.StarCalcTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_stc_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".stc";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Sxc_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".sxc";
+    Name = "Content Type";
+    Value = "application/vnd.sun.xml.calc";
+End
+
+RegistryItem gid_Regitem_Sxc_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.sun.xml.calc";
+    Name = "Extension";
+    Value = ".sxc";
+End
+
+
+RegistryItem gid_Regitem__Sxc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".sxc";
+    Value = "soffice.StarCalcDocument.6";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxc
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".sxc";
+    Value = "soffice.StarCalcDocument.6";
+    Styles = ();
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_sxc_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "soffice.StarCalcDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_sxc_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".sxc";
+    Value = "document";
+End
+
+// new ods file extension
+
+RegistryItem gid_Regitem_Ods_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".ods\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Ods_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".ods\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Ods_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".ods\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_CalcDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem__Ods
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".ods";
+    Value = "LibreOffice.CalcDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_ods
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".ods";
+    Value = "LibreOffice.CalcDocument.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_ods
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "application/vnd.oasis.opendocument.spreadsheet";
+    Value = "LibreOffice.CalcDocument.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Ods_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".ods";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.spreadsheet";
+End
+
+RegistryItem gid_Regitem_Ods_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.spreadsheet";
+    Name = "Extension";
+    Value = ".ods";
+End
+
+RegistryItem gid_Regitem_Ods_Openoffice_Calcdocument_1_Shellnew
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".ods\LibreOffice.CalcDocument.1\ShellNew";
+    Name = "FileName";
+    Value = "<progpath>\share\template\shellnew\soffice.ods";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument\CurVer";
+    Value = "LibreOffice.CalcDocument.1";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1";
+    REG_VALUE_LNG(OO_CALC)
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Clsid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1\CLSID";
+    Value = "{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,3";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Calc";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(OO_CALC)
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_ods_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "LibreOffice.CalcDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_ods_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".ods";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1\Insertable";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Server
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1\protocol\StdFileEditing\server";
+    Value = "<progpath>\program\soffice.exe";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1\protocol\StdFileEditing\verb\0";
+    Value = "&Edit";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1\protocol\StdFileEditing\verb\-1";
+    Value = "&Show";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1\protocol\StdFileEditing\verb\-2";
+    Value = "&Open";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1\shell";
+    Value = "open";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1\shell\new";
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1\shell\new\command";
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1\shell\open\command";
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1\shell\print\command";
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcDocument.1\shell\printto\command";
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+RegistryItem gid_Regitem_CalcApplication
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "Calc.Application\CLSID";
+    Value = "{82154425-0FBF-11d4-8313-005004526AB4}";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Clsid__82154425_0FBF_11d4_8313_005004526AB4__Localserver32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{82154425-0FBF-11d4-8313-005004526AB4}\LocalServer32";
+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
+End
+
+// .fods
+
+RegistryItem gid_Regitem__Fods
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".fods";
+    Value = "LibreOffice.CalcDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fods
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Root;
+    Name = ".fods";
+    Value = "LibreOffice.CalcDocument.1";
+End
+
+RegistryItem gid_Regitem_Fods_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".fods";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.spreadsheet";
+End
+
+RegistryItem gid_Regitem_fods_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".fods";
+    Value = "document";
+End
+
+// new ots file extension
+
+RegistryItem gid_Regitem_Ots_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".ots\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Ots_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".ots\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Ots_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".ots\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_CalcTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Ots
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".ots";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Value = "LibreOffice.CalcTemplate.1";
+End
+
+RegistryItem gid_Regitem_Ots_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".ots";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.spreadsheet-template";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calctemplate_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.CalcTemplate.1";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    REG_VALUE_LNG(OO_CALC_TEMPLATE)
+End
+
+RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.CalcTemplate.1\DefaultIcon";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Value = "<progpath>\program\soffice.bin,4";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calctemplate_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcTemplate.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Calc";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calctemplate_1_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "LibreOffice.CalcTemplate.1";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(OO_CALC_TEMPLATE)
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_ots_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "LibreOffice.CalcTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_ots_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".ots";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.CalcTemplate.1\shell";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Value = "new";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.CalcTemplate.1\shell\new";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.CalcTemplate.1\shell\new\command";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.CalcTemplate.1\shell\open\command";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.CalcTemplate.1\shell\print\command";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.CalcTemplate.1\shell\printto\command";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+// "OpenWith" Windows Registry keys for extensions supported by Calc
+
+// .ODS
+RegistryItem gid_Regitem_OpenOffice_ODS_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".ods\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "LibreOffice.CalcDocument.1";
+    Value = " ";
+End
+
+// .OTS
+RegistryItem gid_Regitem_OpenOffice_OTS_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".ots\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "LibreOffice.CalcTemplate.1";
+    Value = " ";
+End
+
+// .SXC
+RegistryItem gid_Regitem_OpenOffice_SXC_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".sxc\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "soffice.StarCalcDocument.6";
+    Value = " ";
+End
+
+// .STC
+RegistryItem gid_Regitem_OpenOffice_STC_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".stc\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "soffice.StarCalcTemplate.6";
+    Value = " ";
+End
+
+// .DIF
+RegistryItem gid_Regitem_OpenOffice_DIF_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".dif\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "soffice.StarCalcDocument.6";
+    Value = " ";
+End
+
+// .DBF
+RegistryItem gid_Regitem_OpenOffice_DBF_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".dbf\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "soffice.StarCalcDocument.6";
+    Value = " ";
+End
+
+// .XLW
+RegistryItem gid_Regitem_OpenOffice_XLW_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".xlw\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "soffice.StarCalcDocument.6";
+    Value = " ";
+End
+
+// .RTF
+RegistryItem gid_Regitem_OpenOffice_RTF_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".rtf\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "soffice.StarCalcDocument.6";
+    Value = " ";
+End
+
+// .SLK
+RegistryItem gid_Regitem_OpenOffice_SLK_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".slk\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "soffice.StarCalcDocument.6";
+    Value = " ";
+End
+
+// .CSV
+RegistryItem gid_Regitem_OpenOffice_CSV_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".csv\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "soffice.StarCalcDocument.6";
+    Value = " ";
+End
+
+// .TXT
+RegistryItem gid_Regitem_OpenOffice_TXT_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".txt\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "soffice.StarCalcDocument.6";
+    Value = " ";
+End
+
+// .HTM
+RegistryItem gid_Regitem_OpenOffice_HTM_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".htm\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "soffice.StarCalcDocument.6";
+    Value = " ";
+End
+
+// .HTML
+RegistryItem gid_Regitem_OpenOffice_HTML_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".html\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "soffice.StarCalcDocument.6";
+    Value = " ";
+End
+
+// .WK1
+RegistryItem gid_Regitem_OpenOffice_WK1_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".wk1\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "soffice.StarCalcDocument.6";
+    Value = " ";
+End
+
+// .WKS
+RegistryItem gid_Regitem_OpenOffice_WKS_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".wks\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "soffice.StarCalcDocument.6";
+    Value = " ";
+End
+
+// .123
+RegistryItem gid_Regitem_OpenOffice_123_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".123\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "soffice.StarCalcDocument.6";
+    Value = " ";
+End
+
+// .XML
+RegistryItem gid_Regitem_OpenOffice_XML_OpenWith_Calc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".xml\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "soffice.StarCalcDocument.6";
+    Value = " ";
+End
+
+// "FileAssociations" entries
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Stc
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".stc";
+    Value = "soffice.StarCalcTemplate.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Dif
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".dif";
+    Value = "soffice.StarCalcDocument.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Dbf
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".dbf";
+    Value = "soffice.StarCalcDocument.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Slk
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".slk";
+    Value = "soffice.StarCalcDocument.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Csv
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".csv";
+    Value = "soffice.StarCalcDocument.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xlw
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".xlw";
+    Value = "soffice.StarCalcDocument.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Wk1
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".wk1";
+    Value = "soffice.StarCalcDocument.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Wks
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".wks";
+    Value = "soffice.StarCalcDocument.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_123
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = ".123";
+    Value = "soffice.StarCalcDocument.6";
+    Styles = ();
+End
+
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Scalc_Exe
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\scalc.exe";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Value = "<progpath>\program\scalc.exe";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Scalc_Exepath
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\scalc.exe";
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Name = "Path";
+    Value = "<progpath>";
+End
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ods )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ots )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxc )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc )
+
+// registering the mso file types
+
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlr, gid_Module_Prg_Calc_MSO_Reg, xlr, XLR, MS_WORKS, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_MSO_Reg, xls,  XLS,  MS_EXCEL_WORKSHEET_OLD, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLSX, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_OPEN_EXTENSION( Iqy, gid_Module_Prg_Calc_MSO_Reg, iqy, IQY, MS_EXCEL_WEBQUERY, 0, scalc.exe, open, Calc )
+CONDITIONAL_REGISTRY_ENTRY_EXT_MEDIATYPE( Iqy, IQY, iqy, text/x-ms-iqy )
+
+RegistryItem gid_Regitem__MediaType_DefExt_Iqy
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root_Reg_Iqy;
+    Subkey = "MIME\Database\Content Type\text/x-ms-iqy";
+    Name = "Extension";
+    Value = ".iqy";
+    ComponentCondition = "REGISTER_IQY=1";
+End
+
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt,  gid_Module_Prg_Calc_MSO_Reg, xlt,  XLT,  MS_EXCEL_TEMPLATE_OLD, 4, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
+
+// Registering OOXML MIME content types, to allow OS/applications to redirect such content to LO even if extension is unknown
+
+RegistryItem gid_Regitem_Xlsx_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+    Name = "Extension";
+    Value = ".xlsx";
+End
+
+RegistryItem gid_Regitem_Xltx_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.openxmlformats-officedocument.spreadsheetml.template";
+    Name = "Extension";
+    Value = ".xltx";
+End
+
+// registering other supported types
+
+CONDITIONAL_REGISTER_DOC_EXTENSION( Uos, gid_Module_Prg_Calc_Other_Reg, uos, UOS, UNIFORM_OFFICE_FORMAT_SPREADSHEET, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Wb2, gid_Module_Prg_Calc_Other_Reg, wb2, WB2, QUATTROPRO_SPREADSHEET, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Numbers, gid_Module_Prg_Calc_Other_Reg, numbers, NUMBERS, NUMBERS_SPREADSHEET, 3, scalc.exe, open, Calc )
+
+// registering ms-excel URI scheme handler
+CONDITIONAL_REGISTER_URI_HANDLER( ms-excel, ms_excel, gid_Module_Prg_Calc_MSO_Reg, SELECT_EXCEL )
+REGISTRY_ENTRY_CAPABILITIES_URL(ms-excel, ms_excel, gid_Module_Prg_Calc_MSO_Reg, vnd.libreoffice.command)
diff --git a/scp2/source/calc/registryitem_calc.ulf b/scp2/source/calc/registryitem_calc.ulf
new file mode 100644
index 0000000000..d3f7efbb14
--- /dev/null
+++ b/scp2/source/calc/registryitem_calc.ulf
@@ -0,0 +1,59 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_REG_VAL_NEW]
+en-US = "&New"
+
+[STR_REG_VAL_SO60_SPREADSHEET]
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet"
+
+[STR_REG_VAL_SO60_CALC_TEMPLATE]
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet Template"
+
+[STR_REG_VAL_OO_CALC]
+en-US = "OpenDocument Spreadsheet"
+
+[STR_REG_VAL_OO_CALC_TEMPLATE]
+en-US = "OpenDocument Spreadsheet Template"
+
+[STR_REG_VAL_MS_EXCEL_WORKSHEET_OLD]
+en-US = "Microsoft Excel 97-2003 Worksheet"
+
+[STR_REG_VAL_MS_EXCEL_WORKSHEET]
+en-US = "Microsoft Excel Worksheet"
+
+[STR_REG_VAL_MS_EXCEL_WEBQUERY]
+en-US = "Microsoft Excel Web Query File"
+
+[STR_REG_VAL_MS_EXCEL_TEMPLATE_OLD]
+en-US = "Microsoft Excel 97-2003 Template"
+
+[STR_REG_VAL_MS_EXCEL_TEMPLATE]
+en-US = "Microsoft Excel Template"
+
+[STR_REG_VAL_UNIFORM_OFFICE_FORMAT_SPREADSHEET]
+en-US = "Uniform Office Format Spreadsheet"
+
+[STR_REG_VAL_QUATTROPRO_SPREADSHEET]
+en-US = "Lotus Quattro Pro Spreadsheet"
+
+[STR_REG_VAL_NUMBERS_SPREADSHEET]
+en-US = "Apple Numbers"
+
+[STR_REG_VAL_MS_WORKS]
+en-US = "Microsoft Works Spreadsheet with Excel format"
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
new file mode 100644
index 0000000000..93ca07b07a
--- /dev/null
+++ b/scp2/source/draw/file_draw.scp
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+File gid_File_Share_Registry_Draw_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "draw.xcd";
+End
+
+#if defined WITH_HELPPACKS
+File gid_File_Help_Sdraw_Zip
+    Dir = FILELIST_DIR;
+    FILELIST_TXT_FILE_BODY_HELPPACK;
+    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdraw);
+End
+#endif
+
diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp
new file mode 100644
index 0000000000..5dc8757e96
--- /dev/null
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#ifndef ENABLE_SILENT_MSI
+FolderItem gid_Folderitem_Sdraw
+    Name = "%PRODUCTNAME Draw";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    FolderID = gid_Folder_Staroffice51;
+    FileID = auto_draw_brand_exe_sdraw;
+    IconFile = auto_draw_brand_exe_sdraw;
+    IconID = 0;
+    WkDir = gid_Brand_Dir_Program;
+    Parameter = "";
+    Styles = (NON_ADVERTISED);
+    ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
+End
+
+FolderItemProperty gid_Fip_Sdraw_AppID
+    ShortcutID = gid_Folderitem_Sdraw;
+    Key = "System.AppUserModel.ID";
+    Value = "TheDocumentFoundation.LibreOffice.Draw";
+End
+#endif
diff --git a/scp2/source/draw/folderitem_draw.ulf b/scp2/source/draw/folderitem_draw.ulf
new file mode 100644
index 0000000000..40ea876815
--- /dev/null
+++ b/scp2/source/draw/folderitem_draw.ulf
@@ -0,0 +1,25 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_FI_NAME_ZEICHNUNG]
+en-US = "Drawing"
+
+[STR_FI_TOOLTIP_DRAW]
+en-US = "Create and edit drawings, flow charts, and logos by using Draw."
+
+
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
new file mode 100644
index 0000000000..87375797e1
--- /dev/null
+++ b/scp2/source/draw/module_draw.scp
@@ -0,0 +1,78 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/draw_brand"
+
+Module gid_Module_Prg_Draw
+    MOD_NAME_DESC ( MODULE_PRG_DRAW );
+    ParentID = gid_Module_Prg;
+    Sortkey = "300";
+    Styles =(APPLICATIONMODULE);
+End
+
+Module gid_Module_Prg_Draw_Bin
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC ( MODULE_PRG_DRAW_BIN );
+    ParentID = gid_Module_Prg_Draw;
+    Sortkey = "100";
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+    Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
+    gid_File_Share_Registry_Draw_Xcd,
+    gid_File_Tmp_Userinstall_Draw_Inf);
+End
+
+Module gid_Module_Brand_Prg_Draw
+    PackageInfo = "packinfo_brand.txt";
+    Name = "gid_Module_Brand_Prg_Draw";
+    Description = "gid_Module_Brand_Prg_Draw";
+    ParentID = gid_Module_Prg_Draw;
+    Sortkey = "100";
+    InstallOrder = "1040";
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+    Files = (auto_draw_brand_ALL);
+End
+
+Module gid_Module_Langpack_Draw_Template
+    ParentID = gid_Module_Prg_Draw_Bin;
+    Name = "gid_Module_Langpack_Draw_Template";
+    Description = "gid_Module_Langpack_Draw_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = ();
+End
+
+Module gid_Module_Prg_Draw_MSO_Reg
+    ParentID = gid_Module_Prg_Draw;
+    Name = "gid_Module_Prg_Draw_MSO_Reg";
+    Description = "gid_Module_Prg_Draw_MSO_Reg";
+    Styles = (HIDDEN_ROOT);
+    Default = YES;
+End
+
+Module gid_Module_Prg_Draw_Other_Reg
+    ParentID = gid_Module_Prg_Draw;
+    Name = "gid_Module_Prg_Draw_Other_Reg";
+    Description = "gid_Module_Prg_Draw_Other_Reg";
+    Styles = (HIDDEN_ROOT);
+    Default = YES;
+End
+
+#include "alllangmodules_draw.inc"
diff --git a/scp2/source/draw/module_draw.ulf b/scp2/source/draw/module_draw.ulf
new file mode 100644
index 0000000000..c652839325
--- /dev/null
+++ b/scp2/source/draw/module_draw.ulf
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_PRG_DRAW]
+en-US = "%PRODUCTNAME Draw"
+
+[STR_DESC_MODULE_PRG_DRAW]
+en-US = "Create and edit drawings, flow charts, and logos by using %PRODUCTNAME Draw."
+
+[STR_NAME_MODULE_PRG_DRAW_BIN]
+en-US = "Program Module"
+
+[STR_DESC_MODULE_PRG_DRAW_BIN]
+en-US = "The application %PRODUCTNAME Draw"
+
+[STR_NAME_MODULE_PRG_DRAW_HELP]
+en-US = "%PRODUCTNAME Draw Help"
+
+[STR_DESC_MODULE_PRG_DRAW_HELP]
+en-US = "Help about %PRODUCTNAME Draw"
+
+
+
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
new file mode 100644
index 0000000000..515b55fb58
--- /dev/null
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -0,0 +1,1100 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+// MSOLE embedded object in SO7 file format
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273_
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}";
+    REG_VALUE_LNG(SO60_DRAWING)
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Auxusertype_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\AuxUserType\2";
+    Value = "%PRODUCTNAME";
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Auxusertype_3
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\AuxUserType\3";
+    REG_VALUE_LNG(SO60_DRAWING)
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Dataformats_Getset_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\DataFormats\GetSet\0";
+    Value = "Embed Source,1,8,1";
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Dataformats_Getset_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\DataFormats\GetSet\1";
+    Value = "3,1,32,1";
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Dataformats_Getset_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\DataFormats\GetSet\2";
+    Value = "2,1,16,1";
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,0";
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Inprochandler32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\InprocHandler32";
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\Insertable";
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Localserver32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\LocalServer32";
+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Miscstatus
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\MiscStatus";
+    Value = "16";
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Progid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\ProgID";
+    Value = "soffice.StarDrawDocument.6";
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Programmable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\Programmable";
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\verb\0";
+    Value = "&Edit,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\verb\-1";
+    Value = "Show,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\verb\-2";
+    Value = "Open,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Versionindependentprogid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\VersionIndependentProgID";
+    Value = "soffice.StarDrawDocument.6";
+End
+
+// MSOLE embedded object in OASIS file format
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c_
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}";
+    REG_VALUE_LNG(OO_DRAW)
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Auxusertype_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\AuxUserType\2";
+    Value = "%PRODUCTNAME";
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Auxusertype_3
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\AuxUserType\3";
+    REG_VALUE_LNG(OO_DRAW)
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Dataformats_Getset_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\DataFormats\GetSet\0";
+    Value = "Embed Source,1,8,1";
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Dataformats_Getset_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\DataFormats\GetSet\1";
+    Value = "3,1,32,1";
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Dataformats_Getset_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\DataFormats\GetSet\2";
+    Value = "2,1,16,1";
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,0";
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Inprochandler32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\InprocHandler32";
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\Insertable";
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Localserver32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\LocalServer32";
+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Miscstatus
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\MiscStatus";
+    Value = "16";
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Progid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\ProgID";
+    Value = "LibreOffice.DrawDocument.1";
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Programmable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\Programmable";
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\verb\0";
+    Value = "&Edit,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\verb\-1";
+    Value = "Show,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\verb\-2";
+    Value = "Open,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Versionindependentprogid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\VersionIndependentProgID";
+    Value = "LibreOffice.DrawDocument.1";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawdocument_6
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6";
+    REG_VALUE_LNG(SO60_DRAWING)
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Clsid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6\CLSID";
+    Value = "{41662FC2-0D57-4aff-AB27-AD2E12E7C273}";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,5";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Draw";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(SO60_DRAWING)
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6\shell";
+    Value = "open";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6\shell\new";
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6\shell\new\command";
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6\shell\open\command";
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6\shell\print\command";
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6\shell\printto\command";
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawdocument_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarDrawDocument\CurVer";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "soffice.StarDrawDocument.6";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawingdocument_6_Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6\Insertable";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawingdocument_6_Protocol_Stdfileediting_Server
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6\protocol\StdFileEditing\server";
+    Value = "<progpath>\program\soffice.exe";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawingdocument_6_Protocol_Stdfileediting_Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6\protocol\StdFileEditing\verb\0";
+    Value = "&Edit";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawingdocument_6_Protocol_Stdfileediting_Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6\protocol\StdFileEditing\verb\-1";
+    Value = "&Show";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawingdocument_6_Protocol_Stdfileediting_Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6\protocol\StdFileEditing\verb\-2";
+    Value = "&Open";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarDrawTemplate.6";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    REG_VALUE_LNG(SO60_DRAW_TEMPLATE)
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarDrawTemplate.6\DefaultIcon";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "<progpath>\program\soffice.bin,6";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawTemplate.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Draw";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(SO60_DRAWING)
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarDrawTemplate.6\shell";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "new";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarDrawTemplate.6\shell\new";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarDrawTemplate.6\shell\new\command";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarDrawTemplate.6\shell\open\command";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarDrawTemplate.6\shell\print\command";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarDrawTemplate.6\shell\printto\command";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+RegistryItem gid_Regitem_Std_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".std\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Std_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".std\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Std_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".std\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_StarDrawTemplate_6_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawTemplate.6\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Std
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".std";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "soffice.StarDrawTemplate.6";
+End
+
+RegistryItem gid_Regitem_Std_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".std";
+    Name = "Content Type";
+    Value = "application/vnd.sun.xml.draw.template";
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_std_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "soffice.StarDrawTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_std_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".std";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Sxd_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".sxd\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Sxd_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".sxd\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Sxd_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".sxd\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_StarDrawDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "soffice.StarDrawDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Sxd_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".sxd";
+    Name = "Content Type";
+    Value = "application/vnd.sun.xml.draw";
+End
+
+RegistryItem gid_Regitem_Sxd_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.sun.xml.draw";
+    Name = "Extension";
+    Value = ".sxd";
+End
+
+RegistryItem gid_Regitem__Sxd
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".sxd";
+    Value = "soffice.StarDrawDocument.6";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxd
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Name = ".sxd";
+    Value = "soffice.StarDrawDocument.6";
+    Styles = ();
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_sxd_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "soffice.StarDrawDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_sxd_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".sxd";
+    Value = "document";
+End
+
+// new odg file extension 
+
+RegistryItem gid_Regitem_Odg_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".odg\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Odg_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".odg\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Odg_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".odg\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_DrawDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Odg_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".odg";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.graphics";
+End
+
+RegistryItem gid_Regitem_Odg_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.graphics";
+    Name = "Extension";
+    Value = ".odg";
+End
+
+RegistryItem gid_Regitem__Odg
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".odg";
+    Value = "LibreOffice.DrawDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odg
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Name = ".odg";
+    Value = "LibreOffice.DrawDocument.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odg
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Name = "application/vnd.oasis.opendocument.graphics";
+    Value = "LibreOffice.DrawDocument.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Odg_Openoffice_Drawdocument_1_Shellnew
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".odg\LibreOffice.DrawDocument.1\ShellNew";
+    Name = "FileName";
+    Value = "<progpath>\share\template\shellnew\soffice.odg";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawdocument_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.DrawDocument\CurVer";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "LibreOffice.DrawDocument.1";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawdocument_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1";
+    REG_VALUE_LNG(OO_DRAW)
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Clsid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1\CLSID";
+    Value = "{448BB771-CFE2-47C4-BCDF-1FBF378E202C}";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,5";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawdocument_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Draw";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawdocument_1_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(OO_DRAW)
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_odg_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "LibreOffice.DrawDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_odg_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".odg";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1\shell";
+    Value = "open";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1\shell\new";
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1\shell\new\command";
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1\shell\open\command";
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1\shell\print\command";
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1\shell\printto\command";
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1\Insertable";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Server
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1\protocol\StdFileEditing\server";
+    Value = "<progpath>\program\soffice.exe";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1\protocol\StdFileEditing\verb\0";
+    Value = "&Edit";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1\protocol\StdFileEditing\verb\-1";
+    Value = "&Show";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawDocument.1\protocol\StdFileEditing\verb\-2";
+    Value = "&Open";
+End
+
+// .fodg
+
+RegistryItem gid_Regitem_Fodg_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".fodg";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.graphics";
+End
+
+RegistryItem gid_Regitem__Fodg
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".fodg";
+    Value = "LibreOffice.DrawDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodg
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Root;
+    Name = ".fodg";
+    Value = "LibreOffice.DrawDocument.1";
+End
+
+RegistryItem gid_Regitem_fodg_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".fodg";
+    Value = "document";
+End
+
+// new otg file extension 
+
+RegistryItem gid_Regitem_Otg_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".otg\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Otg_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".otg\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Otg_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".otg\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_DrawTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Otg
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".otg";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "LibreOffice.DrawTemplate.1";
+End
+
+RegistryItem gid_Regitem_Otg_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".otg";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.graphics-template";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawtemplate_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.DrawTemplate.1";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    REG_VALUE_LNG(OO_DRAW_TEMPLATE)
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.DrawTemplate.1\DefaultIcon";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "<progpath>\program\soffice.bin,6";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawTemplate.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Draw";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "LibreOffice.DrawTemplate.1";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(OO_DRAW_TEMPLATE)
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_otg_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "LibreOffice.DrawTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_otg_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".otg";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.DrawTemplate.1\shell";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "new";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.DrawTemplate.1\shell\new";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.DrawTemplate.1\shell\new\command";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.DrawTemplate.1\shell\open\command";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.DrawTemplate.1\shell\print\command";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.DrawTemplate.1\shell\printto\command";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+// "OpenWith" Windows Registry keys for extensions supported by Draw
+
+// .ODG
+RegistryItem gid_Regitem_OpenOffice_ODG_OpenWith_Draw
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".odg\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Name = "LibreOffice.DrawDocument.1";
+    Value = " ";
+End
+
+// .OTG
+RegistryItem gid_Regitem_OpenOffice_OTG_OpenWith_Draw
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".otg\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Name = "LibreOffice.DrawTemplate.1";
+    Value = " ";
+End
+
+// .SXD
+RegistryItem gid_Regitem_OpenOffice_SXD_OpenWith_Draw
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".sxd\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Name = "soffice.StarDrawDocument.6";
+    Value = " ";
+End
+
+// .STD
+RegistryItem gid_Regitem_OpenOffice_STD_OpenWith_Draw
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".std\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Name = "soffice.StarDrawTemplate.6";
+    Value = " ";
+End
+
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Otg
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Name = ".otg";
+    Value = "LibreOffice.DrawTemplate.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Std
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Name = ".std";
+    Value = "soffice.StarDrawTemplate.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sdraw_Exe
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\sdraw.exe";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Value = "<progpath>\program\sdraw.exe";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Sdraw_Exepath
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\sdraw.exe";
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Name = "Path";
+    Value = "<progpath>";
+End
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odg )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( otg )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxd )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( std )
+
+// registering the mso file types
+// CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,                 key,  cond, disp_name,        icon_id, app, default, dox_type)
+
+CONDITIONAL_REGISTER_DOC_EXTENSION( Vsd,  gid_Module_Prg_Draw_MSO_Reg, vsd,  VSD,  MS_VISIO_DOCUMENT, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Vdx,  gid_Module_Prg_Draw_MSO_Reg, vdx,  VDX,  MS_VISIO_DOCUMENT, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Vsdm,  gid_Module_Prg_Draw_MSO_Reg, vsdm,  VSDM,  MS_VISIO_DOCUMENT, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Vsdx,  gid_Module_Prg_Draw_MSO_Reg, vsdx,  VSDX,  MS_VISIO_DOCUMENT, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pub,  gid_Module_Prg_Draw_MSO_Reg, pub,  PUB,  MS_PUBLISHER_DOCUMENT, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Vst,  gid_Module_Prg_Draw_MSO_Reg, vst,  VST,  MS_VISIO_TEMPLATE, 6, sdraw.exe, new, Draw )
+
+// registering other supported types
+
+CONDITIONAL_REGISTER_DOC_EXTENSION( Wpg,  gid_Module_Prg_Draw_Other_Reg, wpg,  WPG,  WORDPERFECT_GRAPHIC_FILE, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Dxf,  gid_Module_Prg_Draw_Other_Reg, dxf,  DXF,  AUTOCAD_DRAWING_INTERCHANGE_FORMAT, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Emf,  gid_Module_Prg_Draw_Other_Reg, emf,  EMF,  MS_ENHANCED_METAFILE, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Eps,  gid_Module_Prg_Draw_Other_Reg, eps,  EPS,  ENCAPSULATED_POSTSCRIPT, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Met,  gid_Module_Prg_Draw_Other_Reg, met,  MET,  OS2_METAFILE, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pct,  gid_Module_Prg_Draw_Other_Reg, pct,  PCT,  MACINTOSH_PICTURE_METAFILE, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Wmf,  gid_Module_Prg_Draw_Other_Reg, wmf,  WMF,  MS_WINDOWS_METAFILE, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Bmp,  gid_Module_Prg_Draw_Other_Reg, bmp,  BMP,  MS_WINDOWS_BITMAP, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Cdr,  gid_Module_Prg_Draw_Other_Reg, cdr,  CDR,  CORELDRAW_FILE_FORMAT, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Cmx,  gid_Module_Prg_Draw_Other_Reg, cmx,  CMX,  COREL_PRESENTATION_EXCHANGE, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Gif,  gid_Module_Prg_Draw_Other_Reg, gif,  GIF,  GRAPHICS_INTERCHANGE_FORMAT, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Jpg,  gid_Module_Prg_Draw_Other_Reg, jpg,  JPG,  JOINT_PHOTOGRAPHIC_EXPERTS_GROUP, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Jpeg,  gid_Module_Prg_Draw_Other_Reg, jpeg,  JPEG,  JOINT_PHOTOGRAPHIC_EXPERTS_GROUP, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Jpe,  gid_Module_Prg_Draw_Other_Reg, jpe,  JPE,  JOINT_PHOTOGRAPHIC_EXPERTS_GROUP, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pbm,  gid_Module_Prg_Draw_Other_Reg, pbm,  PBM,  PORTABLE_BITMAP_FORMAT, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pcx,  gid_Module_Prg_Draw_Other_Reg, pcx,  PCX,  PERSONAL_COMPUTER_EXCHANGE, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pgm,  gid_Module_Prg_Draw_Other_Reg, pgm,  PGM,  PORTABLE_GRAYMAP_FORMAT, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Png,  gid_Module_Prg_Draw_Other_Reg, png,  PNG,  PORTABLE_NETWORK_GRAPHICS, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Ppm,  gid_Module_Prg_Draw_Other_Reg, ppm,  PPM,  PORTABLE_PIXMAP_FORMAT, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Psd,  gid_Module_Prg_Draw_Other_Reg, psd,  PSD,  PHOTOSHOP_DOCUMENT, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Ras,  gid_Module_Prg_Draw_Other_Reg, ras,  RAS,  SUN_RASTER_GRAPHIC, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Svg,  gid_Module_Prg_Draw_Other_Reg, svg,  SVG,  SCALABLE_VECTOR_GRAPHICS, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Tga,  gid_Module_Prg_Draw_Other_Reg, tga,  TGA,  TRUEVISION_TGA, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Tif,  gid_Module_Prg_Draw_Other_Reg, tif,  TIF,  TAGGED_IMAGE_FILE_FORMAT, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Tiff,  gid_Module_Prg_Draw_Other_Reg, tiff,  TIFF,  TAGGED_IMAGE_FILE_FORMAT, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xbm,  gid_Module_Prg_Draw_Other_Reg, xbm,  XBM,  X_BITMAP, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xpm,  gid_Module_Prg_Draw_Other_Reg, xpm,  XPM,  X_PIXMAP, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( PCD,  gid_Module_Prg_Draw_Other_Reg, pcd,  PCD,  KODAK_PHOTO_CD_IMAGE, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Webp, gid_Module_Prg_Draw_Other_Reg, webp, WEBP, WEBP, 5, sdraw.exe, open, Draw )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pdf,  gid_Module_Prg_Draw_Other_Reg, pdf, PDF, PDF, 5, sdraw.exe, open, Draw )
+
+// registering ms-visio URI scheme handler
+CONDITIONAL_REGISTER_URI_HANDLER( ms-visio, ms_visio, gid_Module_Prg_Draw_MSO_Reg, SELECT_VISIO )
+REGISTRY_ENTRY_CAPABILITIES_URL(ms-visio, ms_visio, gid_Module_Prg_Draw_MSO_Reg, vnd.libreoffice.command)
diff --git a/scp2/source/draw/registryitem_draw.ulf b/scp2/source/draw/registryitem_draw.ulf
new file mode 100644
index 0000000000..5d1335bb8b
--- /dev/null
+++ b/scp2/source/draw/registryitem_draw.ulf
@@ -0,0 +1,119 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_REG_VAL_NEW]
+en-US = "&New"
+
+[STR_REG_VAL_SO60_DRAWING]
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Drawing"
+
+[STR_REG_VAL_SO60_DRAW_TEMPLATE]
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Drawing Template"
+
+[STR_REG_VAL_OO_DRAW]
+en-US = "OpenDocument Drawing"
+
+[STR_REG_VAL_OO_DRAW_TEMPLATE]
+en-US = "OpenDocument Drawing Template"
+
+[STR_REG_VAL_MS_VISIO_DOCUMENT]
+en-US = "Microsoft Visio 2000/XP/2003 Document"
+
+[STR_REG_VAL_MS_VISIO_TEMPLATE]
+en-US = "Microsoft Visio 2000/XP/2003 Template"
+
+[STR_REG_VAL_MS_PUBLISHER_DOCUMENT]
+en-US = "Microsoft Publisher Document"
+
+[STR_REG_VAL_WORDPERFECT_GRAPHIC_FILE]
+en-US = "WordPerfect Graphic File"
+
+[STR_REG_VAL_AUTOCAD_DRAWING_INTERCHANGE_FORMAT]
+en-US = "AutoCAD File"
+
+[STR_REG_VAL_MS_ENHANCED_METAFILE]
+en-US = "Microsoft Enhanced Metafile"
+
+[STR_REG_VAL_ENCAPSULATED_POSTSCRIPT]
+en-US = "Encapsulated PostScript File"
+
+[STR_REG_VAL_OS2_METAFILE]
+en-US = "OS/2 Metafile"
+
+[STR_REG_VAL_MACINTOSH_PICTURE_METAFILE]
+en-US = "Macintosh Picture Metafile"
+
+[STR_REG_VAL_MS_WINDOWS_METAFILE]
+en-US = "Microsoft Windows Metafile"
+
+[STR_REG_VAL_MS_WINDOWS_BITMAP]
+en-US = "Microsoft Windows Bitmap File"
+
+[STR_REG_VAL_CORELDRAW_FILE_FORMAT]
+en-US = "CorelDraw File"
+
+[STR_REG_VAL_COREL_PRESENTATION_EXCHANGE]
+en-US = "Corel Presentation Exchange File"
+
+[STR_REG_VAL_GRAPHICS_INTERCHANGE_FORMAT]
+en-US = "Graphics Interchange Format File"
+
+[STR_REG_VAL_JOINT_PHOTOGRAPHIC_EXPERTS_GROUP]
+en-US = "Joint Photographic Experts Group File"
+
+[STR_REG_VAL_PORTABLE_BITMAP_FORMAT]
+en-US = "Portable Bitmap Format File"
+
+[STR_REG_VAL_PERSONAL_COMPUTER_EXCHANGE]
+en-US = "Personal Computer Exchange File"
+
+[STR_REG_VAL_PORTABLE_GRAYMAP_FORMAT]
+en-US = "Portable Graymap Format File"
+
+[STR_REG_VAL_PORTABLE_NETWORK_GRAPHICS]
+en-US = "Portable Network Graphics File"
+
+[STR_REG_VAL_PORTABLE_PIXMAP_FORMAT]
+en-US = "Portable Pixmap Format File"
+
+[STR_REG_VAL_PHOTOSHOP_DOCUMENT]
+en-US = "Adobe Photoshop Document"
+
+[STR_REG_VAL_SUN_RASTER_GRAPHIC]
+en-US = "Sun Raster Graphic File"
+
+[STR_REG_VAL_SCALABLE_VECTOR_GRAPHICS]
+en-US = "Scalable Vector Graphics File"
+
+[STR_REG_VAL_TRUEVISION_TGA]
+en-US = "Truevision TGA File"
+
+[STR_REG_VAL_TAGGED_IMAGE_FILE_FORMAT]
+en-US = "Tagged Image File"
+
+[STR_REG_VAL_X_BITMAP]
+en-US = "X BitMap File"
+
+[STR_REG_VAL_X_PIXMAP]
+en-US = "X Pixmap File"
+
+[STR_REG_VAL_KODAK_PHOTO_CD_IMAGE]
+en-US = "Kodak Photo CD Image File"
+
+[STR_REG_VAL_PDF]
+en-US = "PDF (Portable Document Format)"
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
new file mode 100644
index 0000000000..4f7859695a
--- /dev/null
+++ b/scp2/source/extensions/file_extensions.scp
@@ -0,0 +1,77 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+/* *** Additional Extensions *** */
+
+#ifdef WITH_EXTENSION_INTEGRATION
+
+/* ** MediaWiki Publisher** */
+
+#ifndef WITHOUT_EXTENSION_MEDIAWIKI
+
+File gid_File_Oxt_MediaWiki
+    TXT_FILE_BODY;
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "Extension/wiki-publisher.filelist";
+End
+
+#endif
+
+/* ** NLPSolver ** */
+
+#ifdef WITH_EXTENSION_NLPSOLVER
+
+File gid_File_Oxt_NLPSolver
+    TXT_FILE_BODY;
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "Extension/nlpsolver.filelist";
+End
+
+#endif
+
+/* ** Script provider for BeanShell ** */
+
+#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
+
+File gid_File_Rdb_Scriptproviderforbeanshell
+    TXT_FILE_BODY;
+    Name = "scriptproviderforbeanshell.rdb";
+    Dir = gid_Brand_Dir_Program_Services;
+    Styles = (PACKED);
+End
+
+#endif
+
+/* ** Script provider for JavaScript ** */
+
+#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
+
+File gid_File_Rdb_Scriptproviderforjavascript
+    TXT_FILE_BODY;
+    Name = "scriptproviderforjavascript.rdb";
+    Dir = gid_Brand_Dir_Program_Services;
+    Styles = (PACKED);
+End
+
+#endif
+
+#endif
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
new file mode 100644
index 0000000000..7f8061f998
--- /dev/null
+++ b/scp2/source/extensions/module_extensions.scp
@@ -0,0 +1,114 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+
+Module gid_Module_Optional_Extensions
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS);
+    ParentID = gid_Module_Optional;
+    Files = ( );
+    Default = YES;
+    Styles = ( );
+End
+
+/* *** Additional Extensions *** */
+
+#ifdef WITH_EXTENSION_INTEGRATION
+
+/* ** MediaWiki Publisher** */
+
+#ifndef WITHOUT_EXTENSION_MEDIAWIKI
+Module gid_Module_Optional_Extensions_MEDIAWIKI
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_MediaWiki );
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Numbertext ** */
+
+#ifdef WITH_EXTENSION_NUMBERTEXT
+
+#include "AutoInstall/extensions_numbertext"
+
+Module gid_Module_Optional_Extensions_NumberText
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (auto_extensions_numbertext_ALL);
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** NLPSolver ** */
+
+#ifdef WITH_EXTENSION_NLPSOLVER
+Module gid_Module_Optional_Extensions_NLPSolver
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_NLPSolver );
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Script provider for BeanShell ** */
+
+#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL
+
+#include "AutoInstall/extensions_bsh"
+
+Module gid_Module_Optional_Extensions_Script_Provider_For_BS
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (auto_extensions_bsh_ALL,
+        gid_File_Rdb_Scriptproviderforbeanshell );
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
+
+/* ** Script provider for JavaScript ** */
+
+#if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_JAVASCRIPT
+
+#include "AutoInstall/extensions_rhino"
+
+Module gid_Module_Optional_Extensions_Script_Provider_For_JS
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (auto_extensions_rhino_ALL,
+        gid_File_Rdb_Scriptproviderforjavascript );
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
+
+#endif
diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf
new file mode 100644
index 0000000000..6218564c08
--- /dev/null
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS]
+en-US = "Extensions"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS]
+en-US = "Useful %PRODUCTNAME extensions."
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
+en-US = "MediaWiki Publisher"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
+en-US = "MediaWiki Publisher"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
+en-US = "Numbertext"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
+en-US = "Provides the NUMBERTEXT/MONEYTEXT spreadsheet functions which convert numbers to localized text, e.g. '100' to 'hundred'."
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER]
+en-US = "Solver for Nonlinear Programming"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER]
+en-US = "Solver for Nonlinear Programming"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL]
+en-US = "Script provider for BeanShell"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL]
+en-US = "Script provider for BeanShell"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT]
+en-US = "Script provider for JavaScript"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT]
+en-US = "Script provider for JavaScript"
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
new file mode 100644
index 0000000000..3f4b8f5581
--- /dev/null
+++ b/scp2/source/gnome/file_gnome.scp
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#include "macros.inc"
+#include "config_gio.h"
+
+#if ENABLE_GIO
+File gid_File_Share_Registry_Gnome_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "gnome.xcd";
+End
+#endif
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
new file mode 100644
index 0000000000..200c30049d
--- /dev/null
+++ b/scp2/source/gnome/module_gnome.scp
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+#include "config_gio.h"
+
+#include "AutoInstall/gnome"
+
+Module gid_Module_Optional_Gnome
+    ParentID = gid_Module_Optional;
+    Default = YES;
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_GNOME);
+    Styles = ();
+    Files = (auto_gnome_ALL
+#if ENABLE_GIO
+      ,gid_File_Share_Registry_Gnome_Xcd
+#endif
+    );
+End
+
diff --git a/scp2/source/gnome/module_gnome.ulf b/scp2/source/gnome/module_gnome.ulf
new file mode 100644
index 0000000000..54aaa0b1f1
--- /dev/null
+++ b/scp2/source/gnome/module_gnome.ulf
@@ -0,0 +1,24 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_OPTIONAL_GNOME]
+en-US = "GNOME Integration"
+
+[STR_DESC_MODULE_OPTIONAL_GNOME]
+en-US = "System integration of %PRODUCTNAME %PRODUCTVERSION into GNOME Desktop Environment."
+
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
new file mode 100644
index 0000000000..501d2fead8
--- /dev/null
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+File gid_File_Share_Registry_Graphicfilter_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "graphicfilter.xcd";
+End
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp
new file mode 100644
index 0000000000..47031d1085
--- /dev/null
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/graphicfilter"
+
+Module gid_Module_Optional_Grfflt
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC ( MODULE_OPTIONAL_GRFFLT );
+    Sortkey = "600";
+    ParentID = gid_Module_Optional;
+    Default = YES;
+    Files = (auto_graphicfilter_ALL,
+        gid_File_Share_Registry_Graphicfilter_Xcd);
+End
diff --git a/scp2/source/graphicfilter/module_graphicfilter.ulf b/scp2/source/graphicfilter/module_graphicfilter.ulf
new file mode 100644
index 0000000000..6f4c286325
--- /dev/null
+++ b/scp2/source/graphicfilter/module_graphicfilter.ulf
@@ -0,0 +1,101 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_OPTIONAL_GRFFLT]
+en-US = "Image Filters"
+
+[STR_DESC_MODULE_OPTIONAL_GRFFLT]
+en-US = "Additional filters required to read alien image formats."
+
+[STR_NAME_MODULE_OPTIONAL_GRFFLT_ADOBE]
+en-US = "Adobe Photoshop Import Filter"
+
+[STR_DESC_MODULE_OPTIONAL_GRFFLT_ADOBE]
+en-US = "Adobe Photoshop Import Filter"
+
+[STR_NAME_MODULE_OPTIONAL_GRFFLT_TGA]
+en-US = "TGA Import"
+
+[STR_DESC_MODULE_OPTIONAL_GRFFLT_TGA]
+en-US = "TGA TrueVision TARGA Import Filter"
+
+[STR_NAME_MODULE_OPTIONAL_GRFFLT_EPS]
+en-US = "EPS Import/Export Filter"
+
+[STR_DESC_MODULE_OPTIONAL_GRFFLT_EPS]
+en-US = "Encapsulated Postscript Import/Export Filter"
+
+[STR_NAME_MODULE_OPTIONAL_GRFFLT_XPM]
+en-US = "XPM Export Filter"
+
+[STR_DESC_MODULE_OPTIONAL_GRFFLT_XPM]
+en-US = "XPM Export Filter"
+
+[STR_NAME_MODULE_OPTIONAL_GRFFLT_PBMP]
+en-US = "Portable Bitmap Import/Export"
+
+[STR_DESC_MODULE_OPTIONAL_GRFFLT_PBMP]
+en-US = "Portable Bitmap Import/Export Filters"
+
+[STR_NAME_MODULE_OPTIONAL_GRFFLT_SUNRST]
+en-US = "SUN Rasterfile Import/Export"
+
+[STR_DESC_MODULE_OPTIONAL_GRFFLT_SUNRST]
+en-US = "SUN Rasterfile Import/Export Filters"
+
+[STR_NAME_MODULE_OPTIONAL_GRFFLT_ACAD]
+en-US = "AutoCAD Import"
+
+[STR_DESC_MODULE_OPTIONAL_GRFFLT_ACAD]
+en-US = "AutoCAD Import Filter"
+
+[STR_NAME_MODULE_OPTIONAL_GRFFLT_KODAC]
+en-US = "Kodak Photo-CD Import"
+
+[STR_DESC_MODULE_OPTIONAL_GRFFLT_KODAC]
+en-US = "Kodak Photo-CD Import Filter"
+
+[STR_NAME_MODULE_OPTIONAL_GRFFLT_MACPICT]
+en-US = "Mac-Pict Import/Export"
+
+[STR_DESC_MODULE_OPTIONAL_GRFFLT_MACPICT]
+en-US = "Mac-Pict Import/Export Filters"
+
+[STR_NAME_MODULE_OPTIONAL_GRFFLT_OS2META]
+en-US = "OS/2 Metafile Import/Export"
+
+[STR_DESC_MODULE_OPTIONAL_GRFFLT_OS2META]
+en-US = "OS/2 Metafile Import/Export Filters"
+
+[STR_NAME_MODULE_OPTIONAL_GRFFLT_PCX]
+en-US = "PCX Import"
+
+[STR_DESC_MODULE_OPTIONAL_GRFFLT_PCX]
+en-US = "Z-Soft PCX Import"
+
+[STR_NAME_MODULE_OPTIONAL_GRFFLT_TIFF]
+en-US = "TIFF Import/Export"
+
+[STR_DESC_MODULE_OPTIONAL_GRFFLT_TIFF]
+en-US = "TIFF Import and Export Filter"
+
+[STR_NAME_MODULE_OPTIONAL_GRFFLT_SVG]
+en-US = "SVG Export"
+
+[STR_DESC_MODULE_OPTIONAL_GRFFLT_SVG]
+en-US = "SVG Export Filter"
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
new file mode 100644
index 0000000000..bed62eede8
--- /dev/null
+++ b/scp2/source/impress/file_impress.scp
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+File gid_File_Share_Registry_Impress_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "impress.xcd";
+End
+
+#if defined WITH_HELPPACKS
+File gid_File_Help_Simpress_Zip
+    Dir = FILELIST_DIR;
+    FILELIST_TXT_FILE_BODY_HELPPACK;
+    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(simpress);
+End
+#endif
diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp
new file mode 100644
index 0000000000..c35221b533
--- /dev/null
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#ifndef ENABLE_SILENT_MSI
+FolderItem gid_Folderitem_Simpress
+    Name = "%PRODUCTNAME Impress";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    FolderID = gid_Folder_Staroffice51;
+    FileID = auto_impress_brand_exe_simpress;
+    IconFile = auto_impress_brand_exe_simpress;
+    IconID = 0;
+    WkDir = gid_Brand_Dir_Program;
+    Parameter = "";
+    Styles = (NON_ADVERTISED);
+    ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
+End
+
+FolderItemProperty gid_Fip_Simpress_AppID
+    ShortcutID = gid_Folderitem_Simpress;
+    Key = "System.AppUserModel.ID";
+    Value = "TheDocumentFoundation.LibreOffice.Impress";
+End
+#endif
diff --git a/scp2/source/impress/folderitem_impress.ulf b/scp2/source/impress/folderitem_impress.ulf
new file mode 100644
index 0000000000..fecbba92dd
--- /dev/null
+++ b/scp2/source/impress/folderitem_impress.ulf
@@ -0,0 +1,25 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_FI_NAME_PRAESENTATION]
+en-US = "Presentation"
+
+[STR_FI_TOOLTIP_IMPRESS]
+en-US = "Create and edit presentations for slideshows, meeting and Web pages by using Impress."
+
+
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
new file mode 100644
index 0000000000..ca335d6973
--- /dev/null
+++ b/scp2/source/impress/module_impress.scp
@@ -0,0 +1,80 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/impress"
+#include "AutoInstall/impress_brand"
+
+Module gid_Module_Prg_Impress
+    MOD_NAME_DESC ( MODULE_PRG_IMPRESS );
+    ParentID = gid_Module_Prg;
+    Sortkey = "400";
+    Styles =(APPLICATIONMODULE);
+End
+
+Module gid_Module_Prg_Impress_Bin
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC ( MODULE_PRG_IMPRESS_BIN );
+    ParentID = gid_Module_Prg_Impress;
+    Sortkey = "100";
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+    Files = (auto_impress_ALL,
+    gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,
+    gid_File_Share_Registry_Impress_Xcd,
+    gid_File_Tmp_Userinstall_Impress_Inf);
+End
+
+Module gid_Module_Brand_Prg_Impress
+    PackageInfo = "packinfo_brand.txt";
+    Name = "gid_Module_Brand_Prg_Impress";
+    Description = "gid_Module_Brand_Prg_Impress";
+    ParentID = gid_Module_Prg_Impress;
+    Sortkey = "100";
+    InstallOrder = "1040";
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+    Files = (auto_impress_brand_ALL);
+End
+
+Module gid_Module_Langpack_Impress_Template
+    ParentID = gid_Module_Prg_Impress_Bin;
+    Name = "gid_Module_Langpack_Impress_Template";
+    Description = "gid_Module_Langpack_Impress_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = ();
+End
+
+Module gid_Module_Prg_Impress_MSO_Reg
+    ParentID = gid_Module_Prg_Impress;
+    Name = "gid_Module_Prg_Impress_MSO_Reg";
+    Description = "gid_Module_Prg_Impress_MSO_Reg";
+    Styles = (HIDDEN_ROOT);
+    Default = YES;
+End
+
+Module gid_Module_Prg_Impress_Other_Reg
+    ParentID = gid_Module_Prg_Impress;
+    Name = "gid_Module_Prg_Impress_Other_Reg";
+    Description = "gid_Module_Prg_Impress_Other_Reg";
+    Styles = (HIDDEN_ROOT);
+    Default = YES;
+End
+
+#include "alllangmodules_impress.inc"
diff --git a/scp2/source/impress/module_impress.ulf b/scp2/source/impress/module_impress.ulf
new file mode 100644
index 0000000000..9f348a3d98
--- /dev/null
+++ b/scp2/source/impress/module_impress.ulf
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+
+[STR_NAME_MODULE_PRG_IMPRESS]
+en-US = "%PRODUCTNAME Impress"
+
+[STR_DESC_MODULE_PRG_IMPRESS]
+en-US = "Create and edit presentations for slideshows, meeting and Web pages by using %PRODUCTNAME Impress."
+
+[STR_NAME_MODULE_PRG_IMPRESS_BIN]
+en-US = "Program Module"
+
+[STR_DESC_MODULE_PRG_IMPRESS_BIN]
+en-US = "The application %PRODUCTNAME Impress"
+
+[STR_NAME_MODULE_PRG_IMPRESS_HELP]
+en-US = "%PRODUCTNAME Impress Help"
+
+[STR_DESC_MODULE_PRG_IMPRESS_HELP]
+en-US = "Help about %PRODUCTNAME Impress"
+
+
+
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
new file mode 100644
index 0000000000..a549c346e4
--- /dev/null
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/ogltrans"
+
+Module gid_Module_Optional_OGLTrans
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Optional;
+    Files = ( auto_ogltrans_ALL, gid_File_Share_Registry_Ogltrans_Xcd );
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+End
+
+File gid_File_Share_Registry_Ogltrans_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "ogltrans.xcd";
+End
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
new file mode 100644
index 0000000000..c0b173dc2f
--- /dev/null
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -0,0 +1,1147 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+// MSOLE embedded object in SO7 file format
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8_
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}";
+    REG_VALUE_LNG(SO60_PRESENT)
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Auxusertype_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\AuxUserType\2";
+    Value = "%PRODUCTNAME";
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Auxusertype_3
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\AuxUserType\3";
+    REG_VALUE_LNG(SO60_PRESENT)
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Dataformats_Getset_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\DataFormats\GetSet\0";
+    Value = "Embed Source,1,8,1";
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Dataformats_Getset_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\DataFormats\GetSet\1";
+    Value = "3,1,32,1";
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Dataformats_Getset_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\DataFormats\GetSet\2";
+    Value = "2,1,16,1";
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,0";
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Inprochandler32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\InprocHandler32";
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\Insertable";
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Localserver32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\LocalServer32";
+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Miscstatus
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\MiscStatus";
+    Value = "16";
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Progid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\ProgID";
+    Value = "soffice.StarImpressDocument.6";
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Programmable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\Programmable";
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\verb\0";
+    Value = "&Edit,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\verb\-1";
+    Value = "Show,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\verb\-2";
+    Value = "Open,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Versionindependentprogid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\VersionIndependentProgID";
+    Value = "soffice.StarImpressDocument.6";
+End
+
+// MSOLE embedded object in OASIS file format
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917_
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}";
+    REG_VALUE_LNG(OO_PRESENT)
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Auxusertype_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\AuxUserType\2";
+    Value = "%PRODUCTNAME";
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Auxusertype_3
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\AuxUserType\3";
+    REG_VALUE_LNG(OO_PRESENT)
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Dataformats_Getset_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\DataFormats\GetSet\0";
+    Value = "Embed Source,1,8,1";
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Dataformats_Getset_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\DataFormats\GetSet\1";
+    Value = "3,1,32,1";
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Dataformats_Getset_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\DataFormats\GetSet\2";
+    Value = "2,1,16,1";
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,0";
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Inprochandler32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\InprocHandler32";
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\Insertable";
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Localserver32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\LocalServer32";
+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Miscstatus
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\MiscStatus";
+    Value = "16";
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Progid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\ProgID";
+    Value = "LibreOffice.ImpressDocument.1";
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Programmable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\Programmable";
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\verb\0";
+    Value = "&Edit,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\verb\-1";
+    Value = "Show,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\verb\-2";
+    Value = "Open,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Versionindependentprogid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\VersionIndependentProgID";
+    Value = "LibreOffice.ImpressDocument.1";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6";
+    REG_VALUE_LNG(SO60_PRESENT)
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Clsid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\CLSID";
+    Value = "{E5A0B632-DFBA-4549-9346-E414DA06E6F8}";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,7";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Impress";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(SO60_PRESENT)
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\Insertable";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Protocol_Stdfileediting_Server
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\protocol\StdFileEditing\server";
+    Value = "<progpath>\program\soffice.exe";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Protocol_Stdfileediting_Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\protocol\StdFileEditing\verb\0";
+    Value = "&Edit";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Protocol_Stdfileediting_Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\protocol\StdFileEditing\verb\-1";
+    Value = "&Show";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Protocol_Stdfileediting_Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\protocol\StdFileEditing\verb\-2";
+    Value = "&Open";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\shell";
+    Value = "open";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\shell\new";
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\shell\new\command";
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\shell\open\command";
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\shell\print\command";
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\shell\printto\command";
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Show
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\shell\show";
+    REG_VALUE_LNG(SO60_SHOW)
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Show_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\shell\show\command";
+    Value = "\"<progpath>\program\soffice.exe\" -show \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpressdocument_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarImpressDocument\CurVer";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "soffice.StarImpressDocument.6";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarImpressTemplate.6";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    REG_VALUE_LNG(SO60_IMPRESS_TEMPLATE)
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarImpressTemplate.6\DefaultIcon";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "<progpath>\program\soffice.bin,8";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressTemplate.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Impress";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressTemplate.6";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(SO60_IMPRESS_TEMPLATE)
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarImpressTemplate.6\shell";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "new";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarImpressTemplate.6\shell\new";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarImpressTemplate.6\shell\new\command";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarImpressTemplate.6\shell\open\command";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarImpressTemplate.6\shell\print\command";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarImpressTemplate.6\shell\printto\command";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+RegistryItem gid_Regitem_Sti
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".sti";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "soffice.StarImpressTemplate.6";
+End
+
+RegistryItem gid_Regitem_Sti_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".sti\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Sti_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".sti\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Sti_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".sti\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_StarImpressTemplate_6_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressTemplate.6\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Sti_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".sti";
+    Name = "Content Type";
+    Value = "application/vnd.sun.xml.impress.template";
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_sti_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "soffice.StarImpressTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_sti_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".sti";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Sxi_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".sxi\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Sxi_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".sxi\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Sxi_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".sxi\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_StarImpressDocument_6_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "soffice.StarImpressDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Sxi_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".sxi";
+    Name = "Content Type";
+    Value = "application/vnd.sun.xml.impress";
+End
+
+RegistryItem gid_Regitem_Sxi_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.sun.xml.impress";
+    Name = "Extension";
+    Value = ".sxi";
+End
+
+RegistryItem gid_Regitem__Sxi
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".sxi";
+    Value = "soffice.StarImpressDocument.6";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxi
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Name = ".sxi";
+    Value = "soffice.StarImpressDocument.6";
+    Styles = ();
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_sxi_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "soffice.StarImpressDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_sxi_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".sxi";
+    Value = "document";
+End
+
+// new odp file extension
+
+RegistryItem gid_Regitem_Odp_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".odp\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Odp_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".odp\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Odp_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".odp\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_ImpressDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem__Odp
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".odp";
+    Value = "LibreOffice.ImpressDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odp
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Name = ".odp";
+    Value = "LibreOffice.ImpressDocument.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odp
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Name = "application/vnd.oasis.opendocument.presentation";
+    Value = "LibreOffice.ImpressDocument.1";
+    Styles = ();
+End
+
+
+RegistryItem gid_Regitem_Odp_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".odp";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.presentation";
+End
+
+RegistryItem gid_Regitem_Odp_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.presentation";
+    Name = "Extension";
+    Value = ".odp";
+End
+
+RegistryItem gid_Regitem_Odp_Openoffice_Impressdocument_1_Shellnew
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".odp\LibreOffice.ImpressDocument.1\ShellNew";
+    Name = "FileName";
+    Value = "<progpath>\share\template\shellnew\soffice.odp";
+End
+
+RegistryItem gid_Regitem_Openoffice_Starimpressdocument_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarImpressDocument\CurVer";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "LibreOffice.ImpressDocument.1";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1";
+    REG_VALUE_LNG(OO_PRESENT)
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Clsid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\CLSID";
+    Value = "{EE5D1EA4-D445-4289-B2FC-55FC93693917}";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,7";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Impress";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(OO_PRESENT)
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_odp_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "LibreOffice.ImpressDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_odp_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".odp";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\Insertable";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Server
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\protocol\StdFileEditing\server";
+    Value = "<progpath>\program\soffice.exe";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\protocol\StdFileEditing\verb\0";
+    Value = "&Edit";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\protocol\StdFileEditing\verb\-1";
+    Value = "&Show";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\protocol\StdFileEditing\verb\-2";
+    Value = "&Open";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\shell";
+    Value = "open";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\shell\new";
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\shell\new\command";
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\shell\open\command";
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\shell\print\command";
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\shell\printto\command";
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Show
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\shell\show";
+    REG_VALUE_LNG(SO60_SHOW)
+End
+
+RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Show_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressDocument.1\shell\show\command";
+    Value = "\"<progpath>\program\soffice.exe\" -show \"%1\"";
+End
+
+// .fodp
+
+RegistryItem gid_Regitem__Fodp
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".fodp";
+    Value = "LibreOffice.ImpressDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodp
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Root;
+    Name = ".fodp";
+    Value = "LibreOffice.ImpressDocument.1";
+End
+
+RegistryItem gid_Regitem_Fodp_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".fodp";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.presentation";
+End
+
+RegistryItem gid_Regitem_fodp_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".fodp";
+    Value = "document";
+End
+
+// new otp file extension
+
+RegistryItem gid_Regitem_Otp_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".otp\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Otp_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".otp\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Otp_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".otp\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_ImpressTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Otp
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".otp";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "LibreOffice.ImpressTemplate.1";
+End
+
+RegistryItem gid_Regitem_Otp_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".otp";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.presentation-template";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impresstemplate_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.ImpressTemplate.1";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    REG_VALUE_LNG(OO_PRESENT_TEMPLATE)
+End
+
+RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.ImpressTemplate.1\DefaultIcon";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "<progpath>\program\soffice.bin,8";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressTemplate.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Impress";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "LibreOffice.ImpressTemplate.1";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(OO_PRESENT_TEMPLATE)
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_otp_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "LibreOffice.ImpressTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_otp_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".otp";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.ImpressTemplate.1\shell";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "new";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.ImpressTemplate.1\shell\new";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.ImpressTemplate.1\shell\new\command";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.ImpressTemplate.1\shell\open\command";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.ImpressTemplate.1\shell\print\command";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.ImpressTemplate.1\shell\printto\command";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+// "OpenWith" Windows Registry keys for extensions supported by Impress
+
+// .ODP
+RegistryItem gid_Regitem_OpenOffice_ODP_OpenWith_Impress
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".odp\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Name = "LibreOffice.ImpressDocument.1";
+    Value = " ";
+End
+
+// .OTP
+RegistryItem gid_Regitem_OpenOffice_OTP_OpenWith_Impress
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".otp\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Name = "LibreOffice.ImpressTemplate.1";
+    Value = " ";
+End
+
+// .SXI
+RegistryItem gid_Regitem_OpenOffice_SXI_OpenWith_Impress
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".sxi\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Name = "soffice.StarImpressDocument.6";
+    Value = " ";
+End
+
+// .STI
+RegistryItem gid_Regitem_OpenOffice_STI_OpenWith_Impress
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".sti\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Name = "soffice.StarImpressTemplate.6";
+    Value = " ";
+End
+
+// .SXD
+RegistryItem gid_Regitem_OpenOffice_SXD_OpenWith_Impress
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".sxd\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Name = "soffice.StarImpressDocument.6";
+    Value = " ";
+End
+
+// .ODG
+RegistryItem gid_Regitem_OpenOffice_ODG_OpenWith_Impress
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".odg\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Name = "LibreOffice.ImpressDocument.1";
+    Value = " ";
+End
+
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Otp
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Name = ".otp";
+    Value = "LibreOffice.ImpressTemplate.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sti
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Name = ".sti";
+    Value = "soffice.StarImpressTemplate.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Simpress_Exe
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\simpress.exe";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Value = "<progpath>\program\simpress.exe";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Simpress_Exepath
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\simpress.exe";
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Name = "Path";
+    Value = "<progpath>";
+End
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odp )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( otp )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxi )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti )
+
+// registering the mso file types
+
+CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt,  gid_Module_Prg_Impress_MSO_Reg, ppt,  PPT,  MS_POWERPOINT_PRESENTATION_OLD, 7, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pps,  gid_Module_Prg_Impress_MSO_Reg, pps,  PPS,  MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Ppsx, gid_Module_Prg_Impress_MSO_Reg, ppsx, PPSX, MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_MSO_Reg, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_MSO_Reg, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot,  gid_Module_Prg_Impress_MSO_Reg, pot,  POT,  MS_POWERPOINT_TEMPLATE_OLD, 8, simpress.exe, new, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_MSO_Reg, potx, POTX, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_MSO_Reg, potm, POTM, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
+
+// Registering OOXML MIME content types, to allow OS/applications to redirect such content to LO even if extension is unknown
+
+RegistryItem gid_Regitem_Pptx_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.openxmlformats-officedocument.presentationml.presentation";
+    Name = "Extension";
+    Value = ".pptx";
+End
+
+RegistryItem gid_Regitem_Ppsx_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.openxmlformats-officedocument.presentationml.slideshow";
+    Name = "Extension";
+    Value = ".ppsx";
+End
+
+RegistryItem gid_Regitem_Potx_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.openxmlformats-officedocument.presentationml.template";
+    Name = "Extension";
+    Value = ".potx";
+End
+
+// registering other supported types
+
+CONDITIONAL_REGISTER_DOC_EXTENSION( Uop, gid_Module_Prg_Impress_Other_Reg, uop, UOP, UNIFORM_OFFICE_FORMAT_PRESENTATION, 7, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Cgm, gid_Module_Prg_Impress_Other_Reg, cgm, CGM, COMPUTER_GRAPHICS_METAFILE, 7, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Keynote, gid_Module_Prg_Impress_Other_Reg, key, KEY, KEYNOTE_PRESENTATION, 3, simpress.exe, open, Impress )
+
+// registering ms-powerpoint URI scheme handler
+CONDITIONAL_REGISTER_URI_HANDLER( ms-powerpoint, ms_powerpoint, gid_Module_Prg_Impress_MSO_Reg, SELECT_POWERPOINT )
+REGISTRY_ENTRY_CAPABILITIES_URL(ms-powerpoint, ms_powerpoint, gid_Module_Prg_Impress_MSO_Reg, vnd.libreoffice.command)
diff --git a/scp2/source/impress/registryitem_impress.ulf b/scp2/source/impress/registryitem_impress.ulf
new file mode 100644
index 0000000000..5f9adf1eab
--- /dev/null
+++ b/scp2/source/impress/registryitem_impress.ulf
@@ -0,0 +1,59 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_REG_VAL_NEW]
+en-US = "&New"
+
+[STR_REG_VAL_SO60_SHOW]
+en-US = "Show"
+
+[STR_REG_VAL_SO60_PRESENT]
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Presentation"
+
+[STR_REG_VAL_SO60_IMPRESS_TEMPLATE]
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Presentation Template"
+
+[STR_REG_VAL_OO_PRESENT]
+en-US = "OpenDocument Presentation"
+
+[STR_REG_VAL_OO_PRESENT_TEMPLATE]
+en-US = "OpenDocument Presentation Template"
+
+[STR_REG_VAL_MS_POWERPOINT_PRESENTATION_OLD]
+en-US = "Microsoft PowerPoint 97-2003 Presentation"
+
+[STR_REG_VAL_MS_POWERPOINT_SHOW]
+en-US = "Microsoft PowerPoint Show"
+
+[STR_REG_VAL_MS_POWERPOINT_PRESENTATION]
+en-US = "Microsoft PowerPoint Presentation"
+
+[STR_REG_VAL_MS_POWERPOINT_TEMPLATE_OLD]
+en-US = "Microsoft PowerPoint 97-2003 Template"
+
+[STR_REG_VAL_MS_POWERPOINT_TEMPLATE]
+en-US = "Microsoft PowerPoint Template"
+
+[STR_REG_VAL_UNIFORM_OFFICE_FORMAT_PRESENTATION]
+en-US = "Uniform Office Format Presentation"
+
+[STR_REG_VAL_COMPUTER_GRAPHICS_METAFILE]
+en-US = "Computer Graphics Metafile"
+
+[STR_REG_VAL_KEYNOTE_PRESENTATION]
+en-US = "Apple Keynote"
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
new file mode 100644
index 0000000000..6fa6155b6b
--- /dev/null
+++ b/scp2/source/kde/module_kde.scp
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/kde"
+
+Module gid_Module_Optional_Kde
+    ParentID = gid_Module_Optional;
+    Default = YES;
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
+    Styles = ();
+    Files = (auto_kde_ALL);
+End
diff --git a/scp2/source/kde/module_kde.ulf b/scp2/source/kde/module_kde.ulf
new file mode 100644
index 0000000000..a23174d064
--- /dev/null
+++ b/scp2/source/kde/module_kde.ulf
@@ -0,0 +1,24 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_OPTIONAL_KDE]
+en-US = "KDE Integration"
+
+[STR_DESC_MODULE_OPTIONAL_KDE]
+en-US = "System integration of %PRODUCTNAME %PRODUCTVERSION into KDE."
+
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
new file mode 100644
index 0000000000..7908739582
--- /dev/null
+++ b/scp2/source/math/file_math.scp
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+File gid_File_Share_Registry_Math_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "math.xcd";
+End
+
+#if defined WITH_HELPPACKS
+File gid_File_Help_Smath_Zip
+    Dir = FILELIST_DIR;
+    FILELIST_TXT_FILE_BODY_HELPPACK;
+    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(smath);
+End
+#endif
+
diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp
new file mode 100644
index 0000000000..44ddc078e4
--- /dev/null
+++ b/scp2/source/math/folderitem_math.scp
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#ifndef ENABLE_SILENT_MSI
+FolderItem gid_Folderitem_Smath
+    Name = "%PRODUCTNAME Math";
+    ModuleID = gid_Module_Prg_Math_Bin;
+    FolderID = gid_Folder_Staroffice51;
+    FileID = auto_math_brand_exe_smath;
+    IconFile = auto_math_brand_exe_smath;
+    IconID = 0;
+    WkDir = gid_Brand_Dir_Program;
+    Parameter = "";
+    Styles = (NON_ADVERTISED);
+    ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
+End
+
+FolderItemProperty gid_Fip_Smath_AppID
+    ShortcutID = gid_Folderitem_Smath;
+    Key = "System.AppUserModel.ID";
+    Value = "TheDocumentFoundation.LibreOffice.Math";
+End
+#endif
diff --git a/scp2/source/math/folderitem_math.ulf b/scp2/source/math/folderitem_math.ulf
new file mode 100644
index 0000000000..dd486a8b2e
--- /dev/null
+++ b/scp2/source/math/folderitem_math.ulf
@@ -0,0 +1,22 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_FI_TOOLTIP_MATH]
+en-US = "Create and edit scientific formulas and equations by using Math."
+
+
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
new file mode 100644
index 0000000000..c3054845d9
--- /dev/null
+++ b/scp2/source/math/module_math.scp
@@ -0,0 +1,64 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/math"
+#include "AutoInstall/math_brand"
+
+Module gid_Module_Prg_Math
+    MOD_NAME_DESC ( MODULE_PRG_MATH );
+    ParentID = gid_Module_Prg;
+    Sortkey = "600";
+    Styles =(APPLICATIONMODULE);
+End
+
+Module gid_Module_Prg_Math_Bin
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC ( MODULE_PRG_MATH_BIN );
+    ParentID = gid_Module_Prg_Math;
+    Sortkey = "100";
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+    Files = (auto_math_ALL,
+	gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math,
+    gid_File_Share_Registry_Math_Xcd,
+    gid_File_Tmp_Userinstall_Math_Inf);
+End
+
+Module gid_Module_Brand_Prg_Math
+    PackageInfo = "packinfo_brand.txt";
+    Name = "gid_Module_Brand_Prg_Math";
+    Description = "gid_Module_Brand_Prg_Math";
+    ParentID = gid_Module_Prg_Math;
+    Sortkey = "100";
+    InstallOrder = "1040";
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+    Files = (auto_math_brand_ALL);
+End
+
+Module gid_Module_Langpack_Math_Template
+    ParentID = gid_Module_Prg_Math_Bin;
+    Name = "gid_Module_Langpack_Math_Template";
+    Description = "gid_Module_Langpack_Math_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = ();
+End
+
+#include "alllangmodules_math.inc"
diff --git a/scp2/source/math/module_math.ulf b/scp2/source/math/module_math.ulf
new file mode 100644
index 0000000000..1c555fab0a
--- /dev/null
+++ b/scp2/source/math/module_math.ulf
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_PRG_MATH]
+en-US = "%PRODUCTNAME Math"
+
+[STR_DESC_MODULE_PRG_MATH]
+en-US = "Create and edit scientific formulas and equations by using %PRODUCTNAME Math."
+
+[STR_NAME_MODULE_PRG_MATH_BIN]
+en-US = "Program Module"
+
+[STR_DESC_MODULE_PRG_MATH_BIN]
+en-US = "The application %PRODUCTNAME Math"
+
+[STR_NAME_MODULE_PRG_MATH_HELP]
+en-US = "%PRODUCTNAME Math Help"
+
+[STR_DESC_MODULE_PRG_MATH_HELP]
+en-US = "Help about %PRODUCTNAME Math"
+
+
+
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
new file mode 100644
index 0000000000..bf59735883
--- /dev/null
+++ b/scp2/source/math/registryitem_math.scp
@@ -0,0 +1,722 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#include "macros.inc"
+
+// MSOLE embedded object in SO7 file format
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a_
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}";
+    REG_VALUE_LNG(SO60_FORMULA)
+End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Auxusertype_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\AuxUserType\2";
+    Value = "%PRODUCTNAME";
+End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Auxusertype_3
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\AuxUserType\3";
+    REG_VALUE_LNG(SO60_FORMULA)
+End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Dataformats_Getset_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\DataFormats\GetSet\0";
+    Value = "Embed Source,1,8,1";
+End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Dataformats_Getset_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\DataFormats\GetSet\1";
+    Value = "3,1,32,1";
+End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Dataformats_Getset_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\DataFormats\GetSet\2";
+    Value = "2,1,16,1";
+End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,0";
+End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Inprochandler32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\InprocHandler32";
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\Insertable";
+End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Localserver32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\LocalServer32";
+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
+    End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Miscstatus
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\MiscStatus";
+    Value = "16";
+End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Progid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\ProgID";
+    Value = "soffice.StarMathDocument.6";
+End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Programmable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\Programmable";
+End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\verb\0";
+    Value = "&Edit,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\verb\-1";
+    Value = "Show,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\verb\-2";
+    Value = "Open,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Versionindependentprogid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\VersionIndependentProgID";
+    Value = "soffice.StarMathDocument.6";
+End
+
+// MSOLE embedded object in SO7 file format
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c_
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}";
+    REG_VALUE_LNG(OO_FORMULA)
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Auxusertype_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\AuxUserType\2";
+    Value = "%PRODUCTNAME";
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Auxusertype_3
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\AuxUserType\3";
+    REG_VALUE_LNG(OO_FORMULA)
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Dataformats_Getset_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\DataFormats\GetSet\0";
+    Value = "Embed Source,1,8,1";
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Dataformats_Getset_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\DataFormats\GetSet\1";
+    Value = "3,1,32,1";
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Dataformats_Getset_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\DataFormats\GetSet\2";
+    Value = "2,1,16,1";
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,0";
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Inprochandler32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\InprocHandler32";
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\Insertable";
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Localserver32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\LocalServer32";
+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Miscstatus
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\MiscStatus";
+    Value = "16";
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Progid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\ProgID";
+    Value = "LibreOffice.MathDocument.1";
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Programmable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\Programmable";
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\verb\0";
+    Value = "&Edit,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\verb\-1";
+    Value = "Show,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\verb\-2";
+    Value = "Open,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Versionindependentprogid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\VersionIndependentProgID";
+    Value = "LibreOffice.MathDocument.1";
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6";
+    REG_VALUE_LNG(SO60_FORMULA)
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Clsid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6\CLSID";
+    Value = "{D0484DE6-AAEE-468a-991F-8D4B0737B57A}";
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,12";
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Math";
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(SO60_FORMULA)
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6\Insertable";
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Protocol_Stdfileediting_Server
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6\protocol\StdFileEditing\server";
+    Value = "<progpath>\program\soffice.exe";
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Protocol_Stdfileediting_Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6\protocol\StdFileEditing\verb\0";
+    Value = "&Edit";
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Protocol_Stdfileediting_Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6\protocol\StdFileEditing\verb\-1";
+    Value = "&Show";
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Protocol_Stdfileediting_Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6\protocol\StdFileEditing\verb\-2";
+    Value = "&Open";
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6\shell";
+    Value = "open";
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6\shell\new";
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6\shell\new\command";
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6\shell\open\command";
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6\shell\print\command";
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6\shell\printto\command";
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starmathdocument_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarMathDocument\CurVer";
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Value = "soffice.StarMathDocument.6";
+End
+
+RegistryItem gid_Regitem_Sxm_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = ".sxm\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Sxm_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = ".sxm\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Sxm_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = ".sxm\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_StarMathDocument_6_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "soffice.StarMathDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Sxm_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = ".sxm";
+    Name = "Content Type";
+    Value = "application/vnd.sun.xml.math";
+End
+
+RegistryItem gid_Regitem_Sxm_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.sun.xml.math";
+    Name = "Extension";
+    Value = ".sxm";
+End
+
+RegistryItem gid_Regitem__Mml
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = ".sxm";
+    Value = "soffice.StarMathDocument.6";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxm
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Name = ".sxm";
+    Value = "soffice.StarMathDocument.6";
+    Styles = ();
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_sxm_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "soffice.StarMathDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_sxm_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".sxm";
+    Value = "document";
+End
+
+// new odf file extension
+
+RegistryItem gid_Regitem_Odf_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = ".odf\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Odf_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = ".odf\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Odf_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = ".odf\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_MathDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Odf_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = ".odf";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.formula";
+End
+
+RegistryItem gid_Regitem_Odf_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.formula";
+    Name = "Extension";
+    Value = ".odf";
+End
+
+RegistryItem gid_Regitem__Odf
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = ".odf";
+    Value = "LibreOffice.MathDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odf
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Name = ".odf";
+    Value = "LibreOffice.MathDocument.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odf
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Name = "application/vnd.oasis.opendocument.formula";
+    Value = "LibreOffice.MathDocument.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.MathDocument\CurVer";
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Value = "LibreOffice.MathDocument.1";
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1";
+    REG_VALUE_LNG(OO_FORMULA)
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Clsid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1\CLSID";
+    Value = "{D2D59CD1-0A6A-4D36-AE20-47817077D57C}";
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,12";
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Math";
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(OO_FORMULA)
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_odf_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "LibreOffice.MathDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_odf_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".odf";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1\Insertable";
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Protocol_Stdfileediting_Server
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1\protocol\StdFileEditing\server";
+    Value = "<progpath>\program\soffice.exe";
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Protocol_Stdfileediting_Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1\protocol\StdFileEditing\verb\0";
+    Value = "&Edit";
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Protocol_Stdfileediting_Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1\protocol\StdFileEditing\verb\-1";
+    Value = "&Show";
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Protocol_Stdfileediting_Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1\protocol\StdFileEditing\verb\-2";
+    Value = "&Open";
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1\shell";
+    Value = "open";
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1\shell\new";
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1\shell\new\command";
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1\shell\open\command";
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1\shell\print\command";
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Subkey = "LibreOffice.MathDocument.1\shell\printto\command";
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+// "OpenWith" Windows Registry keys for extensions supported by Math
+
+// .ODF
+RegistryItem gid_Regitem_OpenOffice_ODF_OpenWith_Math
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".odf\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Name = "LibreOffice.MathDocument.1";
+    Value = " ";
+End
+
+// .SXM
+RegistryItem gid_Regitem_OpenOffice_SXM_OpenWith_Math
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".sxm\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Name = "soffice.StarMathDocument.6";
+    Value = " ";
+End
+
+// .MML
+RegistryItem gid_Regitem_OpenOffice_MML_OpenWith_Math
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".mml\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Name = "soffice.StarMathDocument.6";
+    Value = " ";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Mml
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Name = ".mml";
+    Value = "soffice.StarMathDocument.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Smath_Exe
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\smath.exe";
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Value = "<progpath>\program\smath.exe";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Smath_Exepath
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\smath.exe";
+    ModuleID = gid_Module_Prg_Math_Bin;
+    Name = "Path";
+    Value = "<progpath>";
+End
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odf )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxm )
diff --git a/scp2/source/math/registryitem_math.ulf b/scp2/source/math/registryitem_math.ulf
new file mode 100644
index 0000000000..0b987cb4b8
--- /dev/null
+++ b/scp2/source/math/registryitem_math.ulf
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_REG_VAL_NEW]
+en-US = "&New"
+
+[STR_REG_VAL_SO60_FORMULA]
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Formula"
+
+[STR_REG_VAL_OO_FORMULA]
+en-US = "OpenDocument Formula"
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
new file mode 100644
index 0000000000..98a5da5163
--- /dev/null
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -0,0 +1,27 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+File gid_File_Share_Registry_Onlineupdate_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "onlineupdate.xcd";
+    ComponentCondition="ISCHECKFORPRODUCTUPDATES=1";
+End
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp
new file mode 100644
index 0000000000..4225bb74f7
--- /dev/null
+++ b/scp2/source/onlineupdate/module_onlineupdate.scp
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/onlineupdate"
+
+Module gid_Module_Optional_Onlineupdate
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC(MODULE_OPT_ONLINEUPDATE);
+    Sortkey = "800";
+    ParentID = gid_Module_Optional;
+    Default = YES;
+    Styles = ();
+    Files = (auto_onlineupdate_ALL,
+             gid_File_Share_Registry_Onlineupdate_Xcd);
+End
diff --git a/scp2/source/onlineupdate/module_onlineupdate.ulf b/scp2/source/onlineupdate/module_onlineupdate.ulf
new file mode 100644
index 0000000000..c2f59c391d
--- /dev/null
+++ b/scp2/source/onlineupdate/module_onlineupdate.ulf
@@ -0,0 +1,24 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_OPT_ONLINEUPDATE]
+en-US = "Online Update"
+
+[STR_DESC_MODULE_OPT_ONLINEUPDATE]
+en-US = "Get automatically notified when a new update of %PRODUCTNAME becomes available." 
+
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
new file mode 100644
index 0000000000..5b8b907f2a
--- /dev/null
+++ b/scp2/source/ooo/common_brand.scp
@@ -0,0 +1,932 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "macros.inc"
+
+#include "AutoInstall/brand"
+
+#include "config_dconf.h"
+#include "config_folders.h"
+
+Module gid_Module_Root_Brand
+    ParentID = gid_Module_Root;
+    InstallOrder = "150";
+    Name = "ooobrand";
+    Description = "OOo Brand";
+    Sortkey = "1030";
+    Default = YES;
+    Styles = (HIDDEN_ROOT,ROOT_BRAND_PACKAGE,ISUPDATEPACKAGE);
+    PackageInfo = "packinfo_brand.txt";
+    Dirs = (gid_Brand_Dir_Program,
+            gid_Brand_Dir_Share,
+            gid_Brand_Dir_Share_Config,
+            gid_Brand_Dir_Share_Extensions,
+            gid_Brand_Dir_Share_Uno_Packages,
+            gid_Brand_Dir_Share_Uno_Packages_Cache,
+            gid_Brand_Dir_Share_Ure,
+            gid_Brand_Dir_Share_Ure_Share,
+            gid_Brand_Dir_Share_Registry,
+            gid_Brand_Dir_Share_Xdg);
+    Files = (auto_brand_ALL,
+	     gid_Brand_File_Desktophelper_Txt,
+             gid_Brand_File_Share_Xdg_Base,
+             gid_Brand_File_Share_Xdg_Calc,
+             gid_Brand_File_Share_Xdg_Draw,
+             gid_Brand_File_Share_Xdg_Impress,
+             gid_Brand_File_Share_Xdg_Math,
+             gid_Brand_File_Share_Xdg_QStart,
+             gid_Brand_File_Share_Xdg_StartCenter,
+             gid_Brand_File_Share_Xdg_Writer,
+             gid_Brand_File_Share_Xdg_XsltFilter);
+End
+
+// Language specific brand module
+
+Module gid_Module_Langpack_Brand_Template
+    ParentID = gid_Module_Langpack_Languageroot;
+    Name = "gid_Module_Langpack_Brand_Template";
+    Description = "gid_Module_Langpack_Brand_Template";
+    Styles = (TEMPLATEMODULE);
+    InstallOrder = "1050";
+    Dirs = (gid_Brand_Dir_Program_Shell,
+            gid_Brand_Dir_Readme);
+    Files = (gid_Brand_File_Readme_Readme,
+             gid_Brand_File_Share_Registry_Cjk_Xcd);
+End
+
+// Directories
+
+Directory gid_Brand_Dir_Program
+#if defined MACOSX
+    ParentID = gid_Dir_Bundle_Contents;
+    DosName = "MacOS";
+#else
+    ParentID = gid_Dir_Brand_Root;
+    DosName = "program";
+#endif
+End
+
+Directory gid_Brand_Dir_Readme
+#if defined MACOSX
+    ParentID = gid_Dir_Bundle_Contents_Resources;
+#else
+    ParentID = gid_Dir_Brand_Root;
+#endif
+    DosName = "readmes";
+End
+
+Directory gid_Brand_Dir_Share
+#if defined MACOSX
+    ParentID = gid_Dir_Bundle_Contents;
+#else
+    ParentID = gid_Dir_Brand_Root;
+#endif
+    DosName = LIBO_SHARE_FOLDER;
+End
+
+Directory gid_Brand_Dir_Share_Config
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "config";
+End
+
+Directory gid_Brand_Dir_Share_Uno_Packages
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "uno_packages";
+    Styles = (CREATE);
+End
+
+Directory gid_Brand_Dir_Share_Uno_Packages_Cache
+    ParentID = gid_Brand_Dir_Share_Uno_Packages;
+    DosName = "cache";
+    Styles = (CREATE);
+End
+
+Directory gid_Brand_Dir_Share_Uno_Packages_Cache_Uno_Packages
+    ParentID = gid_Brand_Dir_Share_Uno_Packages_Cache;
+    DosName = "uno_packages";
+    Styles = (CREATE);
+End
+
+#if defined MACOSX
+
+Directory gid_Brand_Dir_Share_Ure
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "ure";
+End
+
+Directory gid_Brand_Dir_Share_Ure_Share
+    ParentID = gid_Brand_Dir_Share_Ure;
+    DosName = "share";
+End
+
+#endif
+
+Directory gid_Brand_Dir_Share_Registry
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "registry";
+End
+
+#if defined UNX && ! defined MACOSX
+Directory gid_Brand_Dir_Share_Xdg
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "xdg";
+End
+#endif
+
+// Files
+
+#ifdef WNT
+File gid_Brand_File_Desktophelper_Txt
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Program;
+    Name = "desktophelper.txt";
+    ComponentCondition = "CREATEDESKTOPLINK=1";
+End
+#endif
+
+File gid_Brand_File_Readme_Readme
+  TXT_FILE_BODY;
+  Dir = gid_Brand_Dir_Readme;
+  #ifdef UNX
+    README_ALL_LANG(Name, README);
+  #endif
+  #ifdef WNT
+    README_TXT_ALL_LANG(Name, readme, txt);
+  #endif
+    Styles = (PACKED, SCPZIP_REPLACE);
+End
+
+File gid_Brand_File_Share_Registry_Cjk_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED,MAKE_LANG_SPECIFIC);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name (ja) = "cjk.xcd";
+    Name (ko) = "cjk.xcd";
+    Name (zh-CN) = "cjk.xcd";
+    Name (zh-TW) = "cjk.xcd";
+End
+
+#if defined UNX && ! defined MACOSX
+File gid_Brand_File_Share_Xdg_Base
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Styles = (PACKED,SCPZIP_REPLACE);
+    Name = "base.desktop";
+End
+#endif
+
+#if defined UNX && ! defined MACOSX
+File gid_Brand_File_Share_Xdg_Calc
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "calc.desktop";
+    Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
+
+#if defined UNX && ! defined MACOSX
+File gid_Brand_File_Share_Xdg_Draw
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "draw.desktop";
+    Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
+
+#if defined UNX && ! defined MACOSX
+File gid_Brand_File_Share_Xdg_Impress
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "impress.desktop";
+    Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
+
+#if defined UNX && ! defined MACOSX
+File gid_Brand_File_Share_Xdg_Math
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "math.desktop";
+    Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
+
+#if defined UNX && ! defined MACOSX
+File gid_Brand_File_Share_Xdg_Writer
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "writer.desktop";
+    Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
+
+#if defined UNX && ! defined MACOSX
+File gid_Brand_File_Share_Xdg_StartCenter
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "startcenter.desktop";
+    Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
+
+#if defined UNX && ! defined MACOSX
+File gid_Brand_File_Share_Xdg_XsltFilter
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Name = "xsltfilter.desktop";
+    Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
+
+// Profiles
+
+Profile gid_Brand_Profile_Bootstrap_Ini
+    ModuleID = gid_Module_Root_Brand;
+    Name = PROFILENAME(bootstrap);
+    Dir = GID_BRAND_DIR_ETC;
+    Styles = (NETWORK);
+End
+
+Profile gid_Brand_Profile_Soffice_Ini
+    ModuleID = gid_Module_Root_Brand;
+    Name = PROFILENAME(soffice);
+    Dir = GID_BRAND_DIR_ETC;
+    Styles = (NETWORK);
+End
+
+Profile gid_Brand_Profile_Setup_Ini
+    ModuleID = gid_Module_Root_Brand;
+    Name = PROFILENAME(setup);
+    Dir = GID_BRAND_DIR_ETC;
+    Styles = (NETWORK);
+End
+
+Profile gid_Brand_Profile_Version_Ini
+    ModuleID = gid_Module_Root_Brand;
+    Name = PROFILENAME(version);
+    Dir = GID_BRAND_DIR_ETC;
+    Styles = (NETWORK);
+End
+
+Profile gid_Brand_Profile_Fundamental_Ini
+    ModuleID = gid_Module_Root_Brand;
+    Name = PROFILENAME(fundamental);
+    Dir = GID_BRAND_DIR_ETC;
+End
+
+#if !defined MACOSX
+Profile gid_Brand_Profile_Redirect_Ini
+    ModuleID = gid_Module_Root_Brand;
+    Name = PROFILENAME(redirect);
+    Dir = gid_Brand_Dir_Program;
+End
+#endif
+
+// ProfileItems
+
+ProfileItem gid_Brand_Profileitem_Bootstrap_Productkey
+    ProfileID = gid_Brand_Profile_Bootstrap_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "ProductKey";
+    Value = "<productkey>";
+End
+
+ProfileItem gid_Brand_Profileitem_Bootstrap_Installmode
+    ProfileID = gid_Brand_Profile_Bootstrap_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 5;
+    Key = "InstallMode";
+    Value = "<installmode>";
+End
+
+ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall
+    ProfileID = gid_Brand_Profile_Bootstrap_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 3;
+    Key = "UserInstallation";
+  #ifdef WNT
+    Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
+  #elif defined MACOSX
+    Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
+  #else
+    Value = "$SYSUSERCONFIG/%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
+  #endif
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_UreBootstrap
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    Section = "Bootstrap";
+    Key = "URE_BOOTSTRAP";
+    Value = "${ORIGIN}/" PROFILENAME(fundamental);
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_Logo
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "Logo";
+    Value = "1";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_ProgressBarColor_So
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 2;
+    Key = "ProgressBarColor";
+    Value = "${PROGRESSBARCOLOR}";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_ProgressSize_So
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 3;
+    Key = "ProgressSize";
+    Value = "${PROGRESSSIZE}";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_ProgressPosition_So
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 4;
+    Key = "ProgressPosition";
+    Value = "${PROGRESSPOSITION}";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_ProgressFrameColor_So
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 5;
+    Key = "ProgressFrameColor";
+    Value = "${PROGRESSFRAMECOLOR}";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_NativeProgress_So
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 6;
+    Key = "NativeProgress";
+    Value = "${NATIVEPROGRESS}";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_ProgressTextColor_So
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 7;
+    Key = "ProgressTextColor";
+    Value = "${PROGRESSTEXTCOLOR}";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_ProgressTextBaseline_So
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 8;
+    Key = "ProgressTextBaseline";
+    Value = "${PROGRESSTEXTBASELINE}";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_Hideeula
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 7;
+    Key = "HideEula";
+    Value = "1";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_CrashDirectory
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Key = "CrashDirectory";
+    Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/crash";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_CrashDump
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Key = "CrashDumpEnable";
+    Value = "${CRASHDUMPENABLE}";
+End
+
+
+ProfileItem gid_Brand_Profileitem_Soffice_SecureUserConfig
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Key = "SecureUserConfig";
+    Value = "true";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_SecureUserConfigCompress
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Key = "SecureUserConfigCompress";
+    Value = "true";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_SecureUserConfigNumCopies
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Key = "SecureUserConfigNumCopies";
+    Value = "2";
+End
+
+
+ProfileItem gid_Brand_Profileitem_Soffice_SecureUserConfigMode
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Key = "SecureUserConfigMode";
+    Value = "1";
+End
+
+ProfileItem gid_Brand_Profileitem_Soffice_SecureUserConfigExtensions
+    ProfileID = gid_Brand_Profile_Soffice_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Key = "SecureUserConfigExtensions";
+    Value = "true";
+End
+
+ProfileItem gid_Brand_Profileitem_Version_Buildid
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 4;
+    Key = "buildid";
+    Value = "<buildid>";
+End
+
+#ifdef WNT
+
+ProfileItem gid_Brand_Profileitem_Version_Productcode
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 8;
+    Key = "ProductCode";
+    Value = "<productcode>";
+End
+
+#endif
+
+#ifdef WNT
+
+ProfileItem gid_Brand_Profileitem_Version_Upgradecode
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 9;
+    Key = "UpgradeCode";
+    Value = "<upgradecode>";
+End
+
+#endif
+
+ProfileItem gid_Brand_Profileitem_Version_Alllanguages
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 13;
+    Key = "AllLanguages";
+    Value = "<alllanguages>";
+End
+
+#ifdef WNT
+
+ProfileItem gid_Brand_Profileitem_Version_Msiproductversion
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 14;
+    Key = "MsiProductVersion";
+    Value = "<msiproductversion>";
+End
+
+#endif
+
+ProfileItem gid_Brand_Profileitem_Version_Updateurl
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 15;
+    Key = "UpdateURL";
+  #if defined(ENABLE_ONLINE_UPDATE)
+  #ifdef WNT
+    Value = "${UPDATEURL}";
+  #else  // defined WNT
+    Value = "${UPDATEURL}?pkgfmt=<pkgformat>";
+  #endif //defined WNT
+  #else
+    Value = "";
+  #endif
+End
+
+ProfileItem gid_Brand_Profileitem_Version_UpdateChannel
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 19;
+    Key = "UpdateChannel";
+    Value = "<updatechannel>";
+End
+
+ProfileItem gid_Brand_Profileitem_Version_Updateid
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 16;
+    Key = "UpdateID";
+    Value = "<updateid>";
+End
+
+ProfileItem gid_Brand_Profileitem_Version_Useragent
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 17;
+    Key = "UpdateUserAgent";
+    Value = "<PRODUCT> (${buildid}; ${_OS}; ${_ARCH}; <OPTIONAL_OS_HW_DATA>)";
+End
+
+ProfileItem gid_Brand_Profileitem_Version_Vendor
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 16;
+    Key = "Vendor";
+    Value = "<vendor>";
+End
+
+ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 18;
+    Key = "ExtensionUpdateURL";
+    #if defined(ENABLE_EXTENSION_UPDATE)
+      Value = "https://updateexte.libreoffice.org/ExtensionUpdateService/check.Update";
+    #else
+      Value = "";
+    #endif
+End
+
+ProfileItem gid_Brand_Profileitem_Version_ReferenceOOoMajorMinor
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Key = "ReferenceOOoMajorMinor";
+    Value = "${REFERENCEOOOMAJORMINOR}";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BRAND_BASE_DIR";
+    Value = "${ORIGIN}/..";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Share_Subdir
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BRAND_SHARE_SUBDIR";
+    Value = LIBO_SHARE_FOLDER;
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Resource_Subdir
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BRAND_SHARE_RESOURCE_SUBDIR";
+    Value = LIBO_SHARE_RESOURCE_FOLDER;
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Bin_Subdir
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BRAND_INI_DIR";
+    Value = "${ORIGIN}";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Lib_Dir
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "LO_LIB_DIR";
+    Value = "${BRAND_BASE_DIR}/" LIBO_LIB_FOLDER;
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Java_Dir
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "LO_JAVA_DIR";
+    Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER;
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BUNDLED_EXTENSIONS";
+    Value = "${$ORIGIN/" PROFILENAME(louno) ":BUNDLED_EXTENSIONS}";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_User
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BUNDLED_EXTENSIONS_USER";
+    Value = "${$ORIGIN/" PROFILENAME(louno) ":BUNDLED_EXTENSIONS_USER}";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Packages_Cache
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "UNO_SHARED_PACKAGES_CACHE";
+    Value = "${$ORIGIN/" PROFILENAME(louno) ":UNO_SHARED_PACKAGES_CACHE}";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Extensions_User
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "SHARED_EXTENSIONS_USER";
+    Value = "${$ORIGIN/" PROFILENAME(louno) ":SHARED_EXTENSIONS_USER}";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_User_Packages_Cache
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "UNO_USER_PACKAGES_CACHE";
+    Value = "${$ORIGIN/" PROFILENAME(louno) ":UNO_USER_PACKAGES_CACHE}";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Tmp_Extensions
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "TMP_EXTENSIONS";
+    Value = "${$ORIGIN/" PROFILENAME(louno) ":TMP_EXTENSIONS}";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bak_Extensions
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "BAK_EXTENSIONS";
+    Value = "${$ORIGIN/" PROFILENAME(louno) ":TMP_EXTENSIONS}";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "URE_MORE_TYPES";
+    Value = "<$ORIGIN/types>* ${${$ORIGIN/" PROFILENAME(louno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_BundledUnoFile}:UNO_TYPES}";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "URE_MORE_SERVICES";
+    Value = "${${$ORIGIN/" PROFILENAME(louno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_BundledUnoFile}:UNO_SERVICES} <$ORIGIN/services>*";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "URE_MORE_JAVA_TYPES";
+    Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/libreoffice.jar ${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(louno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(louno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "URE_OVERRIDE_JAVA_JFW_SHARED_DATA";
+    Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/config/javasettings_${_OS}_${_ARCH}.xml";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_User_Data
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "URE_OVERRIDE_JAVA_JFW_USER_DATA";
+    Value = "${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml";
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "URE_MORE_JAVA_CLASSPATH_URLS";
+    Value = "";
+#ifdef SYSTEM_HSQLDB
+    ValueList1 = HSQLDB_JAR;
+#endif
+End
+
+ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Fundamental_Ini;
+    Section = "Bootstrap";
+    Key = "URE_BIN_DIR";
+    Value = "${BRAND_BASE_DIR}/" LIBO_URE_BIN_FOLDER;
+End
+
+#if ENABLE_DCONF
+#define CONFIGURATION_LAYERS_DCONF " dconf:*"
+#else
+#define CONFIGURATION_LAYERS_DCONF
+#endif
+#if defined WNT
+#define CONFIGURATION_LAYERS_WINREG " winreg:LOCAL_MACHINE"
+#define CONFIGURATION_LAYERS_WINUSERREG " winreg:CURRENT_USER"
+#else
+#define CONFIGURATION_LAYERS_WINREG
+#define CONFIGURATION_LAYERS_WINUSERREG
+#endif
+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}/" 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
+#undef CONFIGURATION_LAYERS_WINUSERREG
+
+#if !defined MACOSX
+ProfileItem gid_Brand_Profileitem_Redirect_Ure_Bootstrap
+    ModuleID = gid_Module_Root_Brand;
+    ProfileID = gid_Brand_Profile_Redirect_Ini;
+    Section = "Bootstrap";
+    Key = "URE_BOOTSTRAP";
+    Value = "${ORIGIN}/" PROFILENAME(fundamental);
+End
+#endif
+
+#ifdef WNT
+ProfileItem gid_Brand_Profileitem_Setup_Alluserset
+    ProfileID = gid_Brand_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 4;
+    Key = "ALLUSERS";
+    Value = "[ALLUSERS]";
+    Inifiletablekey = "AllUsersSet";
+    Inifiletableaction = "1";
+    Styles = (INIFILETABLE);
+End
+#endif
+
+#ifdef WNT
+ProfileItem gid_Brand_Profileitem_Setup_Findproduct
+    ProfileID = gid_Brand_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 5;
+    Key = "FINDPRODUCT";
+    Value = "[FINDPRODUCT]";
+    Inifiletablekey = "FindProductSet";
+    Inifiletableaction = "1";
+    Styles = (INIFILETABLE);
+End
+#endif
+
+#ifdef WNT
+ProfileItem gid_Brand_Profileitem_Setup_Productcode
+    ProfileID = gid_Brand_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 6;
+    Key = "ProductCode";
+    Value = "<productcode>";
+End
+#endif
+
+#ifdef WNT
+ProfileItem gid_Brand_Profileitem_Setup_Upgradecode
+    ProfileID = gid_Brand_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 7;
+    Key = "UpgradeCode";
+    Value = "<upgradecode>";
+End
+#endif
+
+ProfileItem gid_Brand_Profileitem_Setup_Buildid
+    ProfileID = gid_Brand_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 9;
+    Key = "buildid";
+    Value = "<buildid>";
+End
+
+#ifdef WNT
+ProfileItem gid_Brand_Profileitem_Setup_Ureinstall
+    ProfileID = gid_Brand_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 4;
+    Key = "UREINSTALLLOCATION";
+    Value = "[INSTALLLOCATION]URE\\";
+    Inifiletablekey = "UreInstallLocation";
+    Inifiletableaction = "1";
+    Styles = (INIFILETABLE);
+End
+#endif
+
+#ifdef WNT
+ProfileItem gid_Brand_Profileitem_Setup_Basisinstall
+    ProfileID = gid_Brand_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 4;
+    Key = "BASISINSTALLLOCATION";
+    Value = "[INSTALLLOCATION]";
+    Inifiletablekey = "BasisInstallLocation";
+    Inifiletableaction = "1";
+    Styles = (INIFILETABLE);
+End
+#endif
+
+#ifdef WNT
+ProfileItem gid_Brand_Profileitem_Setup_Officeinstall
+    ProfileID = gid_Brand_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 4;
+    Key = "OFFICEINSTALLLOCATION";
+    Value = "[INSTALLLOCATION]";
+    Inifiletablekey = "OfficeInstallLocation";
+    Inifiletableaction = "1";
+    Styles = (INIFILETABLE);
+End
+#endif
+
+#ifdef WNT
+ProfileItem gid_Brand_Profileitem_Setup_Install
+    ProfileID = gid_Brand_Profile_Setup_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Bootstrap";
+    Order = 4;
+    Key = "INSTALLLOCATION";
+    Value = "[INSTALLLOCATION]";
+    Inifiletablekey = "InstallLocation";
+    Inifiletableaction = "1";
+    Styles = (INIFILETABLE);
+End
+#endif
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
new file mode 100644
index 0000000000..53dbbe5eec
--- /dev/null
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -0,0 +1,618 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#ifndef MACOSX
+Directory gid_Dir_Brand_Root
+    ParentID = PREDEFINED_PROGDIR;
+  #ifdef WNT
+    HostName = "${WINDOWSBASISROOTNAME}";
+  #else
+    HostName = ".";
+  #endif
+    Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE);
+End
+#endif
+
+#ifdef MACOSX
+Directory gid_Dir_Bundle_Contents_Resources
+    ParentID = gid_Dir_Bundle_Contents;
+    HostName = "Resources";
+End
+#endif
+
+#ifdef MACOSX
+Directory gid_Dir_Bundle_Contents_Library
+    ParentID = gid_Dir_Bundle_Contents;
+    HostName = "Library";
+End
+#endif
+
+#ifdef MACOSX
+Directory gid_Dir_Bundle_Contents_Library_Spotlight
+    ParentID = gid_Dir_Bundle_Contents_Library;
+    HostName = "Spotlight";
+End
+#endif
+
+#ifdef MACOSX
+Directory gid_Dir_Bundle_Contents_Library_Spotlight_Bundle
+    ParentID = gid_Dir_Bundle_Contents_Library_Spotlight;
+    HostName = "OOoSpotlightImporter.mdimporter";
+End
+#endif
+
+#ifdef MACOSX
+Directory gid_Dir_Bundle_Contents_Library_Spotlight_Bundle_Contents
+    ParentID = gid_Dir_Bundle_Contents_Library_Spotlight_Bundle;
+    HostName = "Contents";
+End
+#endif
+
+#if defined MACOSX
+Unixlink gid_Unixlink_Applications
+    BIN_FILE_BODY;
+    Styles = ();
+    Dir = PD_PROGDIR;
+    Name = "Applications";
+    Target = "/Applications";
+End
+#endif
+
+Directory gid_Dir_Wizards
+    Styles = (CREATE);
+#if defined MACOSX
+    ParentID = gid_Brand_Dir_Share;
+#else
+    ParentID = gid_Brand_Dir_Program;
+#endif
+    DosName = "wizards";
+End
+
+Directory gid_Dir_Wizards_Ui
+    Styles = (CREATE);
+    ParentID = gid_Dir_Wizards;
+    DosName = "ui";
+End
+
+Directory gid_Dir_Resource
+#if defined MACOSX
+    ParentID = gid_Brand_Dir_Share;
+#else
+    ParentID = gid_Brand_Dir_Program;
+#endif
+    DosName = "resource";
+End
+
+Directory gid_Dir_Classes
+#if defined MACOSX
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "java";
+#else
+    ParentID = gid_Brand_Dir_Program;
+    DosName = "classes";
+#endif
+End
+
+#ifdef WNT
+
+Directory gid_Dir_Shellnew
+    ParentID = gid_Dir_Template;
+    DosName = "shellnew";
+End
+
+#endif
+
+Directory gid_Dir_User
+#if defined MACOSX
+    ParentID = gid_Dir_Bundle_Contents_Resources;
+#else
+    ParentID = gid_Dir_Brand_Root;
+#endif
+    DosName = "presets";
+End
+
+Directory gid_Dir_User_Basic
+    ParentID = gid_Dir_User;
+    DosName = "basic";
+    Styles = (WORKSTATION, CREATE);
+End
+
+Directory gid_Dir_Basic_Standard
+    ParentID = gid_Dir_User_Basic;
+    DosName = "Standard";
+End
+
+Directory gid_Dir_User_Config
+    ParentID = gid_Dir_User;
+    DosName = "config";
+    Styles = (WORKSTATION, CREATE);
+End
+
+Directory gid_Dir_Fonts
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "fonts";
+End
+
+#ifdef WNT
+
+Directory gid_Dir_Winfonts
+    ParentID = gid_Dir_Fonts;
+    DosName = "truetype";
+End
+
+#endif
+
+Directory gid_Dir_Share_Autotext
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "autotext";
+End
+
+Directory gid_Dir_Autotext_Language
+    ParentID = gid_Dir_Share_Autotext;
+    DIR_ISOLANGUAGE_ALL_LANG_2;
+    Styles = (CREATE);
+End
+
+Directory gid_Dir_Share_Xslt
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "xslt";
+End
+
+Directory gid_Dir_Share_Xslt_Docbook
+    ParentID = gid_Dir_Share_Xslt;
+    DosName = "docbook";
+End
+
+Directory gid_Dir_Share_Dtd
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "dtd";
+End
+
+Directory gid_Dir_Share_Dtd_Ooo
+    ParentID = gid_Dir_Share_Dtd;
+    DosName = "officedocument";
+End
+
+Directory gid_Dir_Share_Dtd_Ooo_1_0
+    ParentID = gid_Dir_Share_Dtd_Ooo;
+    DosName = "1_0";
+End
+
+Directory gid_Dir_Share_Dtd_Math
+    ParentID = gid_Dir_Share_Dtd;
+    DosName = "math";
+End
+
+Directory gid_Dir_Share_Dtd_Math_1_01
+    ParentID = gid_Dir_Share_Dtd_Math;
+    DosName = "1_01";
+End
+
+Directory gid_Dir_Share_Config_Wizard
+    ParentID = gid_Brand_Dir_Share_Config;
+    DosName = "wizard";
+End
+
+Directory gid_Dir_Share_Config_Sofficecfg
+    ParentID = gid_Brand_Dir_Share_Config;
+    DosName = "soffice.cfg";
+End
+
+Directory gid_Dir_Share_Config_Sofficecfg_Simpress
+    ParentID = gid_Dir_Share_Config_Sofficecfg;
+    DosName = "simpress";
+End
+
+Directory gid_Dir_Share_Registry_Res
+    ParentID = gid_Brand_Dir_Share_Registry;
+    HostName = "res";
+End
+
+Directory gid_Dir_Autotext
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "autotext";
+End
+
+Directory gid_Dir_Basic
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "basic";
+End
+
+Directory gid_Dir_Basic_Access2Base
+    ParentID = gid_Dir_Basic;
+    DosName = "Access2Base";
+End
+
+Directory gid_Dir_Basic_Euro
+    ParentID = gid_Dir_Basic;
+    DosName = "Euro";
+End
+
+Directory gid_Dir_Basic_Gimmicks
+    ParentID = gid_Dir_Basic;
+    DosName = "Gimmicks";
+End
+
+Directory gid_Dir_Basic_Depot
+    ParentID = gid_Dir_Basic;
+    DosName = "Depot";
+End
+
+Directory gid_Dir_Basic_Template
+    ParentID = gid_Dir_Basic;
+    DosName = "Template";
+End
+
+Directory gid_Dir_Basic_Tools
+    ParentID = gid_Dir_Basic;
+    DosName = "Tools";
+End
+
+Directory gid_Dir_Basic_ScriptForge
+    ParentID = gid_Dir_Basic;
+    DosName = "ScriptForge";
+End
+
+Directory gid_Dir_Basic_SFDatabases
+    ParentID = gid_Dir_Basic;
+    DosName = "SFDatabases";
+End
+
+Directory gid_Dir_Basic_SFDialogs
+    ParentID = gid_Dir_Basic;
+    DosName = "SFDialogs";
+End
+
+Directory gid_Dir_Basic_SFDocuments
+    ParentID = gid_Dir_Basic;
+    DosName = "SFDocuments";
+End
+
+Directory gid_Dir_Basic_SFUnitTests
+    ParentID = gid_Dir_Basic;
+    DosName = "SFUnitTests";
+End
+
+Directory gid_Dir_Basic_SFWidgets
+    ParentID = gid_Dir_Basic;
+    DosName = "SFWidgets";
+End
+
+Directory gid_Dir_Basic_Importwiz
+    ParentID = gid_Dir_Basic;
+    DosName = "ImportWizard";
+End
+
+Directory gid_Dir_Basic_Formwiz
+    ParentID = gid_Dir_Basic;
+    DosName = "FormWizard";
+End
+
+Directory gid_Dir_Basic_Tutorials
+    ParentID = gid_Dir_Basic;
+    DosName = "Tutorials";
+End
+
+Directory gid_Dir_Basic_Scriptbindinglib
+    ParentID = gid_Dir_Basic;
+    DosName = "ScriptBindingLibrary";
+End
+
+Directory gid_Dir_Share_Scripts
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "Scripts";
+End
+
+Directory gid_Dir_Gallery
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "gallery";
+End
+
+Directory gid_Dir_Template
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "template";
+End
+
+Directory gid_Dir_Share_Template_Wizard
+    ParentID = gid_Dir_Template;
+    DosName = "wizard";
+End
+
+Directory gid_Dir_Share_Template_Common_Wizard
+    ParentID = gid_Dir_Template_Common;
+    DosName = "wizard";
+End
+
+Directory gid_Dir_Share_Template_Common_Wizard_Agenda
+    ParentID = gid_Dir_Share_Template_Common_Wizard;
+    DosName = "agenda";
+End
+
+Directory gid_Dir_Share_Template_Wizard_Bitmap
+    ParentID = gid_Dir_Share_Template_Wizard;
+    DosName = "bitmap";
+End
+
+Directory gid_Dir_Share_Template_Common_Wizard_Fax
+    ParentID = gid_Dir_Share_Template_Common_Wizard;
+    DosName = "fax";
+End
+
+Directory gid_Dir_Share_Template_Common_Wizard_Letter
+    ParentID = gid_Dir_Share_Template_Common_Wizard;
+    DosName = "letter";
+End
+
+Directory gid_Dir_Share_Template_Common_Wizard_Report
+    ParentID = gid_Dir_Share_Template_Common_Wizard;
+    DosName = "report";
+End
+
+Directory gid_Dir_Share_Template_Common_Wizard_Styles
+    ParentID = gid_Dir_Share_Template_Common_Wizard;
+    DosName = "styles";
+End
+
+Directory gid_Dir_Template_Language
+    ParentID = gid_Dir_Template;
+    DIR_ISOLANGUAGE_ALL_LANG_2;
+End
+
+Directory gid_Dir_Wordbook
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "wordbook";
+End
+
+Directory gid_Dir_Share_Fingerprint
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "fingerprint";
+End
+
+Directory gid_Dir_Share_Numbertext
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "numbertext";
+End
+
+Directory gid_Dir_Help
+#if defined MACOSX
+    ParentID = gid_Dir_Bundle_Contents_Resources;
+#else
+    ParentID = gid_Dir_Brand_Root;
+#endif
+    DosName = "help";
+End
+
+Directory gid_Dir_Help_Isolanguage
+    ParentID = gid_Dir_Help;
+    DIR_ISOLANGUAGE_ALL_LANG;
+#ifdef WITH_HELPPACK_INTEGRATION
+    Styles = (FORCEHELPPACK);
+#else
+    Styles = (HELPPACK);
+#endif
+End
+
+#ifdef UNX
+
+Directory gid_Dir_Fonts_Truetype
+    ParentID = gid_Dir_Fonts;
+    DosName = "truetype";
+End
+
+#endif
+
+#ifdef UNX
+
+Directory gid_Dir_Psprint
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "psprint";
+End
+
+#endif
+
+#ifdef UNX
+
+Directory gid_Dir_Psprint_Driver
+    ParentID = gid_Dir_Psprint;
+    DosName = "driver";
+End
+
+#endif
+
+/* *** Accessories Extras *** */
+
+/* ** Gallery ** */
+
+/* Draws */
+Directory gid_Dir_Gallery_Draws
+    ParentID = gid_Dir_Gallery;
+    DosName = "Draws";
+End
+
+/* Draws - People */
+Directory gid_Dir_Gallery_Draws_People
+    ParentID = gid_Dir_Gallery_Draws;
+    DosName = "People";
+End
+
+/* Photos */
+Directory gid_Dir_Gallery_Photos
+    ParentID = gid_Dir_Gallery;
+    DosName = "Photos";
+End
+
+/* Photos - Cities */
+Directory gid_Dir_Gallery_Photos_Cities
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Cities";
+End
+
+/* Photos - Buildings */
+Directory gid_Dir_Gallery_Photos_Buildings
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Buildings";
+End
+
+/* Photos - Plants */
+Directory gid_Dir_Gallery_Photos_Plants
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Plants";
+End
+
+/* Photos - Fauna */
+Directory gid_Dir_Gallery_Photos_Fauna
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Fauna";
+End
+
+/* Photos - Flowers */
+Directory gid_Dir_Gallery_Photos_Flowers
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Flowers";
+End
+
+/* Photos - Landscapes */
+Directory gid_Dir_Gallery_Photos_Landscapes
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Landscapes";
+End
+
+/* Photos - Statues */
+Directory gid_Dir_Gallery_Photos_Statues
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Statues";
+End
+
+/* Photos - Space */
+Directory gid_Dir_Gallery_Photos_Space
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Space";
+End
+
+/* Photos - Travel */
+Directory gid_Dir_Gallery_Photos_Travel
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Travel";
+End
+
+/* Photos - Objects */
+Directory gid_Dir_Gallery_Photos_Objects
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Objects";
+End
+
+/* Photos - Humans */
+Directory gid_Dir_Gallery_Photos_Humans
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Humans";
+End
+
+/* Photos - FoodsandDrinks */
+Directory gid_Dir_Gallery_Photos_FoodsandDrinks
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "FoodsandDrinks";
+End
+
+/* Photos - Celebration */
+Directory gid_Dir_Gallery_Photos_Celebration
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Celebration";
+End
+
+Directory gid_Dir_Samples
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "samples";
+End
+
+Directory gid_Dir_Samples_Language
+    ParentID = gid_Dir_Samples;
+    DIR_ISOLANGUAGE_ALL_LANG_2;
+End
+
+/* Elements */
+Directory gid_Dir_Gallery_Elements
+    ParentID = gid_Dir_Gallery;
+    DosName = "Elements";
+End
+
+/* Elements - Bullets 2 */
+Directory gid_Dir_Gallery_Elements_Bullets2
+    ParentID = gid_Dir_Gallery_Elements;
+    DosName = "Bullets2";
+End
+
+ /* Templates - Common */
+Directory gid_Dir_Template_Common
+    ParentID = gid_Dir_Template;
+    DosName = "common";
+End
+
+Directory gid_Dir_Template_Common_Internal
+    ParentID = gid_Dir_Template_Common;
+    DosName = "internal";
+End
+
+Directory gid_Dir_Template_Common_Draw
+    ParentID = gid_Dir_Template_Common;
+    DosName = "draw";
+End
+
+Directory gid_Dir_Template_Common_Officorr
+    ParentID = gid_Dir_Template_Common;
+    DosName = "officorr";
+End
+
+Directory gid_Dir_Template_Common_Offimisc
+    ParentID = gid_Dir_Template_Common;
+    DosName = "offimisc";
+End
+
+Directory gid_Dir_Template_Common_Personal
+    ParentID = gid_Dir_Template_Common;
+    DosName = "personal";
+End
+
+Directory gid_Dir_Template_Common_Presnt
+    ParentID = gid_Dir_Template_Common;
+    DosName = "presnt";
+End
+
+Directory gid_Dir_Template_Common_Styles
+    ParentID = gid_Dir_Template_Common;
+    DosName = "styles";
+End
+
+Directory gid_Brand_Dir_Program_Services
+#if defined MACOSX
+    ParentID = gid_Brand_Dir_Share;
+#else
+    ParentID = gid_Brand_Dir_Program;
+#endif
+    DosName = "services";
+End
+
+Directory gid_Brand_Dir_Program_Types
+#if defined MACOSX
+    ParentID = gid_Brand_Dir_Share;
+#else
+    ParentID = gid_Brand_Dir_Program;
+#endif
+    DosName = "types";
+End
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp
new file mode 100644
index 0000000000..b7174607e2
--- /dev/null
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#ifdef MACOSX
+Directory gid_Dir_Bundle
+    ParentID = PD_PROGDIR;
+    HostName = "%ONEWORDPRODUCTNAME.app";
+End
+
+Directory gid_Dir_Bundle_Contents
+    ParentID = gid_Dir_Bundle;
+    HostName = "Contents";
+    Styles = (OFFICEDIRECTORY);
+End
+
+Directory gid_Dir_Frameworks
+    ParentID = gid_Dir_Bundle_Contents;
+    DosName = "Frameworks";
+End
+#endif
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
new file mode 100644
index 0000000000..47a32179d7
--- /dev/null
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -0,0 +1,77 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+File gid_File_Extra_Autotextshare_Lang
+    Dir = FILELIST_DIR;
+    USER_FILE_BODY;
+    Styles = (FILELIST);
+    EXTRA_ALL_LANG(autotextshare,filelist);
+End
+
+#ifdef USING_X11
+
+File gid_File_Extra_Fontunxpsprint
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST, CONFIGFILE);
+    Name = "vcl_fontunxpsprint.filelist";
+End
+
+#endif
+
+#if defined (WITH_GALLERY_BUILD)
+
+GALLERY_FILELIST(sounds)
+
+#endif
+
+File gid_File_Extra_Wordbook
+    Dir = gid_Dir_Wordbook;
+    PACKED_TXT_FILE_BODY;
+    Name = "technical.dic";
+End
+
+File gid_File_Extra_Wordbook_en_US
+    Dir = gid_Dir_Wordbook;
+    TXT_FILE_BODY;
+    Styles = (PACKED, FORCELANGUAGEPACK);
+    Name = "en-US.dic";
+End
+
+File gid_File_Extra_Wordbook_en_GB
+    Dir = gid_Dir_Wordbook;
+    TXT_FILE_BODY;
+    Styles = (PACKED, FORCELANGUAGEPACK);
+    Name = "en-GB.dic";
+End
+
+File gid_File_Extra_Wordbook_sl
+    Dir = gid_Dir_Wordbook;
+    TXT_FILE_BODY;
+    Styles = (PACKED, FORCELANGUAGEPACK);
+    Name = "sl.dic";
+End
+
+File gid_File_Extra_Wordbook_hu_AkH11
+    Dir = gid_Dir_Wordbook;
+    TXT_FILE_BODY;
+    Styles = (PACKED, FORCELANGUAGEPACK);
+    Name = "hu_AkH11.dic";
+End
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
new file mode 100644
index 0000000000..f1ddc7c629
--- /dev/null
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -0,0 +1,65 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#include "macros.inc"
+
+#if defined _MSC_VER && ! defined _ARM64_
+
+File gid_File_Lib_Cli_Oootypes_Assembly
+    TXT_FILE_BODY;
+    Styles = (PACKED, ASSEMBLY);
+    Name = "cli_oootypes.dll";
+    Dir = gid_Brand_Dir_Program;
+    Assemblyname = "cli_oootypes";
+    PublicKeyToken = "ce2cb7e279207b9e";
+    Version = "${CLI_OOOTYPES_NEW_VERSION}";
+    Culture = "neutral";
+    Attributes = "0";
+    ProcessorArchitecture = "MSIL";
+End
+
+File gid_File_Lib_Policy_Cli_Oootypes_Assembly
+    TXT_FILE_BODY;
+    Styles = (PACKED, ASSEMBLY);
+    Name = "${CLI_OOOTYPES_POLICY_ASSEMBLY}.dll";
+    Dir = gid_Brand_Dir_Program;
+    Assemblyname = "${CLI_OOOTYPES_POLICY_ASSEMBLY}";
+    PublicKeyToken = "ce2cb7e279207b9e";
+    Version = "${CLI_OOOTYPES_POLICY_VERSION}";
+    Culture = "neutral";
+    Attributes = "0";
+    ProcessorArchitecture = "MSIL";
+End
+
+File gid_File_Lib_Policy_Cli_Oootypes_Config
+    TXT_FILE_BODY;
+    Styles = (PACKED, ASSIGNCOMPONENT);
+    Name = "cli_oootypes.config";
+    Dir = gid_Brand_Dir_Program;
+    AssignComponent = gid_File_Lib_Policy_Cli_Oootypes_Assembly;
+End
+
+#endif
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
new file mode 100644
index 0000000000..f5573c3ab8
--- /dev/null
+++ b/scp2/source/ooo/file_ooo.scp
@@ -0,0 +1,798 @@
+/*************************************************************************
+*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+************************************************************************/
+
+#include "macros.inc"
+
+#if defined WITH_HELPPACKS
+File gid_File_Help_Common_Zip
+    Dir = FILELIST_DIR;
+    FILELIST_TXT_FILE_BODY_HELPPACK;
+    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(shared);
+End
+
+File gid_File_Help_Sbasic_Zip
+    Dir = FILELIST_DIR;
+    FILELIST_TXT_FILE_BODY_HELPPACK;
+    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sbasic);
+End
+
+File gid_File_Help_Schart_Zip
+    Dir = FILELIST_DIR;
+    FILELIST_TXT_FILE_BODY_HELPPACK;
+    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart);
+End
+#endif
+
+// mod files
+
+File gid_File_Share_Registry_Main_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED, SCPZIP_REPLACE);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "main.xcd";
+End
+
+#ifdef WNT
+
+File gid_File_Share_Registry_Forcedefault_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED, SCPZIP_REPLACE, SET_OFFICE_LANGUAGE);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "forcedefault.xcd";
+End
+
+#endif
+
+File gid_File_Rdb_Offapi
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program_Types;
+    Styles = (PACKED);
+    Name = "offapi.rdb";
+End
+
+File gid_File_Rdb_TypesVba
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program_Types;
+    Styles = (PACKED, OVERWRITE);
+    Name = "oovbaapi.rdb";
+End
+
+File gid_File_Registry_Lang
+    Dir = gid_Dir_Share_Registry_Res;
+    TXT_FILE_BODY;
+    EXTRA_ALL_LANG_BUT_EN_US(registry,xcd);
+End
+
+File gid_File_Registry_Filter_Zip
+    Dir = gid_Dir_Share_Registry_Res;
+    TXT_FILE_BODY;
+    EXTRA_ALL_LANG(fcfg_langpack,xcd);
+End
+
+File gid_File_Registry_Spool_Langpack_Lang
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    FILE_ALL_LANG_LETTER(Langpack-,xcd);
+End
+
+File gid_File_Share_Registry_Ctl_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED,MAKE_LANG_SPECIFIC);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name (ar) = "ctl.xcd";
+    Name (bo) = "ctl.xcd";
+    Name (dz) = "ctl.xcd";
+    Name (fa) = "ctl.xcd";
+    Name (gu) = "ctl.xcd";
+    Name (he) = "ctl.xcd";
+    Name (hi) = "ctl.xcd";
+    Name (km) = "ctl.xcd";
+    Name (ky-CN) = "ctl.xcd";
+    Name (lo) = "ctl.xcd";
+    Name (my) = "ctl.xcd";
+    Name (ne) = "ctl.xcd";
+    Name (or) = "ctl.xcd";
+    Name (pa-IN) = "ctl.xcd";
+    Name (ta) = "ctl.xcd";
+    Name (th) = "ctl.xcd";
+End
+
+File gid_File_Share_Registry_Ctlseqcheck_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED,MAKE_LANG_SPECIFIC);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name (km) = "ctlseqcheck.xcd";
+    Name (lo) = "ctlseqcheck.xcd";
+    Name (th) = "ctlseqcheck.xcd";
+End
+
+// user interface configuration files
+UI_FILELIST(basicide, "UIConfig/modules/BasicIDE.filelist")
+UI_FILELIST(cui, "UIConfig/cui.filelist")
+#ifdef DBCONNECTIVITY
+UI_FILELIST(dbaccess, "UIConfig/dbaccess.filelist")
+UI_FILELIST(dbapp, "UIConfig/modules/dbapp.filelist")
+UI_FILELIST(dbbrowser, "UIConfig/modules/dbbrowser.filelist")
+UI_FILELIST(dbquery, "UIConfig/modules/dbquery.filelist")
+UI_FILELIST(dbrelation, "UIConfig/modules/dbrelation.filelist")
+UI_FILELIST(dbreport, "UIConfig/modules/dbreport.filelist")
+UI_FILELIST(dbtable, "UIConfig/modules/dbtable.filelist")
+UI_FILELIST(dbtdata, "UIConfig/modules/dbtdata.filelist")
+#endif
+UI_FILELIST(desktop, "UIConfig/desktop.filelist")
+UI_FILELIST(editeng, "UIConfig/editeng.filelist")
+UI_FILELIST(filter, "UIConfig/filter.filelist")
+UI_FILELIST(formula, "UIConfig/formula.filelist")
+UI_FILELIST(fps, "UIConfig/fps.filelist")
+UI_FILELIST(sabpilot, "UIConfig/modules/sabpilot.filelist")
+UI_FILELIST(scanner, "UIConfig/modules/scanner.filelist")
+#ifdef DBCONNECTIVITY
+UI_FILELIST(sbibliography, "UIConfig/modules/sbibliography.filelist")
+UI_FILELIST(spropctrlr, "UIConfig/modules/spropctrlr.filelist")
+#endif
+UI_FILELIST(scalc, "UIConfig/modules/scalc.filelist")
+UI_FILELIST(schart, "UIConfig/modules/schart.filelist")
+UI_FILELIST(sdraw, "UIConfig/modules/sdraw.filelist")
+UI_FILELIST(sfx, "UIConfig/sfx.filelist")
+UI_FILELIST(sglobal, "UIConfig/modules/sglobal.filelist")
+UI_FILELIST(simpress, "UIConfig/modules/simpress.filelist")
+UI_FILELIST(smath, "UIConfig/modules/smath.filelist")
+UI_FILELIST(startmodule, "UIConfig/modules/StartModule.filelist")
+UI_FILELIST(svt, "UIConfig/svt.filelist")
+UI_FILELIST(svx, "UIConfig/svx.filelist")
+UI_FILELIST(sweb, "UIConfig/modules/sweb.filelist")
+UI_FILELIST(swform, "UIConfig/modules/swform.filelist")
+UI_FILELIST(swreport, "UIConfig/modules/swreport.filelist")
+UI_FILELIST(swriter, "UIConfig/modules/swriter.filelist")
+UI_FILELIST(swxform, "UIConfig/modules/swxform.filelist")
+UI_FILELIST(uui, "UIConfig/uui.filelist")
+UI_FILELIST(vcl, "UIConfig/vcl.filelist")
+UI_FILELIST(writerperfect, "UIConfig/writerperfect.filelist")
+UI_FILELIST(xmlsec, "UIConfig/xmlsec.filelist")
+
+MO_FILELIST_ALL_LANG(acc)
+MO_FILELIST_ALL_LANG(avmedia)
+#ifndef DISABLE_SCRIPTING
+MO_FILELIST_ALL_LANG(basctl)
+#endif
+MO_FILELIST_ALL_LANG(chart)
+MO_FILELIST_ALL_LANG(cnr)
+MO_FILELIST_ALL_LANG(cui)
+MO_FILELIST_ALL_LANG(dba)
+MO_FILELIST_ALL_LANG(dkt)
+MO_FILELIST_ALL_LANG(editeng)
+MO_FILELIST_ALL_LANG(flt)
+MO_FILELIST_ALL_LANG(for)
+MO_FILELIST_ALL_LANG(fps)
+MO_FILELIST_ALL_LANG(frm)
+MO_FILELIST_ALL_LANG(fwk)
+MO_FILELIST_ALL_LANG(oox)
+MO_FILELIST_ALL_LANG(pcr)
+MO_FILELIST_ALL_LANG(rpt)
+MO_FILELIST_ALL_LANG(sb)
+MO_FILELIST_ALL_LANG(sc)
+MO_FILELIST_ALL_LANG(sca)
+MO_FILELIST_ALL_LANG(scc)
+MO_FILELIST_ALL_LANG(sd)
+MO_FILELIST_ALL_LANG(sfx)
+MO_FILELIST_ALL_LANG(sm)
+MO_FILELIST_ALL_LANG(svl)
+MO_FILELIST_ALL_LANG(svt)
+MO_FILELIST_ALL_LANG(svx)
+MO_FILELIST_ALL_LANG(sw)
+MO_FILELIST_ALL_LANG(uui)
+MO_FILELIST_ALL_LANG(vcl)
+MO_FILELIST_ALL_LANG(wiz)
+MO_FILELIST_ALL_LANG(wpt)
+MO_FILELIST_ALL_LANG(xsc)
+
+#if defined UNX && ! defined MACOSX
+
+File gid_File_Txt_Pagein_Calc
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED);
+    Name = "pagein-calc";
+End
+
+File gid_File_Txt_Pagein_Common
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED);
+    Name = "pagein-common";
+End
+
+File gid_File_Txt_Pagein_Draw
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED);
+    Name = "pagein-draw";
+End
+
+File gid_File_Txt_Pagein_Impress
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED);
+    Name = "pagein-impress";
+End
+
+File gid_File_Txt_Pagein_Writer
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED);
+    Name = "pagein-writer";
+End
+
+#endif
+
+File gid_Starregistry_Services_Rdb
+    TXT_FILE_BODY;
+    Name = "services.rdb";
+    Dir = gid_Brand_Dir_Program_Services;
+    Styles = (PACKED);
+End
+
+File gid_File_Share_Registry_Lingucomponent_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "lingucomponent.xcd";
+End
+
+// Dictionary extensions
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Af
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-af.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_An
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-an.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ar
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-ar.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Be
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-be.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Bg
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-bg.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Bn
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-bn.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Bo
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-bo.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Br
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-br.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Bs
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-bs.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ca
+    Dir = FILELIST_DIR;
+    Name = "Dictionary/dict-ca.filelist";
+    Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+    TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ckb
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-ckb.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Cs
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-cs.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Da
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-da.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS && (!defined MPL_SUBSET || defined LINUX)
+File gid_File_Extension_Dictionary_De
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-de.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS && (!defined MPL_SUBSET || defined LINUX)
+File gid_File_Extension_Dictionary_En
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-en.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_El
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-el.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Eo
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-eo.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Es
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-es.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Et
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-et.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Fa
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-fa.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Fr
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-fr.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Gd
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-gd.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Gl
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-gl.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Gu
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-gu.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_He
+    Dir = FILELIST_DIR;
+    Name = "Dictionary/dict-he.filelist";
+    Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+    TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Hi
+    Dir = FILELIST_DIR;
+    Name = "Dictionary/dict-hi.filelist";
+    Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+    TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Hu
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-hu.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Hr
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-hr.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Id
+        Dir = FILELIST_DIR;
+        Name = "Dictionary/dict-id.filelist";
+        Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+        TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Is
+        Dir = FILELIST_DIR;
+        Name = "Dictionary/dict-is.filelist";
+        Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+        TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS && (!defined MPL_SUBSET || defined LINUX)
+File gid_File_Extension_Dictionary_It
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-it.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Kmr_Latn
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-kmr-Latn.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ko
+        Dir = FILELIST_DIR;
+        Name = "Dictionary/dict-ko.filelist";
+        Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+        TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Lo
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-lo.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Lt
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-lt.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Lv
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-lv.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Mn
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-mn.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ne
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-ne.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Nl
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-nl.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_No
+    Dir = FILELIST_DIR;
+    Name = "Dictionary/dict-no.filelist";
+    Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+    TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Oc
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-oc.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Pl
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-pl.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Pt_Br
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-pt-BR.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Pt_Pt
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-pt-PT.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ro
+    Dir = FILELIST_DIR;
+    Name = "Dictionary/dict-ro.filelist";
+    Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+    TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ru
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-ru.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Si
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-si.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Sk
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-sk.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Sl
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-sl.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Sq
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-sq.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Sr
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-sr.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Sv
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-sv.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Sw
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-sw.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Te
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-te.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Th
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-th.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Tr
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-tr.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Uk
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-uk.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Vi
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-vi.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Zu
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-zu.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+	TXT_FILE_BODY;
+End
+#endif
diff --git a/scp2/source/ooo/folder_ooo.scp b/scp2/source/ooo/folder_ooo.scp
new file mode 100644
index 0000000000..707c3594c4
--- /dev/null
+++ b/scp2/source/ooo/folder_ooo.scp
@@ -0,0 +1,24 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+Folder gid_Folder_Staroffice51
+    Name = ".";
+End
+
diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp
new file mode 100644
index 0000000000..a9f68ffd3d
--- /dev/null
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -0,0 +1,90 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+FolderItem gid_Folderitem_LibreOffice
+    Name = "%PRODUCTNAME";
+    ModuleID = gid_Module_Root;
+#ifdef ENABLE_SILENT_MSI
+    FolderID = PREDEFINED_STARTMENU;
+#else
+    FolderID = gid_Folder_Staroffice51;
+#endif
+    FileID = auto_brand_exe_soffice_exe;
+    IconFile = auto_brand_exe_soffice_exe;
+    IconID = 0;
+    WkDir = gid_Brand_Dir_Program;
+    Parameter = "";
+    Styles = (NON_ADVERTISED);
+    ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
+End
+
+FolderItemProperty gid_Fip_LibreOffice_AppID
+    ShortcutID = gid_Folderitem_LibreOffice;
+    Key = "System.AppUserModel.ID";
+    Value = "TheDocumentFoundation.LibreOffice.Startcenter";
+End
+
+FolderItem gid_Folderitem_Soffice_Desktop
+#ifdef ENABLE_SILENT_MSI
+    Name = "%PRODUCTNAME";
+#else
+    Name = "%PRODUCTNAME %PRODUCTVERSION";
+#endif
+    ModuleID = gid_Module_Root;
+    FolderID = PREDEFINED_DESKTOP;
+    FileID = auto_brand_exe_soffice_exe;
+    IconFile = auto_brand_exe_soffice_exe;
+    IconID = 0;
+    ComponentIDFile = "gid_Brand_File_Desktophelper_Txt";
+    WkDir = gid_Brand_Dir_Program;
+    Parameter = "";
+    Styles = (NON_ADVERTISED,USE_HELPER_FILENAME);
+    ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
+    ComponentCondition = "CREATEDESKTOPLINK=1";
+End
+
+FolderItemProperty gid_Fip_Soffice_Desktop_AppID
+    ShortcutID = gid_Folderitem_Soffice_Desktop;
+    Key = "System.AppUserModel.ID";
+    Value = "TheDocumentFoundation.LibreOffice.Startcenter";
+End
+
+FolderItem gid_Folderitem_LibreOffice_SafeMode
+    ALL_LANG(Name, STR_FI_NAME_SAFEMODE);
+    ModuleID = gid_Module_Root;
+#ifdef ENABLE_SILENT_MSI
+    FolderID = PREDEFINED_STARTMENU;
+#else
+    FolderID = gid_Folder_Staroffice51;
+#endif
+    FileID = auto_brand_exe_soffice_exe;
+    IconFile = auto_brand_exe_soffice_exe;
+    IconID = 0;
+    WkDir = gid_Brand_Dir_Program;
+    Parameter = "--safe-mode";
+    Styles = (NON_ADVERTISED);
+    ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
+End
+
+FolderItemProperty gid_Fip_LibreOffice_SafeMode
+    ShortcutID = gid_Folderitem_LibreOffice_SafeMode;
+    Key = "System.AppUserModel.ID";
+    Value = "TheDocumentFoundation.LibreOffice.SafeMode";
+End
diff --git a/scp2/source/ooo/folderitem_ooo.ulf b/scp2/source/ooo/folderitem_ooo.ulf
new file mode 100644
index 0000000000..22f8a37f79
--- /dev/null
+++ b/scp2/source/ooo/folderitem_ooo.ulf
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+ 
+[STR_FI_NAME_FROMTEMPLATE]
+en-US = "From Template"
+
+[STR_FI_NAME_OPENDOCUMENT]
+en-US = "Open Document"
+
+[STR_FI_NAME_SAFEMODE]
+en-US = "%PRODUCTNAME (Safe Mode)"
+
+[STR_FI_TOOLTIP_SOFFICE]
+en-US = "LibreOffice, the office productivity suite provided by The Document Foundation. See https://www.documentfoundation.org"
diff --git a/scp2/source/ooo/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp
new file mode 100644
index 0000000000..f5ef1c91d4
--- /dev/null
+++ b/scp2/source/ooo/installation_ooo.scp
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+Installation gid_Installation_Ooo
+    ProductName = "${PRODUCTNAME}";
+    ProductVersion = "${PRODUCTVERSION}";
+    ProductExtension = "${PRODUCTEXTENSION}";
+    UserDirProductVersion = "${USERDIRPRODUCTVERSION}";
+    SxwFormatName = "OpenOffice.org";
+    SxwFormatVersion = "1.1";
+  #ifdef WNT
+    DefaultDestPath = "<winprogpath>\${PRODUCTNAME}${PRODUCTVERSION}";
+  #else
+	DefaultDestPath = "/opt";
+  #endif
+    UpdateFor = "${UPDATEFOR}";
+    PatchLevel = 0;
+    Styles = (KEEP_OLD_VERSION);
+End
+
diff --git a/scp2/source/ooo/module_help_template.scp b/scp2/source/ooo/module_help_template.scp
new file mode 100644
index 0000000000..70cf667e4f
--- /dev/null
+++ b/scp2/source/ooo/module_help_template.scp
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+Module gid_Module_Helppack_Help_Template
+    ParentID = gid_Module_Helppack_Helproot;
+    Name = "gid_Module_Helppack_Help_Template";
+    Description = "gid_Module_Helppack_Help_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (gid_File_Help_Common_Zip,
+             gid_File_Help_Sbasic_Zip,
+             gid_File_Help_Scalc_Zip,
+             gid_File_Help_Schart_Zip,
+             gid_File_Help_Sdatabase_Zip,
+             gid_File_Help_Sdraw_Zip,
+             gid_File_Help_Simpress_Zip,
+             gid_File_Help_Smath_Zip,
+             gid_File_Help_Swriter_Zip);
+End
+
+#include "allhelpmodules_root.inc"
diff --git a/scp2/source/ooo/module_helppack.scp b/scp2/source/ooo/module_helppack.scp
new file mode 100644
index 0000000000..e2beb98415
--- /dev/null
+++ b/scp2/source/ooo/module_helppack.scp
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Helppack_Helproot
+    ParentID = gid_Module_Root;
+    XPDParentID = "root";
+    Sortkey = "300";
+    MOD_NAME_DESC(MODULE_ROOT_HELPPACK);
+#ifdef WITH_HELPPACK_INTEGRATION
+    Styles = (SHOW_MULTILINGUAL_ONLY);
+#else
+    Styles = (HIDDEN_ROOT);
+#endif
+End
+
+#include "allhelpmodules.inc"
diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf
new file mode 100644
index 0000000000..18a1a0e540
--- /dev/null
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -0,0 +1,683 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_ROOT_HELPPACK]
+en-US = "Additional help packs"
+
+[STR_DESC_MODULE_ROOT_HELPPACK]
+en-US = "Additional help packs"
+
+[STR_NAME_MODULE_HELPPACK_EN_US]
+en-US = "English (United States)"
+
+[STR_DESC_MODULE_HELPPACK_EN_US]
+en-US = "Installs English (United States) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_HELPPACK_DE]
+en-US = "Installs German help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_HELPPACK_FR]
+en-US = "Installs French help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_HELPPACK_IT]
+en-US = "Installs Italian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_HELPPACK_ES]
+en-US = "Installs Spanish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_HELPPACK_SV]
+en-US = "Installs Swedish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_HELPPACK_PT]
+en-US = "Installs Portuguese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_HELPPACK_PT_BR]
+en-US = "Installs Portuguese (Brazil) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_JA]
+en-US = "Japanese"
+
+[STR_DESC_MODULE_HELPPACK_JA]
+en-US = "Installs Japanese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_HELPPACK_KO]
+en-US = "Installs Korean help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ZH_CN]
+en-US = "Chinese (simplified)"
+
+[STR_DESC_MODULE_HELPPACK_ZH_CN]
+en-US = "Installs Chinese (simplified) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ZH_TW]
+en-US = "Chinese (traditional)"
+
+[STR_DESC_MODULE_HELPPACK_ZH_TW]
+en-US = "Installs Chinese (traditional) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_HELPPACK_NL]
+en-US = "Installs Dutch help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_HELPPACK_HU]
+en-US = "Installs Hungarian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_HELPPACK_PL]
+en-US = "Installs Polish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_HELPPACK_RU]
+en-US = "Installs Russian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_HELPPACK_TR]
+en-US = "Installs Turkish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_HELPPACK_EL]
+en-US = "Installs Greek help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_HELPPACK_TH]
+en-US = "Installs Thai help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_HELPPACK_CS]
+en-US = "Installs Czech help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_HELPPACK_SK]
+en-US = "Installs Slovak help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_HELPPACK_HR]
+en-US = "Installs Croatian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_HELPPACK_ET]
+en-US = "Installs Estonian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_HELPPACK_VI]
+en-US = "Installs Vietnamese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_HELPPACK_BG]
+en-US = "Installs Bulgarian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KM]
+en-US = "Khmer"
+
+[STR_DESC_MODULE_HELPPACK_KM]
+en-US = "Installs Khmer help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PA_IN]
+en-US = "Punjabi"
+
+[STR_DESC_MODULE_HELPPACK_PA_IN]
+en-US = "Installs Punjabi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TA]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_HELPPACK_TA]
+en-US = "Installs Tamil help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_HELPPACK_HI]
+en-US = "Installs Hindi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ST]
+en-US = "Southern Sotho (Sutu)"
+
+[STR_DESC_MODULE_HELPPACK_ST]
+en-US = "Installs Southern Sotho (Sutu) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TN]
+en-US = "Tswana"
+
+[STR_DESC_MODULE_HELPPACK_TN]
+en-US = "Installs Tswana help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_XH]
+en-US = "Xhosa"
+
+[STR_DESC_MODULE_HELPPACK_XH]
+en-US = "Installs Xhosa help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_HELPPACK_ZU]
+en-US = "Installs Zulu help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_HELPPACK_AF]
+en-US = "Installs Afrikaans help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SW_TZ]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_HELPPACK_SW_TZ]
+en-US = "Installs Swahili help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_HELPPACK_LO]
+en-US = "Installs Lao help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NSO]
+en-US = "Northern Sotho"
+
+[STR_DESC_MODULE_HELPPACK_NSO]
+en-US = "Installs Northern Sotho help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BN]
+en-US = "Bengali (Bangladesh)"
+
+[STR_DESC_MODULE_HELPPACK_BN]
+en-US = "Installs Bengali (Bangladesh) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BN_IN]
+en-US = "Bengali (India)"
+
+[STR_DESC_MODULE_HELPPACK_BN_IN]
+en-US = "Installs Bengali (India) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_OR]
+en-US = "Odia"
+
+[STR_DESC_MODULE_HELPPACK_OR]
+en-US = "Installs Odia help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MR]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_HELPPACK_MR]
+en-US = "Installs Marathi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_HELPPACK_NE]
+en-US = "Installs Nepali help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_HELPPACK_AR]
+en-US = "Installs Arabic help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_HELPPACK_CA]
+en-US = "Installs Catalan help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_CA_VALENCIA]
+en-US = "Catalan (Valencian)"
+
+[STR_DESC_MODULE_HELPPACK_CA_VALENCIA]
+en-US = "Installs Catalan (Valencian) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_HELPPACK_DA]
+en-US = "Installs Danish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_FI]
+en-US = "Finnish"
+
+[STR_DESC_MODULE_HELPPACK_FI]
+en-US = "Installs Finnish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_HELPPACK_HE]
+en-US = "Installs Hebrew help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_IS]
+en-US = "Icelandic"
+
+[STR_DESC_MODULE_HELPPACK_IS]
+en-US = "Installs Icelandic help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NB]
+en-US = "Norwegian (Bokmål)"
+
+[STR_DESC_MODULE_HELPPACK_NB]
+en-US = "Installs Norwegian (Bokmål) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NN]
+en-US = "Norwegian (Nynorsk)"
+
+[STR_DESC_MODULE_HELPPACK_NN]
+en-US = "Installs Norwegian (Nynorsk) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_HELPPACK_RO]
+en-US = "Installs Romanian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_HELPPACK_SQ]
+en-US = "Installs Albanian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_HELPPACK_ID]
+en-US = "Installs Indonesian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_HELPPACK_UK]
+en-US = "Installs Ukrainian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BE]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_HELPPACK_BE]
+en-US = "Installs Belarusian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_HELPPACK_SL]
+en-US = "Installs Slovenian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_LV]
+en-US = "Latvian"
+
+[STR_DESC_MODULE_HELPPACK_LV]
+en-US = "Installs Latvian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_HELPPACK_LT]
+en-US = "Installs Lithuanian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EU]
+en-US = "Basque"
+
+[STR_DESC_MODULE_HELPPACK_EU]
+en-US = "Installs Basque help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MK]
+en-US = "Macedonian"
+
+[STR_DESC_MODULE_HELPPACK_MK]
+en-US = "Installs Macedonian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_CY]
+en-US = "Welsh"
+
+[STR_DESC_MODULE_HELPPACK_CY]
+en-US = "Installs Welsh help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_HELPPACK_GL]
+en-US = "Installs Galician help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SR_LATN]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_HELPPACK_SR_LATN]
+en-US = "Installs Serbian (Latin) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GA]
+en-US = "Irish"
+
+[STR_DESC_MODULE_HELPPACK_GA]
+en-US = "Installs Irish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SR]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_HELPPACK_SR]
+en-US = "Installs Serbian (Cyrillic) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BS]
+en-US = "Bosnian"
+
+[STR_DESC_MODULE_HELPPACK_BS]
+en-US = "Installs Bosnian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AST]
+en-US = "Asturian"
+
+[STR_DESC_MODULE_HELPPACK_AST]
+en-US = "Installs Asturian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_RW]
+en-US = "Kinyarwanda"
+
+[STR_DESC_MODULE_HELPPACK_RW]
+en-US = "Installs Kinyarwanda help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_FA]
+en-US = "Persian"
+
+[STR_DESC_MODULE_HELPPACK_FA]
+en-US = "Installs Persian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TT]
+en-US = "Tatar"
+
+[STR_DESC_MODULE_HELPPACK_TT]
+en-US = "Installs Tatar help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TS]
+en-US = "Tsonga"
+
+[STR_DESC_MODULE_HELPPACK_TS]
+en-US = "Installs Tsonga help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_HELPPACK_BR]
+en-US = "Installs Breton help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NR]
+en-US = "Ndebele South"
+
+[STR_DESC_MODULE_HELPPACK_NR]
+en-US = "Installs Ndebele South help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SS]
+en-US = "Swazi"
+
+[STR_DESC_MODULE_HELPPACK_SS]
+en-US = "Installs Swazi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_VE]
+en-US = "Venda"
+
+[STR_DESC_MODULE_HELPPACK_VE]
+en-US = "Installs Venda help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KN]
+en-US = "Kannada"
+
+[STR_DESC_MODULE_HELPPACK_KN]
+en-US = "Installs Kannada help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TG]
+en-US = "Tajik"
+
+[STR_DESC_MODULE_HELPPACK_TG]
+en-US = "Installs Tajik help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KU]
+en-US = "Kurdish"
+
+[STR_DESC_MODULE_HELPPACK_KU]
+en-US = "Installs Kurdish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_DZ]
+en-US = "Dzongkha"
+
+[STR_DESC_MODULE_HELPPACK_DZ]
+en-US = "Installs Dzongkha help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KA]
+en-US = "Georgian"
+
+[STR_DESC_MODULE_HELPPACK_KA]
+en-US = "Installs Georgian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_HELPPACK_EO]
+en-US = "Installs Esperanto help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GU]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_HELPPACK_GU]
+en-US = "Installs Gujarati help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GUG]
+en-US = "Guarani"
+
+[STR_DESC_MODULE_HELPPACK_GUG]
+en-US = "Installs Guarani help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EN_ZA]
+en-US = "English (South Africa)"
+
+[STR_DESC_MODULE_HELPPACK_EN_ZA]
+en-US = "Installs English (South Africa) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EN_GB]
+en-US = "English (United Kingdom)"
+
+[STR_DESC_MODULE_HELPPACK_EN_GB]
+en-US = "Installs English (United Kingdom) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_UZ]
+en-US = "Uzbek"
+
+[STR_DESC_MODULE_HELPPACK_UZ]
+en-US = "Installs Uzbek help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MN]
+en-US = "Mongolian"
+
+[STR_DESC_MODULE_HELPPACK_MN]
+en-US = "Installs Mongolian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_HELPPACK_MY]
+en-US = "Installs Burmese (Myanmar) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BO]
+en-US = "Tibetan"
+
+[STR_DESC_MODULE_HELPPACK_BO]
+en-US = "Installs Tibetan help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_OC]
+en-US = "Occitan"
+
+[STR_DESC_MODULE_HELPPACK_OC]
+en-US = "Installs Occitan help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_OM]
+en-US = "Oromo"
+
+[STR_DESC_MODULE_HELPPACK_OM]
+en-US = "Installs Oromo help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SI]
+en-US = "Sinhala"
+
+[STR_DESC_MODULE_HELPPACK_SI]
+en-US = "Installs Sinhala help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_UG]
+en-US = "Uyghur"
+
+[STR_DESC_MODULE_HELPPACK_UG]
+en-US = "Installs Uyghur help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AS]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_HELPPACK_AS]
+en-US = "Installs Assamese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BRX]
+en-US = "Bodo"
+
+[STR_DESC_MODULE_HELPPACK_BRX]
+en-US = "Installs Bodo help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_DGO]
+en-US = "Dogri"
+
+[STR_DESC_MODULE_HELPPACK_DGO]
+en-US = "Installs Dogri help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GD]
+en-US = "Scottish Gaelic"
+
+[STR_DESC_MODULE_HELPPACK_GD]
+en-US = "Installs Scottish Gaelic help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_HELPPACK_KK]
+en-US = "Installs Kazakh help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KOK]
+en-US = "Konkani"
+
+[STR_DESC_MODULE_HELPPACK_KOK]
+en-US = "Installs Konkani help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KS]
+en-US = "Kashmiri"
+
+[STR_DESC_MODULE_HELPPACK_KS]
+en-US = "Installs Kashmiri help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MAI]
+en-US = "Maithili"
+
+[STR_DESC_MODULE_HELPPACK_MAI]
+en-US = "Installs Maithili help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ML]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_HELPPACK_ML]
+en-US = "Installs Malayalam help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MNI]
+en-US = "Manipuri"
+
+[STR_DESC_MODULE_HELPPACK_MNI]
+en-US = "Installs Manipuri help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SA_IN]
+en-US = "Sanskrit (India)"
+
+[STR_DESC_MODULE_HELPPACK_SA_IN]
+en-US = "Installs Sanskrit help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SAT]
+en-US = "Santali"
+
+[STR_DESC_MODULE_HELPPACK_SAT]
+en-US = "Installs Santali help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SD]
+en-US = "Sindhi"
+
+[STR_DESC_MODULE_HELPPACK_SD]
+en-US = "Installs Sindhi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TE]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_HELPPACK_TE]
+en-US = "Installs Telugu help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SID]
+en-US = "Sidama"
+
+[STR_DESC_MODULE_HELPPACK_SID]
+en-US = "Installs Sidama help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_QTZ]
+en-US = "KeyID"
+
+[STR_DESC_MODULE_HELPPACK_QTZ]
+en-US = "Installs English help in %PRODUCTNAME %PRODUCTVERSION with a key ID before each paragraph"
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
new file mode 100644
index 0000000000..cb8093987a
--- /dev/null
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -0,0 +1,59 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+#include "AutoInstall/ooo"
+#include "AutoInstall/ooo_fonts"
+#include "AutoInstall/ooo_images"
+#include "AutoInstall/ooobinarytable"
+
+Module gid_Module_Root_Files_Images
+    PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Root;
+    InstallOrder = "100";
+	Name = "gid_Module_Root_Files_Images";
+	Description = "gid_Module_Root_Files_Images";
+	Sortkey = "2050";
+	Default = YES;
+	Styles = (HIDDEN_ROOT);
+	Files = (auto_ooo_images_ALL);
+End
+
+#ifndef WITHOUT_FONTS
+Module gid_Module_Root_Fonts_OOo_Hidden
+    PackageInfo = "packinfo_office.txt";
+	ParentID = gid_Module_Root;
+    InstallOrder = "100";
+	Name = "gid_Module_Root_Fonts_OOo_Hidden";
+	Description = "gid_Module_Root_Fonts_OOo_Hidden";
+	Sortkey = "2100";
+	Default = YES;
+	Styles = (HIDDEN_ROOT);
+	Files = (auto_ooo_fonts_ALL);
+End
+#endif
+
+Module gid_Module_Oo_Linguistic
+    PackageInfo = "packinfo_office.txt";
+    Name = "gid_Module_Oo_Linguistic";
+    Description = "gid_Module_Oo_Linguistic";
+    ParentID = gid_Module_Root;
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+    Files = (gid_File_Share_Registry_Lingucomponent_Xcd);
+End
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
new file mode 100644
index 0000000000..76003780f1
--- /dev/null
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -0,0 +1,103 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+Module gid_Module_Langpack_Basis_Template
+    ParentID = gid_Module_Langpack_Languageroot;
+    Name = "gid_Module_Langpack_Root_Template";
+    Description = "gid_Module_Langpack_Root_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+             gid_File_Share_Config_Sofficecfg_uiconfig_basicide_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_cui_Lang,
+#ifdef DBCONNECTIVITY
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbaccess_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbreport_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_sbibliography_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_spropctrlr_Lang,
+#endif
+             gid_File_Share_Config_Sofficecfg_uiconfig_desktop_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_editeng_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_filter_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_formula_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_fps_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_sabpilot_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_scalc_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_scanner_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_schart_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_sdraw_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_sfx_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_simpress_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_smath_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_svt_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_svx_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_swriter_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_uui_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_vcl_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec_Lang,
+             gid_File_Res_acc_Lang,
+             gid_File_Res_avmedia_Lang,
+             gid_File_Res_basctl_Lang,
+             gid_File_Res_chart_Lang,
+             gid_File_Res_cnr_Lang,
+             gid_File_Res_cui_Lang,
+             gid_File_Res_dba_Lang,
+             gid_File_Res_dkt_Lang,
+             gid_File_Res_editeng_Lang,
+             gid_File_Res_flt_Lang,
+             gid_File_Res_for_Lang,
+             gid_File_Res_fps_Lang,
+             gid_File_Res_frm_Lang,
+             gid_File_Res_fwk_Lang,
+             gid_File_Res_oox_Lang,
+             gid_File_Res_pcr_Lang,
+             gid_File_Res_rpt_Lang,
+             gid_File_Res_sb_Lang,
+             gid_File_Res_sc_Lang,
+             gid_File_Res_sca_Lang,
+             gid_File_Res_scc_Lang,
+             gid_File_Res_sd_Lang,
+             gid_File_Res_sfx_Lang,
+             gid_File_Res_sm_Lang,
+             gid_File_Res_svl_Lang,
+             gid_File_Res_svt_Lang,
+             gid_File_Res_svx_Lang,
+             gid_File_Res_sw_Lang,
+             gid_File_Res_uui_Lang,
+             gid_File_Res_vcl_Lang,
+             gid_File_Res_wiz_Lang,
+             gid_File_Res_wpt_Lang,
+             gid_File_Res_xsc_Lang,
+             gid_File_Extra_Autotextshare_Lang,
+             gid_File_Registry_Filter_Zip,
+             gid_File_Registry_Lang,
+             gid_File_Registry_Spool_Langpack_Lang,
+             gid_File_Share_Registry_Ctl_Xcd,
+             gid_File_Share_Registry_Ctlseqcheck_Xcd);
+    Dirs = (gid_Dir_Samples_Language,
+            gid_Dir_Autotext_Language);
+End
+
+Module gid_Module_Langpack_Fonts_Template
+    ParentID = gid_Module_Langpack_Languageroot;
+    Name = "gid_Module_Langpack_Fonts_Template";
+    Description = "gid_Module_Langpack_Fonts_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = ();
+End
+
+#include "alllangmodules_root.inc"
diff --git a/scp2/source/ooo/module_langpack.scp b/scp2/source/ooo/module_langpack.scp
new file mode 100644
index 0000000000..9f8fc9d143
--- /dev/null
+++ b/scp2/source/ooo/module_langpack.scp
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Langpack_Languageroot
+    ParentID = gid_Module_Root;
+    XPDParentID = "root";
+    Sortkey = "300";
+    MOD_NAME_DESC(MODULE_ROOT_LANGPACK);
+    Styles = (SHOW_MULTILINGUAL_ONLY);
+End
+
+#include "alllangmodules.inc"
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
new file mode 100644
index 0000000000..5b51e7fa9f
--- /dev/null
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -0,0 +1,749 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_ROOT_LANGPACK]
+en-US = "User interface languages"
+
+[STR_DESC_MODULE_ROOT_LANGPACK]
+en-US = "User interface languages"
+
+[STR_NAME_MODULE_LANGPACK_EN_US]
+en-US = "English (United States)"
+
+[STR_DESC_MODULE_LANGPACK_EN_US]
+en-US = "Installs the English (United States) user interface"
+
+[STR_NAME_MODULE_LANGPACK_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_LANGPACK_DE]
+en-US = "Installs the German user interface"
+
+[STR_NAME_MODULE_LANGPACK_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_LANGPACK_FR]
+en-US = "Installs the French user interface"
+
+[STR_NAME_MODULE_LANGPACK_FUR]
+en-US = "Friulian"
+
+[STR_DESC_MODULE_LANGPACK_FUR]
+en-US = "Installs the Friulian user interface"
+
+[STR_NAME_MODULE_LANGPACK_FY]
+en-US = "Frisian"
+
+[STR_DESC_MODULE_LANGPACK_FY]
+en-US = "Installs the Frisian user interface"
+
+[STR_NAME_MODULE_LANGPACK_HY]
+en-US = "Armenian"
+
+[STR_DESC_MODULE_LANGPACK_HY]
+en-US = "Installs the Armenian user interface"
+
+[STR_NAME_MODULE_LANGPACK_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_LANGPACK_IT]
+en-US = "Installs the Italian user interface"
+
+[STR_NAME_MODULE_LANGPACK_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_LANGPACK_ES]
+en-US = "Installs the Spanish user interface"
+
+[STR_NAME_MODULE_LANGPACK_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_LANGPACK_SV]
+en-US = "Installs the Swedish user interface"
+
+[STR_NAME_MODULE_LANGPACK_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_LANGPACK_PT]
+en-US = "Installs the Portuguese user interface"
+
+[STR_NAME_MODULE_LANGPACK_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_LANGPACK_PT_BR]
+en-US = "Installs the Brazilian Portuguese user interface"
+
+[STR_NAME_MODULE_LANGPACK_JA]
+en-US = "Japanese"
+
+[STR_DESC_MODULE_LANGPACK_JA]
+en-US = "Installs the Japanese user interface"
+
+[STR_NAME_MODULE_LANGPACK_KAB]
+en-US = "Kabyle"
+
+[STR_DESC_MODULE_LANGPACK_KAB]
+en-US = "Installs the Kabyle user interface"
+
+[STR_NAME_MODULE_LANGPACK_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_LANGPACK_KO]
+en-US = "Installs the Korean user interface"
+
+[STR_NAME_MODULE_LANGPACK_ZH_CN]
+en-US = "Chinese (simplified)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_CN]
+en-US = "Installs the Chinese (simplified) user interface"
+
+[STR_NAME_MODULE_LANGPACK_ZH_TW]
+en-US = "Chinese (traditional)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_TW]
+en-US = "Installs the Chinese (traditional) user interface"
+
+[STR_NAME_MODULE_LANGPACK_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_LANGPACK_NL]
+en-US = "Installs the Dutch user interface"
+
+[STR_NAME_MODULE_LANGPACK_DSB]
+en-US = "Lower Sorbian"
+
+[STR_DESC_MODULE_LANGPACK_DSB]
+en-US = "Installs the Lower Sorbian user interface"
+
+[STR_NAME_MODULE_LANGPACK_HSB]
+en-US = "Upper Sorbian"
+
+[STR_DESC_MODULE_LANGPACK_HSB]
+en-US = "Installs the Upper Sorbian user interface"
+
+[STR_NAME_MODULE_LANGPACK_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_LANGPACK_HU]
+en-US = "Installs the Hungarian user interface"
+
+[STR_NAME_MODULE_LANGPACK_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_LANGPACK_PL]
+en-US = "Installs the Polish user interface"
+
+[STR_NAME_MODULE_LANGPACK_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_LANGPACK_RU]
+en-US = "Installs the Russian user interface"
+
+[STR_NAME_MODULE_LANGPACK_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_LANGPACK_TR]
+en-US = "Installs the Turkish user interface"
+
+[STR_NAME_MODULE_LANGPACK_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_LANGPACK_EL]
+en-US = "Installs the Greek user interface"
+
+[STR_NAME_MODULE_LANGPACK_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_LANGPACK_TH]
+en-US = "Installs the Thai user interface"
+
+[STR_NAME_MODULE_LANGPACK_CKB]
+en-US = "Central Kurdish"
+
+[STR_DESC_MODULE_LANGPACK_CKB]
+en-US = "Installs the Central Kurdish user interface"
+
+[STR_NAME_MODULE_LANGPACK_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_LANGPACK_CS]
+en-US = "Installs the Czech user interface"
+
+[STR_NAME_MODULE_LANGPACK_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_LANGPACK_SK]
+en-US = "Installs the Slovak user interface"
+
+[STR_NAME_MODULE_LANGPACK_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_LANGPACK_HR]
+en-US = "Installs the Croatian user interface"
+
+[STR_NAME_MODULE_LANGPACK_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_LANGPACK_ET]
+en-US = "Installs the Estonian user interface"
+
+[STR_NAME_MODULE_LANGPACK_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_LANGPACK_VI]
+en-US = "Installs the Vietnamese user interface"
+
+[STR_NAME_MODULE_LANGPACK_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_LANGPACK_BG]
+en-US = "Installs the Bulgarian user interface"
+
+[STR_NAME_MODULE_LANGPACK_KM]
+en-US = "Khmer"
+
+[STR_DESC_MODULE_LANGPACK_KM]
+en-US = "Installs the Khmer user interface"
+
+[STR_NAME_MODULE_LANGPACK_PA_IN]
+en-US = "Punjabi"
+
+[STR_DESC_MODULE_LANGPACK_PA_IN]
+en-US = "Installs the Punjabi user interface"
+
+[STR_NAME_MODULE_LANGPACK_TA]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA]
+en-US = "Installs the Tamil user interface"
+
+[STR_NAME_MODULE_LANGPACK_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI]
+en-US = "Installs the Hindi user interface"
+
+[STR_NAME_MODULE_LANGPACK_ST]
+en-US = "Southern Sotho (Sutu)"
+
+[STR_DESC_MODULE_LANGPACK_ST]
+en-US = "Installs the Southern Sotho (Sutu) user interface"
+
+[STR_NAME_MODULE_LANGPACK_TN]
+en-US = "Tswana"
+
+[STR_DESC_MODULE_LANGPACK_TN]
+en-US = "Installs the Tswana user interface"
+
+[STR_NAME_MODULE_LANGPACK_XH]
+en-US = "Xhosa"
+
+[STR_DESC_MODULE_LANGPACK_XH]
+en-US = "Installs the Xhosa user interface"
+
+[STR_NAME_MODULE_LANGPACK_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_LANGPACK_ZU]
+en-US = "Installs the Zulu user interface"
+
+[STR_NAME_MODULE_LANGPACK_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_LANGPACK_AF]
+en-US = "Installs the Afrikaans user interface"
+
+[STR_NAME_MODULE_LANGPACK_SW_TZ]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW_TZ]
+en-US = "Installs the Swahili user interface"
+
+[STR_NAME_MODULE_LANGPACK_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_LANGPACK_LO]
+en-US = "Installs the Lao user interface"
+
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs the Burmese (Myanmar) user interface"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
+en-US = "Northern Sotho"
+
+[STR_DESC_MODULE_LANGPACK_NSO]
+en-US = "Installs the Northern Sotho user interface"
+
+[STR_NAME_MODULE_LANGPACK_BN]
+en-US = "Bengali (Bangladesh)"
+
+[STR_DESC_MODULE_LANGPACK_BN]
+en-US = "Installs the Bengali (Bangladesh) user interface"
+
+[STR_NAME_MODULE_LANGPACK_BN_IN]
+en-US = "Bengali (India)"
+
+[STR_DESC_MODULE_LANGPACK_BN_IN]
+en-US = "Installs the Bengali (India) user interface"
+
+[STR_NAME_MODULE_LANGPACK_OR]
+en-US = "Odia"
+
+[STR_DESC_MODULE_LANGPACK_OR]
+en-US = "Installs the Odia user interface"
+
+[STR_NAME_MODULE_LANGPACK_MR]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR]
+en-US = "Installs the Marathi user interface"
+
+[STR_NAME_MODULE_LANGPACK_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_LANGPACK_NE]
+en-US = "Installs the Nepali user interface"
+
+[STR_NAME_MODULE_LANGPACK_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR]
+en-US = "Installs the Arabic user interface"
+
+[STR_NAME_MODULE_LANGPACK_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_LANGPACK_CA]
+en-US = "Installs the Catalan user interface"
+
+[STR_NAME_MODULE_LANGPACK_CA_VALENCIA]
+en-US = "Catalan (Valencian)"
+
+[STR_DESC_MODULE_LANGPACK_CA_VALENCIA]
+en-US = "Installs the Catalan (Valencian) user interface"
+
+[STR_NAME_MODULE_LANGPACK_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_LANGPACK_DA]
+en-US = "Installs the Danish user interface"
+
+[STR_NAME_MODULE_LANGPACK_FI]
+en-US = "Finnish"
+
+[STR_DESC_MODULE_LANGPACK_FI]
+en-US = "Installs the Finnish user interface"
+
+[STR_NAME_MODULE_LANGPACK_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_LANGPACK_HE]
+en-US = "Installs the Hebrew user interface"
+
+[STR_NAME_MODULE_LANGPACK_IS]
+en-US = "Icelandic"
+
+[STR_DESC_MODULE_LANGPACK_IS]
+en-US = "Installs the Icelandic user interface"
+
+[STR_NAME_MODULE_LANGPACK_NB]
+en-US = "Norwegian (Bokmål)"
+
+[STR_DESC_MODULE_LANGPACK_NB]
+en-US = "Installs the Norwegian (Bokmål) user interface"
+
+[STR_NAME_MODULE_LANGPACK_NN]
+en-US = "Norwegian (Nynorsk)"
+
+[STR_DESC_MODULE_LANGPACK_NN]
+en-US = "Installs the Norwegian (Nynorsk) user interface"
+
+[STR_NAME_MODULE_LANGPACK_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_LANGPACK_RO]
+en-US = "Installs the Romanian user interface"
+
+[STR_NAME_MODULE_LANGPACK_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_LANGPACK_SQ]
+en-US = "Installs the Albanian user interface"
+
+[STR_NAME_MODULE_LANGPACK_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_LANGPACK_ID]
+en-US = "Installs the Indonesian user interface"
+
+[STR_NAME_MODULE_LANGPACK_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_LANGPACK_UK]
+en-US = "Installs the Ukrainian user interface"
+
+[STR_NAME_MODULE_LANGPACK_BE]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_LANGPACK_BE]
+en-US = "Installs the Belarusian user interface"
+
+[STR_NAME_MODULE_LANGPACK_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_LANGPACK_SL]
+en-US = "Installs the Slovenian user interface"
+
+[STR_NAME_MODULE_LANGPACK_LV]
+en-US = "Latvian"
+
+[STR_DESC_MODULE_LANGPACK_LV]
+en-US = "Installs the Latvian user interface"
+
+[STR_NAME_MODULE_LANGPACK_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_LANGPACK_LT]
+en-US = "Installs the Lithuanian user interface"
+
+[STR_NAME_MODULE_LANGPACK_EU]
+en-US = "Basque"
+
+[STR_DESC_MODULE_LANGPACK_EU]
+en-US = "Installs the Basque user interface"
+
+[STR_NAME_MODULE_LANGPACK_MK]
+en-US = "Macedonian"
+
+[STR_DESC_MODULE_LANGPACK_MK]
+en-US = "Installs the Macedonian user interface"
+
+[STR_NAME_MODULE_LANGPACK_CY]
+en-US = "Welsh"
+
+[STR_DESC_MODULE_LANGPACK_CY]
+en-US = "Installs the Welsh user interface"
+
+[STR_NAME_MODULE_LANGPACK_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_LANGPACK_GL]
+en-US = "Installs the Galician user interface"
+
+[STR_NAME_MODULE_LANGPACK_SR_LATN]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SR_LATN]
+en-US = "Installs the Serbian (Latin) user interface"
+
+[STR_NAME_MODULE_LANGPACK_GA]
+en-US = "Irish"
+
+[STR_DESC_MODULE_LANGPACK_GA]
+en-US = "Installs the Irish user interface"
+
+[STR_NAME_MODULE_LANGPACK_SR]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR]
+en-US = "Installs the Serbian (Cyrillic) user interface"
+
+[STR_NAME_MODULE_LANGPACK_BS]
+en-US = "Bosnian"
+
+[STR_DESC_MODULE_LANGPACK_BS]
+en-US = "Installs the Bosnian user interface"
+
+[STR_NAME_MODULE_LANGPACK_AST]
+en-US = "Asturian"
+
+[STR_DESC_MODULE_LANGPACK_AST]
+en-US = "Installs the Asturian user interface"
+
+[STR_NAME_MODULE_LANGPACK_RW]
+en-US = "Kinyarwanda"
+
+[STR_DESC_MODULE_LANGPACK_RW]
+en-US = "Installs the Kinyarwanda user interface"
+
+[STR_NAME_MODULE_LANGPACK_FA]
+en-US = "Persian"
+
+[STR_DESC_MODULE_LANGPACK_FA]
+en-US = "Installs the Persian user interface"
+
+[STR_NAME_MODULE_LANGPACK_TT]
+en-US = "Tatar"
+
+[STR_DESC_MODULE_LANGPACK_TT]
+en-US = "Installs the Tatar user interface"
+
+[STR_NAME_MODULE_LANGPACK_TS]
+en-US = "Tsonga"
+
+[STR_DESC_MODULE_LANGPACK_TS]
+en-US = "Installs the Tsonga user interface"
+
+[STR_NAME_MODULE_LANGPACK_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_LANGPACK_BR]
+en-US = "Installs the Breton user interface"
+
+[STR_NAME_MODULE_LANGPACK_NR]
+en-US = "Ndebele South"
+
+[STR_DESC_MODULE_LANGPACK_NR]
+en-US = "Installs the Ndebele South user interface"
+
+[STR_NAME_MODULE_LANGPACK_SS]
+en-US = "Swazi"
+
+[STR_DESC_MODULE_LANGPACK_SS]
+en-US = "Installs the Swazi user interface"
+
+[STR_NAME_MODULE_LANGPACK_VE]
+en-US = "Venda"
+
+[STR_DESC_MODULE_LANGPACK_VE]
+en-US = "Installs the Venda user interface"
+
+[STR_NAME_MODULE_LANGPACK_VEC]
+en-US = "Venetian"
+
+[STR_DESC_MODULE_LANGPACK_VEC]
+en-US = "Installs the Venetian user interface"
+
+[STR_NAME_MODULE_LANGPACK_KN]
+en-US = "Kannada"
+
+[STR_DESC_MODULE_LANGPACK_KN]
+en-US = "Installs the Kannada user interface"
+
+[STR_NAME_MODULE_LANGPACK_TG]
+en-US = "Tajik"
+
+[STR_DESC_MODULE_LANGPACK_TG]
+en-US = "Installs the Tajik user interface"
+
+[STR_NAME_MODULE_LANGPACK_KMR_LATN]
+en-US = "Kurdish"
+
+[STR_DESC_MODULE_LANGPACK_KMR_LATN]
+en-US = "Installs the Kurdish user interface"
+
+[STR_NAME_MODULE_LANGPACK_DZ]
+en-US = "Dzongkha"
+
+[STR_DESC_MODULE_LANGPACK_DZ]
+en-US = "Installs the Dzongkha user interface"
+
+[STR_NAME_MODULE_LANGPACK_KA]
+en-US = "Georgian"
+
+[STR_DESC_MODULE_LANGPACK_KA]
+en-US = "Installs the Georgian user interface"
+
+[STR_NAME_MODULE_LANGPACK_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_LANGPACK_EO]
+en-US = "Installs the Esperanto user interface"
+
+[STR_NAME_MODULE_LANGPACK_GU]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU]
+en-US = "Installs the Gujarati user interface"
+
+[STR_NAME_MODULE_LANGPACK_GUG]
+en-US = "Guarani"
+
+[STR_DESC_MODULE_LANGPACK_GUG]
+en-US = "Installs the Guarani user interface"
+
+[STR_NAME_MODULE_LANGPACK_EN_ZA]
+en-US = "English (South Africa)"
+
+[STR_DESC_MODULE_LANGPACK_EN_ZA]
+en-US = "Installs the English (South Africa) user interface"
+
+[STR_NAME_MODULE_LANGPACK_EN_GB]
+en-US = "English (United Kingdom)"
+
+[STR_DESC_MODULE_LANGPACK_EN_GB]
+en-US = "Installs the English (United Kingdom) user interface"
+
+[STR_NAME_MODULE_LANGPACK_UZ]
+en-US = "Uzbek"
+
+[STR_DESC_MODULE_LANGPACK_UZ]
+en-US = "Installs the Uzbek user interface"
+
+[STR_NAME_MODULE_LANGPACK_MN]
+en-US = "Mongolian"
+
+[STR_DESC_MODULE_LANGPACK_MN]
+en-US = "Installs the Mongolian user interface"
+
+[STR_NAME_MODULE_LANGPACK_BO]
+en-US = "Tibetan"
+
+[STR_DESC_MODULE_LANGPACK_BO]
+en-US = "Installs the Tibetan user interface"
+
+[STR_NAME_MODULE_LANGPACK_OC]
+en-US = "Occitan"
+
+[STR_DESC_MODULE_LANGPACK_OC]
+en-US = "Installs the Occitan user interface"
+
+[STR_NAME_MODULE_LANGPACK_OM]
+en-US = "Oromo"
+
+[STR_DESC_MODULE_LANGPACK_OM]
+en-US = "Installs the Oromo user interface"
+
+[STR_NAME_MODULE_LANGPACK_SI]
+en-US = "Sinhala"
+
+[STR_DESC_MODULE_LANGPACK_SI]
+en-US = "Installs the Sinhala user interface"
+
+[STR_NAME_MODULE_LANGPACK_UG]
+en-US = "Uyghur"
+
+[STR_DESC_MODULE_LANGPACK_UG]
+en-US = "Installs the Uyghur user interface"
+
+[STR_NAME_MODULE_LANGPACK_AS]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_LANGPACK_AS]
+en-US = "Installs the Assamese user interface"
+
+[STR_NAME_MODULE_LANGPACK_BRX]
+en-US = "Bodo"
+
+[STR_DESC_MODULE_LANGPACK_BRX]
+en-US = "Installs the Bodo user interface"
+
+[STR_NAME_MODULE_LANGPACK_DGO]
+en-US = "Dogri"
+
+[STR_DESC_MODULE_LANGPACK_DGO]
+en-US = "Installs the Dogri user interface"
+
+[STR_NAME_MODULE_LANGPACK_GD]
+en-US = "Scottish Gaelic"
+
+[STR_DESC_MODULE_LANGPACK_GD]
+en-US = "Installs the Scottish Gaelic user interface"
+
+[STR_NAME_MODULE_LANGPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_LANGPACK_KK]
+en-US = "Installs the Kazakh user interface"
+
+[STR_NAME_MODULE_LANGPACK_KOK]
+en-US = "Konkani"
+
+[STR_DESC_MODULE_LANGPACK_KOK]
+en-US = "Installs the Konkani user interface"
+
+[STR_NAME_MODULE_LANGPACK_KS]
+en-US = "Kashmiri"
+
+[STR_DESC_MODULE_LANGPACK_KS]
+en-US = "Installs the Kashmiri user interface"
+
+[STR_NAME_MODULE_LANGPACK_MAI]
+en-US = "Maithili"
+
+[STR_DESC_MODULE_LANGPACK_MAI]
+en-US = "Installs the Maithili user interface"
+
+[STR_NAME_MODULE_LANGPACK_ML]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_LANGPACK_ML]
+en-US = "Installs the Malayalam user interface"
+
+[STR_NAME_MODULE_LANGPACK_MNI]
+en-US = "Manipuri"
+
+[STR_DESC_MODULE_LANGPACK_MNI]
+en-US = "Installs the Manipuri user interface"
+
+[STR_NAME_MODULE_LANGPACK_SA_IN]
+en-US = "Sanskrit (India)"
+
+[STR_DESC_MODULE_LANGPACK_SA_IN]
+en-US = "Installs the Sanskrit user interface"
+
+[STR_NAME_MODULE_LANGPACK_SAT]
+en-US = "Santali"
+
+[STR_DESC_MODULE_LANGPACK_SAT]
+en-US = "Installs the Santali user interface"
+
+[STR_NAME_MODULE_LANGPACK_SD]
+en-US = "Sindhi"
+
+[STR_DESC_MODULE_LANGPACK_SD]
+en-US = "Installs the Sindhi user interface"
+
+[STR_NAME_MODULE_LANGPACK_TE]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_LANGPACK_TE]
+en-US = "Installs the Telugu user interface"
+
+[STR_NAME_MODULE_LANGPACK_LB]
+en-US = "Luxembourgish"
+
+[STR_DESC_MODULE_LANGPACK_LB]
+en-US = "Installs the Luxembourgish user interface"
+
+[STR_NAME_MODULE_LANGPACK_AM]
+en-US = "Amharic"
+
+[STR_DESC_MODULE_LANGPACK_AM]
+en-US = "Installs the Amharic user interface"
+
+[STR_NAME_MODULE_LANGPACK_SID]
+en-US = "Sidama"
+
+[STR_DESC_MODULE_LANGPACK_SID]
+en-US = "Installs the Sidama user interface"
+
+[STR_NAME_MODULE_LANGPACK_SZL]
+en-US = "Silesian"
+
+[STR_DESC_MODULE_LANGPACK_SZL]
+en-US = "Installs the Silesian user interface"
+
+[STR_NAME_MODULE_LANGPACK_QTZ]
+en-US = "KeyID"
+
+[STR_DESC_MODULE_LANGPACK_QTZ]
+en-US = "Installs the English user interface with a key ID before each UI element"
diff --git a/scp2/source/ooo/module_libreofficekit.scp b/scp2/source/ooo/module_libreofficekit.scp
new file mode 100644
index 0000000000..80af179c70
--- /dev/null
+++ b/scp2/source/ooo/module_libreofficekit.scp
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/libreofficekit"
+
+Module gid_Module_Libreofficekit
+    Name = "Libreofficekit Data";
+    Description = "Libreofficekit Data";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Root_Brand;
+    Styles = (HIDDEN_ROOT);
+    Dirs = (gid_Dir_Share_Libreofficekit);
+    Files = (auto_libreofficekit_ALL);
+End
+
+Directory gid_Dir_Share_Libreofficekit
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "libreofficekit";
+End
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
new file mode 100644
index 0000000000..a9540d9f6b
--- /dev/null
+++ b/scp2/source/ooo/module_ooo.scp
@@ -0,0 +1,764 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Root
+    Sortkey = "10";
+    PackageInfo = "packinfo_office.txt";
+    InstallOrder = "20";
+    MOD_NAME_DESC(MODULE_ROOT_OSL);
+    Files = (gid_File_Txt_Pagein_Common,
+             gid_File_Txt_Pagein_Calc,
+             gid_File_Txt_Pagein_Draw,
+             gid_File_Txt_Pagein_Impress,
+             gid_File_Txt_Pagein_Writer,
+             gid_File_Rdb_Offapi,
+             gid_Starregistry_Services_Rdb,
+             auto_ooo_ALL,
+             auto_ooobinarytable_ALL,
+             GID_FILE_LIB_WPD,
+             gid_File_Lib_Cli_Oootypes_Assembly,
+             gid_File_Lib_Policy_Cli_Oootypes_Assembly,
+             gid_File_Lib_Policy_Cli_Oootypes_Config,
+             gid_File_Extra_Gallsound,
+             gid_File_Extra_Gallarrows,
+             gid_File_Extra_Gallcomputers,
+             gid_File_Extra_Galldiagrams,
+             gid_File_Extra_Galleducation,
+             gid_File_Extra_Gallenvironment,
+             gid_File_Extra_Gallfinance,
+             gid_File_Extra_Gallpeople,
+             gid_File_Extra_Gallsymbols,
+             gid_File_Extra_Galltransport,
+             gid_File_Extra_Galltxtshapes,
+             gid_File_Extra_Gallsounds,
+             gid_File_Basic_Form,
+             gid_File_Share_Config_Sofficecfg_uiconfig_basicide,
+             gid_File_Share_Config_Sofficecfg_uiconfig_cui,
+#ifdef DBCONNECTIVITY
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbaccess,
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbapp,
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbbrowser,
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbquery,
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbrelation,
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbreport,
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbtable,
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbtdata,
+#endif
+             gid_File_Share_Config_Sofficecfg_uiconfig_desktop,
+             gid_File_Share_Config_Sofficecfg_uiconfig_editeng,
+             gid_File_Share_Config_Sofficecfg_uiconfig_filter,
+             gid_File_Share_Config_Sofficecfg_uiconfig_formula,
+             gid_File_Share_Config_Sofficecfg_uiconfig_fps,
+#ifdef DBCONNECTIVITY
+             gid_File_Share_Config_Sofficecfg_uiconfig_sbibliography,
+#endif
+             gid_File_Share_Config_Sofficecfg_uiconfig_scalc,
+             gid_File_Share_Config_Sofficecfg_uiconfig_schart,
+             gid_File_Share_Config_Sofficecfg_uiconfig_sdraw,
+             gid_File_Share_Config_Sofficecfg_uiconfig_sfx,
+             gid_File_Share_Config_Sofficecfg_uiconfig_sglobal,
+             gid_File_Share_Config_Sofficecfg_uiconfig_simpress,
+             gid_File_Share_Config_Sofficecfg_uiconfig_smath,
+             gid_File_Share_Config_Sofficecfg_uiconfig_startmodule,
+             gid_File_Share_Config_Sofficecfg_uiconfig_svt,
+             gid_File_Share_Config_Sofficecfg_uiconfig_svx,
+             gid_File_Share_Config_Sofficecfg_uiconfig_sweb,
+             gid_File_Share_Config_Sofficecfg_uiconfig_swform,
+             gid_File_Share_Config_Sofficecfg_uiconfig_swreport,
+             gid_File_Share_Config_Sofficecfg_uiconfig_swriter,
+             gid_File_Share_Config_Sofficecfg_uiconfig_swxform,
+             gid_File_Share_Config_Sofficecfg_uiconfig_uui,
+             gid_File_Share_Config_Sofficecfg_uiconfig_vcl,
+             gid_File_Share_Config_Sofficecfg_uiconfig_writerperfect,
+             gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec,
+             gid_File_Share_Registry_Main_Xcd,
+             gid_File_Share_Registry_Forcedefault_Xcd,
+             gid_File_Extra_Fontunxpsprint,
+             gid_File_Extra_Fontunxafm);
+End
+
+Module gid_Module_Prg
+    ParentID = gid_Module_Root;
+    XPDParentID = "root";
+    Sortkey = "100";
+    MOD_NAME_DESC(MODULE_PRG);
+End
+
+Module gid_Module_Optional
+    ParentID = gid_Module_Root;
+    XPDParentID = "root";
+    Sortkey = "200";
+    MOD_NAME_DESC ( MODULE_OPTIONAL );
+End
+
+Module gid_Module_Dictionaries
+    ParentID = gid_Module_Optional;
+    Sortkey = "215";
+    MOD_NAME_DESC ( MODULE_DICTIONARIES );
+End
+
+Module gid_Module_Root_Extension_Dictionary_Af
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AF );
+    Files = (gid_File_Extension_Dictionary_Af);
+    InstallOrder = "2000";
+    Sortkey = "500";
+    Spellcheckerlanguage = "af";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_An
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AN );
+    Files = (gid_File_Extension_Dictionary_An);
+    InstallOrder = "2000";
+    Sortkey = "510";
+    Spellcheckerlanguage = "an";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ar
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AR );
+    Files = (gid_File_Extension_Dictionary_Ar);
+    InstallOrder = "2000";
+    Sortkey = "511";
+    Spellcheckerlanguage = "ar";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Be
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BE );
+    Files = (gid_File_Extension_Dictionary_Be);
+    InstallOrder = "2000";
+    Sortkey = "512";
+    Spellcheckerlanguage = "be";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Bg
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BG );
+    Files = (gid_File_Extension_Dictionary_Bg);
+    InstallOrder = "2000";
+    Sortkey = "513";
+    Spellcheckerlanguage = "bg";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Bn
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BN );
+    Files = (gid_File_Extension_Dictionary_Bn);
+    InstallOrder = "2000";
+    Sortkey = "514";
+    Spellcheckerlanguage = "bn";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Bo
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BO );
+    Files = (gid_File_Extension_Dictionary_Bo);
+    InstallOrder = "2000";
+    Sortkey = "525";
+    Spellcheckerlanguage = "bo";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Br
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BR );
+    Files = (gid_File_Extension_Dictionary_Br);
+    InstallOrder = "2000";
+    Sortkey = "515";
+    Spellcheckerlanguage = "br";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Bs
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BS );
+    Files = (gid_File_Extension_Dictionary_Bs);
+    InstallOrder = "2000";
+    Sortkey = "517";
+    Spellcheckerlanguage = "bs";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ca
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CA );
+    Files = (gid_File_Extension_Dictionary_Ca);
+    InstallOrder = "2000";
+    Sortkey = "520";
+    Spellcheckerlanguage = "ca";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ckb
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CKB );
+    Files = (gid_File_Extension_Dictionary_Ckb);
+    InstallOrder = "2000";
+    Sortkey = "525";
+    Spellcheckerlanguage = "ckb";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Cs
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CS );
+    Files = (gid_File_Extension_Dictionary_Cs);
+    InstallOrder = "2000";
+    Sortkey = "530";
+    Spellcheckerlanguage = "cs";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Da
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DA );
+    Files = (gid_File_Extension_Dictionary_Da);
+    Sortkey = "540";
+    InstallOrder = "2000";
+    Spellcheckerlanguage = "da";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_De
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE );
+    Files = (gid_File_Extension_Dictionary_De);
+    InstallOrder = "2000";
+    Sortkey = "570";
+    Spellcheckerlanguage = "de";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_En
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EN );
+    Files = (gid_File_Extension_Dictionary_En, gid_File_Extra_Wordbook_en_US, gid_File_Extra_Wordbook_en_GB);
+    InstallOrder = "2000";
+    Sortkey = "550";
+    Spellcheckerlanguage = "en";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_El
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EL );
+    Files = (gid_File_Extension_Dictionary_El);
+    InstallOrder = "2000";
+    Sortkey = "719";
+    Spellcheckerlanguage = "el";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Eo
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EO );
+    Files = (gid_File_Extension_Dictionary_Eo);
+    InstallOrder = "2000";
+    Sortkey = "721";
+    Spellcheckerlanguage = "eo";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Es
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ES );
+    Files = (gid_File_Extension_Dictionary_Es);
+    InstallOrder = "2000";
+    Sortkey = "720";
+    Spellcheckerlanguage = "es";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Et
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ET );
+    Files = (gid_File_Extension_Dictionary_Et);
+    InstallOrder = "2000";
+    Sortkey = "555";
+    Spellcheckerlanguage = "et";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Fa
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_FA );
+    Files = (gid_File_Extension_Dictionary_Fa);
+    InstallOrder = "2000";
+    Sortkey = "658";
+    Spellcheckerlanguage = "fa";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Fr
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_FR );
+    Files = (gid_File_Extension_Dictionary_Fr);
+    InstallOrder = "2000";
+    Sortkey = "560";
+    Spellcheckerlanguage = "fr";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Gd
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_GD );
+    Files = (gid_File_Extension_Dictionary_Gd);
+    InstallOrder = "2000";
+    Sortkey = "563";
+    Spellcheckerlanguage = "gd";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Gl
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_GL );
+    Files = (gid_File_Extension_Dictionary_Gl);
+    InstallOrder = "2000";
+    Sortkey = "565";
+    Spellcheckerlanguage = "gl";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Gu
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_GU );
+    Files = (gid_File_Extension_Dictionary_Gu);
+    InstallOrder = "2000";
+    Sortkey = "567";
+    Spellcheckerlanguage = "gu";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_He
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HE );
+    Files = (gid_File_Extension_Dictionary_He);
+    InstallOrder = "2000";
+    Sortkey = "590";
+    Spellcheckerlanguage = "he";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Hi
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HI );
+    Files = (gid_File_Extension_Dictionary_Hi);
+    InstallOrder = "2000";
+    Sortkey = "595";
+    Spellcheckerlanguage = "hi";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Hu
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HU );
+    Files = (gid_File_Extension_Dictionary_Hu, gid_File_Extra_Wordbook_hu_AkH11);
+    InstallOrder = "2000";
+    Sortkey = "600";
+    Spellcheckerlanguage = "hu";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Hr
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HR );
+    Files = (gid_File_Extension_Dictionary_Hr);
+    InstallOrder = "2000";
+    Sortkey = "605";
+    Spellcheckerlanguage = "hr";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Id
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ID );
+    Files = (gid_File_Extension_Dictionary_Id);
+    InstallOrder = "2000";
+    Sortkey = "607";
+    Spellcheckerlanguage = "id";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Is
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_IS );
+    Files = (gid_File_Extension_Dictionary_Is);
+    InstallOrder = "2000";
+    Sortkey = "617";
+    Spellcheckerlanguage = "is";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_It
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_IT );
+    Files = (gid_File_Extension_Dictionary_It);
+    InstallOrder = "2000";
+    Sortkey = "610";
+    Spellcheckerlanguage = "it";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Kmr_Latn
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_KMR_LATN );
+    Files = (gid_File_Extension_Dictionary_Kmr_Latn);
+    InstallOrder = "2000";
+    Sortkey = "620";
+    Spellcheckerlanguage = "kmr-Latn";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ko
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_KO );
+    Files = (gid_File_Extension_Dictionary_Ko);
+    InstallOrder = "2000";
+    Sortkey = "623";
+    Spellcheckerlanguage = "ko";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Lt
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LT );
+    Files = (gid_File_Extension_Dictionary_Lt);
+    InstallOrder = "2000";
+    Sortkey = "630";
+    Spellcheckerlanguage = "lt";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Lo
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LO );
+    Files = (gid_File_Extension_Dictionary_Lo);
+    InstallOrder = "2000";
+    Sortkey = "633";
+    Spellcheckerlanguage = "lo";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Lv
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LV );
+    Files = (gid_File_Extension_Dictionary_Lv);
+    InstallOrder = "2000";
+    Sortkey = "635";
+    Spellcheckerlanguage = "lv";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Mn
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_MN );
+    Files = (gid_File_Extension_Dictionary_Mn);
+    InstallOrder = "2000";
+    Sortkey = "637";
+    Spellcheckerlanguage = "mn";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ne
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NE );
+    Files = (gid_File_Extension_Dictionary_Ne);
+    InstallOrder = "2000";
+    Sortkey = "640";
+    Spellcheckerlanguage = "ne";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Nl
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NL );
+    Files = (gid_File_Extension_Dictionary_Nl);
+    InstallOrder = "2000";
+    Sortkey = "545";
+    Spellcheckerlanguage = "nl";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_No
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NO );
+    Files = (gid_File_Extension_Dictionary_No);
+    InstallOrder = "2000";
+    Sortkey = "650";
+    Spellcheckerlanguage = "no";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Oc
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_OC );
+    Files = (gid_File_Extension_Dictionary_Oc);
+    InstallOrder = "2000";
+    Sortkey = "655";
+    Spellcheckerlanguage = "oc";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Pl
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PL );
+    Files = (gid_File_Extension_Dictionary_Pl);
+    InstallOrder = "2000";
+    Sortkey = "660";
+    Spellcheckerlanguage = "pl";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Pt_Br
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PT_BR );
+    Files = (gid_File_Extension_Dictionary_Pt_Br);
+    InstallOrder = "2000";
+    Sortkey = "515";
+    Spellcheckerlanguage = "pt-BR";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Pt_Pt
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PT_PT );
+    Files = (gid_File_Extension_Dictionary_Pt_Pt);
+    InstallOrder = "2000";
+    Sortkey = "515";
+    Spellcheckerlanguage = "pt-PT";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ro
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_RO );
+    Files = (gid_File_Extension_Dictionary_Ro);
+    InstallOrder = "2000";
+    Sortkey = "670";
+    Spellcheckerlanguage = "ro";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Ru
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_RU );
+    Files = (gid_File_Extension_Dictionary_Ru);
+    InstallOrder = "2000";
+    Sortkey = "680";
+    Spellcheckerlanguage = "ru";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Si
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SI );
+    Files = (gid_File_Extension_Dictionary_Si);
+    InstallOrder = "2000";
+    Sortkey = "690";
+    Spellcheckerlanguage = "si";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sk
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SK );
+    Files = (gid_File_Extension_Dictionary_Sk);
+    InstallOrder = "2000";
+    Sortkey = "700";
+    Spellcheckerlanguage = "sk";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sl
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SL );
+    Files = (gid_File_Extension_Dictionary_Sl, gid_File_Extra_Wordbook_sl);
+    InstallOrder = "2000";
+    Sortkey = "710";
+    Spellcheckerlanguage = "sl";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sq
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SQ );
+    Files = (gid_File_Extension_Dictionary_Sq);
+    InstallOrder = "2000";
+    Sortkey = "505";
+    Spellcheckerlanguage = "sq";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sr
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SR );
+    Files = (gid_File_Extension_Dictionary_Sr);
+    InstallOrder = "2000";
+    Sortkey = "690";
+    Spellcheckerlanguage = "sr";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sv
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SV );
+    Files = (gid_File_Extension_Dictionary_Sv);
+    InstallOrder = "2000";
+    Sortkey = "740";
+    Spellcheckerlanguage = "sv";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Sw
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SW );
+    Files = (gid_File_Extension_Dictionary_Sw);
+    InstallOrder = "2000";
+    Sortkey = "730";
+    Spellcheckerlanguage = "sw";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Te
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_TE );
+    Files = (gid_File_Extension_Dictionary_Te);
+    InstallOrder = "2000";
+    Sortkey = "748";
+    Spellcheckerlanguage = "te";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Th
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_TH );
+    Files = (gid_File_Extension_Dictionary_Th);
+    InstallOrder = "2000";
+    Sortkey = "750";
+    Spellcheckerlanguage = "th";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Tr
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_TR );
+    Files = (gid_File_Extension_Dictionary_Tr);
+    InstallOrder = "2000";
+    Sortkey = "505";
+    Spellcheckerlanguage = "tr";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Uk
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_UK );
+    Files = (gid_File_Extension_Dictionary_Uk);
+    InstallOrder = "2000";
+    Sortkey = "755";
+    Spellcheckerlanguage = "uk";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Vi
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_VI );
+    Files = (gid_File_Extension_Dictionary_Vi);
+    InstallOrder = "2000";
+    Sortkey = "760";
+    Spellcheckerlanguage = "vi";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Zu
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ZU );
+    Files = (gid_File_Extension_Dictionary_Zu);
+    InstallOrder = "2000";
+    Sortkey = "770";
+    Spellcheckerlanguage = "zu";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
new file mode 100644
index 0000000000..f6b94dd637
--- /dev/null
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -0,0 +1,395 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_ROOT_OSL]
+en-US = "%PRODUCTNAME %PRODUCTVERSION"
+
+[STR_DESC_MODULE_ROOT_OSL]
+en-US = "%PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_PRG]
+en-US = "%PRODUCTNAME Program Modules"
+
+[STR_DESC_MODULE_PRG]
+en-US = "List of all installable %PRODUCTNAME modules."
+
+[STR_NAME_MODULE_OPTIONAL]
+en-US = "Optional Components"
+
+[STR_DESC_MODULE_OPTIONAL]
+en-US = "Common components and additional programs shared by all %PRODUCTNAME programs."
+
+[STR_NAME_MODULE_DICTIONARIES]
+en-US = "Dictionaries"
+
+[STR_DESC_MODULE_DICTIONARIES]
+en-US = "Spelling dictionaries, hyphenation rules, thesauri and grammar checkers."
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_AF]
+en-US = "Afrikaans spelling dictionary, and hyphenation rules"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_AN]
+en-US = "Aragonese"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_AN]
+en-US = "Aragonese spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_AR]
+en-US = "Arabic spelling dictionary, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_BE]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_BE]
+en-US = "Belarusian spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_BG]
+en-US = "Bulgarian spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_BN]
+en-US = "Bengali"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_BN]
+en-US = "Bengali spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_BO]
+en-US = "Classical Tibetan"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_BO]
+en-US = "Classical Tibetan syllable spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_BR]
+en-US = "Breton spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_BS]
+en-US = "Bosnian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_BS]
+en-US = "Bosnian spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_CA]
+en-US = "Catalan spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_CKB]
+en-US = "Central Kurdish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_CKB]
+en-US = "Central Kurdish spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_CS]
+en-US = "Czech spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_DA]
+en-US = "Danish spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE]
+en-US = "German (Austria, Germany, Switzerland) spelling dictionaries, hyphenation rules, and thesauri"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_EN]
+en-US = "English"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_EN]
+en-US = "English spelling dictionaries, hyphenation rules, thesaurus, and grammar checker"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_EL]
+en-US = "Greek spelling dictionary, and hyphenation rules"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_EO]
+en-US = "Esperanto spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_ES]
+en-US = "Spanish spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_ET]
+en-US = "Estonian spelling dictionary, and hyphenation rules"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_FA]
+en-US = "Persian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_FA]
+en-US = "Persian Spell Checking Dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_FR]
+en-US = "French spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_GD]
+en-US = "Scottish Gaelic"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_GD]
+en-US = "Scottish Gaelic spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_GL]
+en-US = "Galician spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_GU]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_GU]
+en-US = "Gujarati spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_HE]
+en-US = "Hebrew spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_HI]
+en-US = "Hindi spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_HU]
+en-US = "Hungarian spelling dictionary, hyphenation rules, thesaurus, and grammar checker"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_HR]
+en-US = "Croatian spelling dictionary, and hyphenation rules"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_ID]
+en-US = "Indonesian spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_IS]
+en-US = "Icelandic"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_IS]
+en-US = "Icelandic spelling dictionary and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_IT]
+en-US = "Italian spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_KMR_LATN]
+en-US = "Kurdish, Northern, Latin script"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_KMR_LATN]
+en-US = "Kurdish, Northern, Latin script spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_KO]
+en-US = "Korean spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_LO]
+en-US = "Lao spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_LT]
+en-US = "Lithuanian spelling dictionary, and hyphenation rules"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_LV]
+en-US = "Latvian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_LV]
+en-US = "Latvian spelling dictionary, and hyphenation rules"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_MN]
+en-US = "Mongolian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_MN]
+en-US = "Mongolian spelling dictionary, and hyphenation rules"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_NE]
+en-US = "Nepali spelling dictionary, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_NL]
+en-US = "Dutch spelling dictionary, and hyphenation rules"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_NO]
+en-US = "Norwegian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_NO]
+en-US = "Norwegian (Nynorsk and Bokmal) spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_OC]
+en-US = "Occitan"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_OC]
+en-US = "Occitan spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_PL]
+en-US = "Polish spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_PT_BR]
+en-US = "Portuguese (Brazil) spelling Dictionary (1990 Spelling Agreement), and hyphenation rules"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_PT_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_PT_PT]
+en-US = "European Portuguese spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_RO]
+en-US = "Romanian spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_RU]
+en-US = "Russian spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SI]
+en-US = "Sinhala"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SI]
+en-US = "Sinhala spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SK]
+en-US = "Slovak spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SL]
+en-US = "Slovenian spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SQ]
+en-US = "Albanian spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SR]
+en-US = "Serbian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SR]
+en-US = "Serbian (Cyrillic and Latin) spelling dictionary, and hyphenation rules"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SV]
+en-US = "Swedish spelling dictionary, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_SW]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_SW]
+en-US = "Swahili spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_TE]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_TE]
+en-US = "Telugu spelling dictionary, and hyphenation rules"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_TH]
+en-US = "Thai spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_TR]
+en-US = "Turkish spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_UK]
+en-US = "Ukrainian spelling dictionary, hyphenation rules, and thesaurus"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_VI]
+en-US = "Vietnamese spelling dictionary"
+
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_ZU]
+en-US = "Zulu hyphenation rules"
diff --git a/scp2/source/ooo/module_pdfimport.scp b/scp2/source/ooo/module_pdfimport.scp
new file mode 100644
index 0000000000..25e0a92d4f
--- /dev/null
+++ b/scp2/source/ooo/module_pdfimport.scp
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+// This module is normally included unconditionally in the core installation, it
+// provides various import filters for both plain PDF and hybrid PDF/ODF.  For
+// --with-system-poppler builds it can be advantageous though to package this
+// module as an individual, optional part, so that the core installation does
+// not feature a dependency on a poppler package.
+
+// The /org.openoffice.TypeDetection.Types/Types/pdf_Portable_Document_Format
+// configuration node contained in pdfimport.xcd needs to override a
+// node with the same name but which lacks import functionality and
+// which is duplicated across calc, draw, impress, math, writer .xcd
+// files.  For this to work, there is a hack in
+// postprocess/packregistry/makefile.mk to make pdfimport.xcd depend
+// on all those other .xcd files (optionally, as not all of the other
+// .xcd files need to be present in a given installation).
+
+#include "macros.inc"
+
+#include "AutoInstall/pdfimport"
+
+Module gid_Module_Pdfimport
+    Name = "PDF Import";
+    Description = "PDF Import";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Root_Brand;
+    Styles = (HIDDEN_ROOT);
+    Dirs = (gid_Dir_Share_Xpdfimport);
+    Files = (auto_pdfimport_ALL,
+        gid_File_Xcd_Pdfimport);
+End
+
+Directory gid_Dir_Share_Xpdfimport
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "xpdfimport";
+End
+
+File gid_File_Xcd_Pdfimport
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "pdfimport.xcd";
+    Styles = (PACKED);
+End
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/source/ooo/module_reportbuilder.scp b/scp2/source/ooo/module_reportbuilder.scp
new file mode 100644
index 0000000000..4b6c02673e
--- /dev/null
+++ b/scp2/source/ooo/module_reportbuilder.scp
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/reportbuilder"
+
+Module gid_Module_Reportbuilder
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_REPORTDESIGN); 
+    ParentID = gid_Module_Optional;
+    Styles = ( );
+    Default = YES; 
+    Dirs = (gid_Dir_Share_Reportbuilder);
+    Files = (auto_reportbuilder_ALL,
+        gid_File_Xcd_Reportbuilder);
+End
+
+Directory gid_Dir_Share_Reportbuilder
+    ParentID = gid_Brand_Dir_Share;
+    DosName = "reportbuilder";
+End
+
+File gid_File_Xcd_Reportbuilder
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "reportbuilder.xcd";
+    Styles = (PACKED);
+End
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/source/ooo/module_reportbuilder.ulf b/scp2/source/ooo/module_reportbuilder.ulf
new file mode 100644
index 0000000000..626f242e7a
--- /dev/null
+++ b/scp2/source/ooo/module_reportbuilder.ulf
@@ -0,0 +1,13 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */ 
+
+[STR_NAME_MODULE_OPTIONAL_REPORTDESIGN]
+en-US = "Report Builder"
+
+[STR_DESC_MODULE_OPTIONAL_REPORTDESIGN]
+en-US = "Report Builder helps to design database reports. It requires Java."
diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp
new file mode 100644
index 0000000000..b42f2c4fa5
--- /dev/null
+++ b/scp2/source/ooo/module_systemint.scp
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Systemintegration
+  #ifdef WNT
+    ParentID = gid_Module_Root;
+  #else
+    ParentID = gid_Module_Optional;
+  #endif
+    Sortkey = "800";
+    MOD_NAME_DESC(MODULE_OPTIONAL_SYSTEMINTEGRATION);
+  #ifdef WNT
+    Styles = (HIDDEN_ROOT);
+  #else
+    Styles = (SYSTEMMODULE,NOTRELOCATABLE,INSTALLCANFAIL,USEFORCE);
+  #endif
+  #if (defined(LINUX)) || (defined(SOLARIS))
+    PackageName = "${SYSTEMINTUNIXPACKAGENAME}-desktop-integration.tar.gz";
+  #else
+    PackageName = "";
+  #endif
+	InstallOrder = "desktop-integration:1050, freedesktop-menus:1250";
+End
+
diff --git a/scp2/source/ooo/module_systemint.ulf b/scp2/source/ooo/module_systemint.ulf
new file mode 100644
index 0000000000..d17959b605
--- /dev/null
+++ b/scp2/source/ooo/module_systemint.ulf
@@ -0,0 +1,23 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+ 
+[STR_NAME_MODULE_OPTIONAL_SYSTEMINTEGRATION]
+en-US = "Desktop integration"
+
+[STR_DESC_MODULE_OPTIONAL_SYSTEMINTEGRATION]
+en-US = "Desktop integration of %PRODUCTNAME %PRODUCTVERSION."
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
new file mode 100644
index 0000000000..6ca5dba8db
--- /dev/null
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -0,0 +1,135 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "config_folders.h"
+
+Profile gid_Profile_Louno_ini
+    ModuleID = gid_Module_Root;
+    Name = PROFILENAME(louno);
+    Dir = GID_BRAND_DIR_ETC;
+    Styles = (NETWORK);
+End
+
+ProfileItem gid_Profileitem_Louno_Uno_Bundled_Extensions
+    ProfileID = gid_Profile_Louno_ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "BUNDLED_EXTENSIONS";
+    Value = "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/extensions";
+End
+
+ProfileItem gid_Profileitem_Louno_Uno_Bundled_Extensions_User
+    ProfileID = gid_Profile_Louno_ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "BUNDLED_EXTENSIONS_USER";
+    Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled";
+End
+
+ProfileItem gid_Profileitem_Louno_Uno_Shared_Packages
+    ProfileID = gid_Profile_Louno_ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "UNO_SHARED_PACKAGES";
+    Value = "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/uno_packages";
+End
+
+ProfileItem gid_Profileitem_Louno_Uno_Shared_Packages_Cache
+    ProfileID = gid_Profile_Louno_ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 2;
+    Key = "UNO_SHARED_PACKAGES_CACHE";
+    Value = "$UNO_SHARED_PACKAGES/cache";
+End
+
+ProfileItem gid_Profileitem_Louno_Uno_Shared_Extensions_User
+    ProfileID = gid_Profile_Louno_ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "SHARED_EXTENSIONS_USER";
+    Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/shared";
+End
+
+ProfileItem gid_Profileitem_Louno_Uno_User_Packages
+    ProfileID = gid_Profile_Louno_ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 3;
+    Key = "UNO_USER_PACKAGES";
+    Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/uno_packages";
+End
+
+ProfileItem gid_Profileitem_Louno_Uno_Bundled_Tmp_Extensions
+    ProfileID = gid_Profile_Louno_ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "TMP_EXTENSIONS";
+    Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/tmp";
+End
+
+ProfileItem gid_Profileitem_Louno_Uno_Bundled_Bak_Extensions
+    ProfileID = gid_Profile_Louno_ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 1;
+    Key = "BAK_EXTENSIONS";
+    Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bak";
+End
+
+ProfileItem gid_Profileitem_Louno_Uno_User_Packages_Cache
+    ProfileID = gid_Profile_Louno_ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 4;
+    Key = "UNO_USER_PACKAGES_CACHE";
+    Value = "$UNO_USER_PACKAGES/cache";
+End
+ProfileItem gid_Profileitem_Louno_Pkg_BundledUnoFile
+    ProfileID = gid_Profile_Louno_ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 5;
+    Key = "PKG_BundledUnoFile";
+    Value = "$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
+End
+
+ProfileItem gid_Profileitem_Louno_Pkg_SharedUnoFile
+    ProfileID = gid_Profile_Louno_ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 5;
+    Key = "PKG_SharedUnoFile";
+    Value = "$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
+End
+
+ProfileItem gid_Profileitem_Louno_Pkg_UserUnoFile
+    ProfileID = gid_Profile_Louno_ini;
+    ModuleID = gid_Module_Root;
+    Section = "Bootstrap";
+    Order = 6;
+    Key = "PKG_UserUnoFile";
+    Value = "$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
+End
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
new file mode 100644
index 0000000000..9a7998ace4
--- /dev/null
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -0,0 +1,682 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+RegistryItem gid_Regitem_Bau
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".bau";
+    ModuleID = gid_Module_Root;
+    Value = "soffice.StarConfigFile.6";
+End
+
+RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e_
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "AppID\{82154420-0FBF-11d4-8313-005004526AB4}";
+    ModuleID = gid_Module_Root;
+    Value = "%PRODUCTNAME Service Manager (Ver 1.0)";
+End
+
+RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e_soffice
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "AppID\soffice.exe";
+    ModuleID = gid_Module_Root;
+    Value = "%PRODUCTNAME Service Manager (Ver 1.0)";
+End
+
+RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}";
+    ModuleID = gid_Module_Root;
+    Value = "%PRODUCTNAME Service Manager (Ver 1.0)";
+End
+
+RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_AppID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}";
+    ModuleID = gid_Module_Root;
+    Name = "AppID";
+    Value = "{82154420-0FBF-11d4-8313-005004526AB4}";
+End
+
+RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af__Localserver32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}\LocalServer32";
+    ModuleID = gid_Module_Root;
+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
+End
+
+RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af__Notinsertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}\NotInsertable";
+    ModuleID = gid_Module_Root;
+    Value = "";
+End
+
+RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af__Progid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}\ProgID";
+    ModuleID = gid_Module_Root;
+    Value = "com.sun.star.ServiceManager.1";
+End
+
+RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af__Programmable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}\Programmable";
+    ModuleID = gid_Module_Root;
+    Value = "";
+End
+
+RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af__Versionindependentprogid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}\VersionIndependentProgID";
+    ModuleID = gid_Module_Root;
+    Value = "com.sun.star.ServiceManager";
+End
+
+RegistryItem gid_Regitem_Sdg
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".sdg";
+    ModuleID = gid_Module_Root;
+    Value = "soffice.StarConfigFile.6";
+End
+
+RegistryItem gid_Regitem_Sdv
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".sdv";
+    ModuleID = gid_Module_Root;
+    Value = "soffice.StarConfigFile.6";
+End
+
+RegistryItem gid_Regitem_Sob
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".sob";
+    ModuleID = gid_Module_Root;
+    Value = "soffice.StarConfigFile.6";
+End
+
+RegistryItem gid_Regitem_Sop
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".sop";
+    ModuleID = gid_Module_Root;
+    Value = "soffice.StarConfigFile.6";
+End
+
+RegistryItem gid_Regitem_Soc
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".soc";
+    ModuleID = gid_Module_Root;
+    Value = "soffice.StarConfigFile.6";
+End
+
+RegistryItem gid_Regitem_Sod
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".sod";
+    ModuleID = gid_Module_Root;
+    Value = "soffice.StarConfigFile.6";
+End
+
+RegistryItem gid_Regitem_Soe
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".soe";
+    ModuleID = gid_Module_Root;
+    Value = "soffice.StarConfigFile.6";
+End
+
+RegistryItem gid_Regitem_Soffice_Starconfigfile_6
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarConfigFile.6";
+    ModuleID = gid_Module_Root;
+    REG_VALUE_LNG(SO60_CONFIGFILE)
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Soffice_Exe
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\soffice.exe";
+    ModuleID = gid_Module_Root;
+    Value = "<progpath>\program\soffice.exe";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Soffice_Exepath
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\soffice.exe";
+    ModuleID = gid_Module_Root;
+    Name = "Path";
+    Value = "<progpath>";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Unopkg_Exe
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\unopkg.exe";
+    ModuleID = gid_Module_Root;
+    Value = "<progpath>\program\unopkg.exe";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Unopkg_Exepath
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\unopkg.exe";
+    ModuleID = gid_Module_Root;
+    Name = "Path";
+    Value = "<progpath>";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Displayname
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
+    ModuleID = gid_Module_Root;
+    Name = "DisplayName";
+#if defined WINDOWS_X64
+    Value = "%PRODUCTNAME %PRODUCTVERSION 64-bit";
+#else
+    Value = "%PRODUCTNAME %PRODUCTVERSION 32-bit";
+#endif
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Displayname2
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
+    ModuleID = gid_Module_Root;
+    Name = "DisplayIcon";
+    Value = "<progpath>\program\setup.exe";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Displayversion
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Root;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
+    Name = "DisplayVersion";
+    Value = "%PRODUCTVERSION";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Helplink
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Root;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
+    Name = "HelpLink";
+    Value = "http://www.libreoffice.org";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Modifypath
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Root;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
+    Name = "ModifyPath";
+    Value = "<progpath>\program\setup.exe -reinstall";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Publisher
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Root;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
+    Name = "Publisher";
+    Value = "The Document Foundation for the LibreOffice Community";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Uninstallstring
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
+    ModuleID = gid_Module_Root;
+    Name = "UninstallString";
+    Value = "<progpath>\program\setup.exe -deinstall";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Urlinfoabout
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Root;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
+    Name = "URLInfoAbout";
+    Value = "http://www.libreoffice.org/";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Urlupdateinfo
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Root;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
+    Name = "URLUpdateInfo";
+    Value = "http://download.libreoffice.org";
+End
+
+RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\LibreOffice\%PRODUCTNAME\%PRODUCTVERSION";
+	ModuleID = gid_Module_Root;
+	Name = "Path";
+	Value = "<progpath>\program\soffice.exe";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Install
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
+	ModuleID = gid_Module_Root;
+	Name = "INSTALLLOCATION";
+	Value = "[INSTALLLOCATION]";
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Install
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
+	ModuleID = gid_Module_Root;
+	Name = "INSTALLLOCATION";
+	Value = "[INSTALLLOCATION]";
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
+End
+
+RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+	ModuleID = gid_Module_Root;
+	Name = "INSTALLLOCATION";
+	Value = "[INSTALLLOCATION]";
+	Styles = (ALWAYS_REQUIRED);
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Officeinstall
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
+	ModuleID = gid_Module_Root;
+	Name = "OFFICEINSTALLLOCATION";
+	Value = "[INSTALLLOCATION]";
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,UPGRADEKEY);
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Productversion
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
+	ModuleID = gid_Module_Root;
+	Name = "ProductVersion";
+	Value = "[ProductVersion]";
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Officeinstall
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
+	ModuleID = gid_Module_Root;
+	Name = "OFFICEINSTALLLOCATION";
+	Value = "[INSTALLLOCATION]";
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Productversion
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
+	ModuleID = gid_Module_Root;
+	Name = "ProductVersion";
+	Value = "[ProductVersion]";
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
+End
+
+RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+	ModuleID = gid_Module_Root;
+	Name = "OFFICEINSTALLLOCATION";
+	Value = "[INSTALLLOCATION]";
+	Styles = (ALWAYS_REQUIRED);
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
+	ModuleID = gid_Module_Root;
+	Name = "BASISINSTALLLOCATION";
+	Value = "[INSTALLLOCATION]";
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
+	ModuleID = gid_Module_Root;
+	Name = "BASISINSTALLLOCATION";
+	Value = "[INSTALLLOCATION]";
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
+End
+
+RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\Basis\%PRODUCTVERSION";
+	ModuleID = gid_Module_Root;
+	Name = "BASISINSTALLLOCATION";
+	Value = "[INSTALLLOCATION]";
+	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_PRODUCTVERSION);
+End
+
+RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+	ModuleID = gid_Module_Root;
+	Name = "BASISINSTALLLOCATION";
+	Value = "[INSTALLLOCATION]";
+	Styles = (ALWAYS_REQUIRED);
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
+	ModuleID = gid_Module_Root;
+	Name = "UREINSTALLLOCATION";
+	Value = "[INSTALLLOCATION]URE\\";
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
+	ModuleID = gid_Module_Root;
+	Name = "UREINSTALLLOCATION";
+	Value = "[INSTALLLOCATION]URE\\";
+	Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
+End
+
+RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
+	ModuleID = gid_Module_Root;
+	Name = "UREINSTALLLOCATION";
+	Value = "[INSTALLLOCATION]URE\\";
+	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION);
+End
+
+RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+	ModuleID = gid_Module_Root;
+	Name = "UREINSTALLLOCATION";
+	Value = "[INSTALLLOCATION]URE\\";
+	Styles = (ALWAYS_REQUIRED);
+End
+
+RegistryItem gid_Regitem_Sog
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".sog";
+    ModuleID = gid_Module_Root;
+    Value = "soffice.StarConfigFile.6";
+End
+
+RegistryItem gid_Regitem_Soh
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".soh";
+    ModuleID = gid_Module_Root;
+    Value = "soffice.StarConfigFile.6";
+End
+
+RegistryItem gid_Regitem_Stardiv_Uno_Servicemanager
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "com.sun.star.ServiceManager";
+    ModuleID = gid_Module_Root;
+    Value = "%PRODUCTNAME Service Manager";
+End
+
+RegistryItem gid_Regitem_Stardiv_Uno_Servicemanager_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "com.sun.star.ServiceManager.1";
+    ModuleID = gid_Module_Root;
+    Value = "%PRODUCTNAME Service Manager (Ver 1.0)";
+End
+
+RegistryItem gid_Regitem_Stardiv_Uno_Servicemanager_1_Clsid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "com.sun.star.ServiceManager.1\CLSID";
+    ModuleID = gid_Module_Root;
+    Value = "{82154420-0FBF-11d4-8313-005004526AB4}";
+End
+
+RegistryItem gid_Regitem_Stardiv_Uno_Servicemanager_1_Notinsertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "com.sun.star.ServiceManager.1\NotInsertable";
+    ModuleID = gid_Module_Root;
+    Value = "";
+End
+
+RegistryItem gid_Regitem_Stardiv_Uno_Servicemanager_Clsid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "com.sun.star.ServiceManager\CLSID";
+    ModuleID = gid_Module_Root;
+    Value = "{82154420-0FBF-11d4-8313-005004526AB4}";
+End
+
+RegistryItem gid_Regitem_Stardiv_Uno_Servicemanager_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "com.sun.star.ServiceManager\CurVer";
+    ModuleID = gid_Module_Root;
+    Value = "com.sun.star.ServiceManager.1";
+End
+
+RegistryItem gid_Regitem_Stardiv_Uno_Servicemanager_Notinsertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "com.sun.star.ServiceManager\NotInsertable";
+    ModuleID = gid_Module_Root;
+    Value = "";
+End
+
+RegistryItem gid_Regitem_Thm
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".thm";
+    ModuleID = gid_Module_Root;
+    Value = "soffice.StarConfigFile.6";
+End
+
+RegistryItem gid_Regitem_Vor_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Subkey = ".vor";
+    Name = "Content Type";
+    Value = "application/vnd.stardivision.writer";
+End
+
+RegistryItem gid_Regitem_Vor_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.writer";
+    Name = "Extension";
+    Value = ".vor";
+End
+
+RegistryItem gid_Regitem_Xba
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".xba";
+    ModuleID = gid_Module_Root;
+    Value = "soffice.StarConfigFile.6";
+End
+
+RegistryItem gid_Regitem_Xcs
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".xcs";
+    ModuleID = gid_Module_Root;
+    Value = "soffice.StarConfigFile.6";
+End
+
+RegistryItem gid_Regitem_Xcu
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".xcu";
+    ModuleID = gid_Module_Root;
+    Value = "soffice.StarConfigFile.6";
+End
+
+RegistryItem gid_Regitem_Xdl
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".xdl";
+    ModuleID = gid_Module_Root;
+    Value = "soffice.StarConfigFile.6";
+End
+
+RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\LibreOffice\UNO\InstallPath";
+    ModuleID = gid_Module_Root;
+    Value  = "<progpath>\program";
+End
+
+RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\LibreOffice\UNO\InstallPath";
+    ModuleID = gid_Module_Root;
+    Name = "%PRODUCTNAME %PRODUCTVERSION";
+    Value  = "<progpath>\program";
+End
+
+// "OpenWith" Windows Registry keys for extensions supported by OOo
+
+// new oxt file extension for office extension packages
+RegistryItem gid_Regitem_Oxt
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Subkey = ".oxt";
+    Value = "office.Extension.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Oxt_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Subkey = ".oxt";
+    Name = "Content Type";
+    Value = "application/vnd.openofficeorg.extension";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Oxt_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Subkey = "MIME\Database\Content Type\application/vnd.openofficeorg.extension";
+    Name = "Extension";
+    Value = ".oxt";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Office_Extension_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Subkey = "office.Extension\CurVer";
+    Value = "office.Extension.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Office_Extension_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Subkey = "office.Extension.1";
+    REG_VALUE_LNG(EXTENSION)
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Office_Extension_1_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Subkey = "office.Extension.1\shell";
+    Value = "open";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Office_Extension_1_Shell_Open
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Subkey = "office.Extension.1\shell\open";
+    REG_VALUE_LNG(INSTALL)
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Office_Extension_1_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Subkey = "office.Extension.1\shell\open\command";
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Office_Extension_1_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Root;
+    Subkey = "office.Extension.1\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,13";
+    Styles = ();
+End
+
+// ----- Vista Default Programs ----------------------------------------
+// Find more information here:
+// URL:
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_ApplicationDescription
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities";
+	ModuleID = gid_Module_Root;
+	Name = "ApplicationDescription";
+//        Value = "";
+        REG_VALUE_LNG(APPCAPABILITY_DESCRIPTION_OOO)
+	Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_ApplicationName
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities";
+	ModuleID = gid_Module_Root;
+	Name = "ApplicationName";
+    Value = "%PRODUCTNAME %PRODUCTVERSION";
+	Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_ApplicationIcon
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities";
+	ModuleID = gid_Module_Root;
+	Name = "ApplicationIcon";
+    Value = "<progpath>\program\soffice.bin,0";
+	Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Oxt
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Root;
+    Name = ".oxt";
+    Value = "office.Extension.1";
+    Styles = ();
+End
+
+// RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_ApplicationName
+// 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+// 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities";
+// 	ModuleID = gid_Module_Root;
+// 	Name = "ApplicationName";
+//      Value = "%PRODUCTNAME%PRODUCTADDON %PRODUCTVERSION";
+// 	Styles = ();
+// End
+
+// RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_Description
+// 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+// 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities";
+// 	ModuleID = gid_Module_Root;
+// 	Name = "Description";
+//         Value = "blah fasel";
+// 	Styles = ();
+// End
+
+RegistryItem gid_Regitem_Software_RegisteredApplications
+	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+	Subkey = "Software\RegisteredApplications";
+	ModuleID = gid_Module_Root;
+	Name = "%PRODUCTNAME %PRODUCTVERSION";
+    Value = "SOFTWARE\%MANUFACTURER\%PRODUCTNAME\%PRODUCTVERSION\Capabilities";
+	Styles = ();
+End
+
+// registering vnd.libreoffice.command URI scheme handler
+REGISTER_URI_HANDLER( vnd.libreoffice.command, vnd_libreoffice_command, gid_Module_Root )
+REGISTRY_ENTRY_CAPABILITIES_URL(vnd.libreoffice.command, vnd_libreoffice_command, gid_Module_Root, vnd.libreoffice.command)
diff --git a/scp2/source/ooo/registryitem_ooo.ulf b/scp2/source/ooo/registryitem_ooo.ulf
new file mode 100644
index 0000000000..c07b641a0e
--- /dev/null
+++ b/scp2/source/ooo/registryitem_ooo.ulf
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_REG_VAL_INSTALL]
+en-US = "&Install"
+
+[STR_REG_VAL_SO60_CONFIGFILE]
+en-US = "%PRODUCTNAME Configuration File"
+
+[STR_REG_VAL_EXTENSION]
+en-US = "%PRODUCTNAME Extension"
+
+[STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]
+en-US = "LibreOffice"
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
new file mode 100644
index 0000000000..4159634807
--- /dev/null
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -0,0 +1,73 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#ifdef MACOSX
+ScpAction scp_Copy_Thirdpartylicense_Readme_Html
+    Copy = "license.html";
+    Name= "license.html";
+    Subdir = "LICENSEs";
+End
+#endif
+
+#ifndef WNT
+ScpAction scp_Copy_Readme_Txt
+  #ifdef UNX
+    README_ALL_LANG(Copy, README);
+    README_ALL_LANG(Name, README);
+  #else
+    README_TXT_ALL_LANG(Copy, readme, txt);
+    README_TXT_ALL_LANG(Name, readme, txt);
+  #endif
+    Styles = (SCPZIP_REPLACE);
+  #ifndef MACOSX
+    Subdir = "readmes";
+  #else
+    Subdir = "READMEs";
+  #endif
+End
+#endif
+
+#if !defined(WNT) && !defined(MACOSX) && defined(WITH_RPM)
+ScpAction scp_Copy_Install
+    Copy = "scripts/install";
+    Name = "install";
+    UnixRights = 755;
+End
+#endif
+
+#ifdef MACOSX
+ScpAction scp_Copy_Dmg_Background_Image
+    Copy = "osxdndinstall.png";
+    Name = "background.png";
+    UnixRights = 444;
+    Styles = ();
+    Subdir = ".background";
+End
+
+ScpAction scp_Copy_Ds_Store
+    Copy = "DS_Store";
+    DevVersionCopy = "DS_Store_Dev";
+    LangPackCopy = "DS_Store_Langpack";
+    PatchCopy = "DS_Store_Patch";
+    Name = ".DS_Store";
+    UnixRights = 444;
+    Styles = (FORCELANGUAGEPACK);
+End
+#endif
diff --git a/scp2/source/ooo/ucrt.scp b/scp2/source/ooo/ucrt.scp
new file mode 100644
index 0000000000..b945523fe9
--- /dev/null
+++ b/scp2/source/ooo/ucrt.scp
@@ -0,0 +1,157 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "macros.inc"
+
+File gid_File_Windows6_1_KB2999226_x64_msu
+    Name = "Windows6.1-KB2999226-x64.msu";
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+End
+
+File gid_File_Windows8_RT_KB2999226_x64_msu
+    Name = "Windows8-RT-KB2999226-x64.msu";
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+End
+
+File gid_File_Windows8_1_KB2999226_x64_msu
+    Name = "Windows8.1-KB2999226-x64.msu";
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+End
+
+#ifndef WINDOWS_X64
+
+File gid_File_Windows6_1_KB2999226_x86_msu
+    Name = "Windows6.1-KB2999226-x86.msu";
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+End
+
+File gid_File_Windows8_RT_KB2999226_x86_msu
+    Name = "Windows8-RT-KB2999226-x86.msu";
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+End
+
+File gid_File_Windows8_1_KB2999226_x86_msu
+    Name = "Windows8.1-KB2999226-x86.msu";
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+End
+
+#endif /* WINDOWS_X64 */
+
+/* A deferred not-impersonated action that will call wusa.exe to actually install
+   msu. Since deferred actions don't have access to current DB, the action depends
+   on immediate-executed action inst_ucrt (see below) that precedes it, unpacks
+   the binary to a temp file, and sets this action's CustomActionData property.
+*/
+WindowsCustomAction gid_Customaction_inst_msu
+	Name = "inst_msu";
+	Typ = "3073";
+	Source = "inst_msu_msi.dll";
+	Target = "InstallMSU";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "Not Installed And inst_msu", "InstallFiles");
+End
+
+/* An immediately-executed action that will unpack a binary, which name in binary table is set
+   in "InstMSUBinary" property, to a temporary file, and sets "inst_msu" and "cleanup_msu" props.
+*/
+WindowsCustomAction gid_Customaction_unpack_msu
+	Name = "unpack_msu";
+	Typ = "1";
+	Source = "inst_msu_msi.dll";
+	Target = "UnpackMSUForInstall";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "Not Installed And InstMSUBinary", "cleanup_msu");
+End
+
+/* A rollback action that removes temp file. It must precede inst_msu.
+*/
+WindowsCustomAction gid_Customaction_cleanup_msu
+	Name = "cleanup_msu";
+	Typ = "1345";
+	Source = "inst_msu_msi.dll";
+	Target = "CleanupMSU";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "Not Installed And cleanup_msu", "inst_msu");
+End
+
+/* The "InstMSUBinary" property contains an error message number and a binary name, separated by "|".
+   The former is used when installing the MSU fails.
+*/
+WindowsCustomAction gid_Customaction_check_win7x64_ucrt
+	Name = "check_win7x64_ucrt";
+	Typ = "51";
+	Source = "InstMSUBinary";
+	Target = "KB2999226|Windows61-KB2999226-x64msu";
+	Inbinarytable = 0;
+	Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 601 And VersionNT64", "FileCost");
+	Styles = "NO_FILE";
+End
+
+WindowsCustomAction gid_Customaction_check_win8x64_ucrt
+	Name = "check_win8x64_ucrt";
+	Typ = "51";
+	Source = "InstMSUBinary";
+	Target = "KB2999226|Windows8-RT-KB2999226-x64msu";
+	Inbinarytable = 0;
+	Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 602 And VersionNT64", "check_win7x64_ucrt");
+	Styles = "NO_FILE";
+End
+
+WindowsCustomAction gid_Customaction_check_win81x64_ucrt
+	Name = "check_win81x64_ucrt";
+	Typ = "51";
+	Source = "InstMSUBinary";
+	Target = "KB2999226|Windows81-KB2999226-x64msu";
+	Inbinarytable = 0;
+	Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 603 And (Not WINMAJORVER Or WINMAJORVER = \"#6\") And VersionNT64", "check_win8x64_ucrt");
+	Styles = "NO_FILE";
+End
+
+#ifndef WINDOWS_X64
+
+/* 32-bit installer must be prepared to run on both 32- and 64-bit Windows. So, it might need to
+   install either 32-bit or 64-bit UCRT package, depending on OS bitness.
+*/
+
+WindowsCustomAction gid_Customaction_check_win7x32_ucrt
+	Name = "check_win7x32_ucrt";
+	Typ = "51";
+	Source = "InstMSUBinary";
+	Target = "KB2999226|Windows61-KB2999226-x86msu";
+	Inbinarytable = 0;
+	Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 601 And Not VersionNT64", "check_win81x64_ucrt");
+	Styles = "NO_FILE";
+End
+
+WindowsCustomAction gid_Customaction_check_win8x32_ucrt
+	Name = "check_win8x32_ucrt";
+	Typ = "51";
+	Source = "InstMSUBinary";
+	Target = "KB2999226|Windows8-RT-KB2999226-x86msu";
+	Inbinarytable = 0;
+	Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 602 And Not VersionNT64", "check_win7x32_ucrt");
+	Styles = "NO_FILE";
+End
+
+WindowsCustomAction gid_Customaction_check_win81x32_ucrt
+	Name = "check_win81x32_ucrt";
+	Typ = "51";
+	Source = "InstMSUBinary";
+	Target = "KB2999226|Windows81-KB2999226-x86msu";
+	Inbinarytable = 0;
+	Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 603 And (Not WINMAJORVER Or WINMAJORVER = \"#6\") And Not VersionNT64", "check_win8x32_ucrt");
+	Styles = "NO_FILE";
+End
+
+#endif /* WINDOWS_X64 */
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
new file mode 100644
index 0000000000..e36fb7215d
--- /dev/null
+++ b/scp2/source/ooo/ure.scp
@@ -0,0 +1,235 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/ure"
+
+#if defined MACOSX
+Directory gid_Dir_Ure_Share_Misc
+    ParentID = gid_Brand_Dir_Share_Ure_Share;
+    DosName = "misc";
+End
+#endif
+
+// Private Dynamic Libraries:
+
+#if defined _MSC_VER && ! defined _ARM64_
+File gid_File_Dl_Cli_Ure_Assembly
+    TXT_FILE_BODY;
+    Styles = (PACKED, ASSEMBLY);
+    Name = "cli_ure.dll";
+    Dir = SCP2_URE_DL_DIR;
+    Assemblyname = "cli_ure";
+    PublicKeyToken = "ce2cb7e279207b9e";
+    Version = "${CLI_URE_NEW_VERSION}";
+    Culture = "neutral";
+    Attributes = "0";
+    ProcessorArchitecture = "MSIL";
+End
+
+File gid_File_Dl_Policy_Cli_Ure_Assembly
+    TXT_FILE_BODY;
+    Styles = (PACKED, ASSEMBLY);
+    Name = "${CLI_URE_POLICY_ASSEMBLY}.dll";
+    Dir = SCP2_URE_DL_DIR;
+    Assemblyname = "${CLI_URE_POLICY_ASSEMBLY}";
+    PublicKeyToken = "ce2cb7e279207b9e";
+    Version = "${CLI_URE_POLICY_VERSION}";
+    Culture = "neutral";
+    Attributes = "0";
+    ProcessorArchitecture = "MSIL";
+End
+
+File gid_File_Dl_Policy_Cli_Ure_Config
+    TXT_FILE_BODY;
+    Styles = (PACKED, ASSIGNCOMPONENT);
+    Name = "cli_ure.config";
+    Dir = SCP2_URE_DL_DIR;
+    AssignComponent = gid_File_Dl_Policy_Cli_Ure_Assembly;
+End
+
+File gid_File_Dl_Cli_Basetypes_Assembly
+    TXT_FILE_BODY;
+    Styles = (PACKED, ASSEMBLY);
+    Name = "cli_basetypes.dll";
+    Dir = SCP2_URE_DL_DIR;
+    Assemblyname = "cli_basetypes";
+    PublicKeyToken = "ce2cb7e279207b9e";
+    Version = "${CLI_BASETYPES_NEW_VERSION}";
+    Culture = "neutral";
+    Attributes = "0";
+    ProcessorArchitecture = "MSIL";
+End
+
+File gid_File_Dl_Policy_Cli_Basetypes_Assembly
+    TXT_FILE_BODY;
+    Styles = (PACKED, ASSEMBLY);
+    Name = "${CLI_BASETYPES_POLICY_ASSEMBLY}.dll";
+    Dir = SCP2_URE_DL_DIR;
+    Assemblyname = "${CLI_BASETYPES_POLICY_ASSEMBLY}";
+    PublicKeyToken = "ce2cb7e279207b9e";
+    Version = "${CLI_BASETYPES_POLICY_VERSION}";
+    Culture = "neutral";
+    Attributes = "0";
+    ProcessorArchitecture = "MSIL";
+End
+
+File gid_File_Dl_Policy_Cli_Basetypes_Config
+    TXT_FILE_BODY;
+    Styles = (PACKED, ASSIGNCOMPONENT);
+    Name = "cli_basetypes.config";
+    Dir = SCP2_URE_DL_DIR;
+    AssignComponent = gid_File_Dl_Policy_Cli_Basetypes_Assembly;
+End
+
+File gid_File_Dl_Cli_Uretypes_Assembly
+    TXT_FILE_BODY;
+    Styles = (PACKED, ASSEMBLY);
+    Name = "cli_uretypes.dll";
+    Dir = SCP2_URE_DL_DIR;
+    Assemblyname = "cli_uretypes";
+    PublicKeyToken = "ce2cb7e279207b9e";
+    Version = "${CLI_URETYPES_NEW_VERSION}";
+    Culture = "neutral";
+    Attributes = "0";
+    ProcessorArchitecture = "MSIL";
+End
+
+File gid_File_Dl_Policy_Cli_Uretypes_Assembly
+    TXT_FILE_BODY;
+    Styles = (PACKED, ASSEMBLY);
+    Name = "${CLI_URETYPES_POLICY_ASSEMBLY}.dll";
+    Dir = SCP2_URE_DL_DIR;
+    Assemblyname = "${CLI_URETYPES_POLICY_ASSEMBLY}";
+    PublicKeyToken = "ce2cb7e279207b9e";
+    Version = "${CLI_URETYPES_POLICY_VERSION}";
+    Culture = "neutral";
+    Attributes = "0";
+    ProcessorArchitecture = "MSIL";
+End
+
+File gid_File_Dl_Policy_Cli_Uretypes_Config
+    TXT_FILE_BODY;
+    Styles = (PACKED, ASSIGNCOMPONENT);
+    Name = "cli_uretypes.config";
+    Dir = SCP2_URE_DL_DIR;
+    AssignComponent = gid_File_Dl_Policy_Cli_Uretypes_Assembly;
+End
+
+File gid_File_Lib_Cli_Cppuhelper_Assembly
+    TXT_FILE_BODY;
+    Styles = (PACKED, ASSEMBLY);
+    Name = "cli_cppuhelper.dll";
+    Dir = SCP2_URE_DL_DIR;
+    Assemblyname = "cli_cppuhelper";
+    PublicKeyToken = "ce2cb7e279207b9e";
+    Version = "${CLI_CPPUHELPER_NEW_VERSION}";
+    Culture = "neutral";
+    Attributes = "0";
+    ProcessorArchitecture = "x86";
+End
+
+File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
+    TXT_FILE_BODY;
+    Styles = (PACKED, ASSEMBLY);
+    Name = "${CLI_CPPUHELPER_POLICY_ASSEMBLY}.dll";
+    Dir = SCP2_URE_DL_DIR;
+    Assemblyname = "${CLI_CPPUHELPER_POLICY_ASSEMBLY}";
+    PublicKeyToken = "ce2cb7e279207b9e";
+    Version = "${CLI_CPPUHELPER_POLICY_VERSION}";
+    Culture = "neutral";
+    Attributes = "0";
+    ProcessorArchitecture = "x86";
+End
+
+File gid_File_Lib_Policy_Cli_Cppuhelper_Config
+    TXT_FILE_BODY;
+    Styles = (PACKED, ASSIGNCOMPONENT);
+    Name = "cli_cppuhelper.config";
+    Dir = SCP2_URE_DL_DIR;
+    AssignComponent = gid_File_Lib_Policy_Cli_Cppuhelper_Assembly;
+End
+
+#endif
+
+// Public Miscellaneous Files:
+
+File gid_File_Misc_TypesRdb
+    TXT_FILE_BODY;
+#if defined MACOSX
+    Dir = gid_Dir_Ure_Share_Misc;
+#else
+    Dir = gid_Brand_Dir_Program;
+#endif
+    Name = "types.rdb";
+    Styles = (PACKED);
+End
+
+File gid_File_Misc_ServicesRdb
+    TXT_FILE_BODY;
+#if defined MACOSX
+    Dir = gid_Dir_Ure_Share_Misc;
+#else
+    Dir = gid_Brand_Dir_Program;
+#endif
+    Name = "services.rdb";
+    Styles = (PACKED);
+End
+
+//Module
+
+Module gid_Module_Root_Ure_Hidden
+    ParentID = gid_Module_Root;
+    PackageInfo = "packinfo_ure.txt";
+    InstallOrder = "10";
+    Name = "ure";
+    Description = "ure";
+	Sortkey = "2200";
+	Default = YES;
+	Styles = (HIDDEN_ROOT);
+    Dirs = (gid_Dir_Ure_Share_Misc);
+    Files = (auto_ure_ALL,
+            gid_File_Dl_Cli_Ure_Assembly,
+            gid_File_Dl_Policy_Cli_Ure_Assembly,
+            gid_File_Dl_Policy_Cli_Ure_Config,
+            gid_File_Dl_Cli_Basetypes_Assembly,
+            gid_File_Dl_Policy_Cli_Basetypes_Assembly,
+            gid_File_Dl_Policy_Cli_Basetypes_Config,
+            gid_File_Dl_Cli_Uretypes_Assembly,
+            gid_File_Dl_Policy_Cli_Uretypes_Assembly,
+            gid_File_Dl_Policy_Cli_Uretypes_Config,
+            gid_File_Dl_Cli_Cppuhelper_Assembly,
+            gid_File_Dl_Policy_Cli_Cppuhelper_Assembly,
+            gid_File_Dl_Policy_Cli_Cppuhelper_Config,
+            gid_File_Lib_Cli_Cppuhelper_Assembly,
+            gid_File_Lib_Policy_Cli_Cppuhelper_Assembly,
+            gid_File_Lib_Policy_Cli_Cppuhelper_Config,
+            gid_File_Misc_TypesRdb,
+            gid_File_Misc_ServicesRdb);
+End
+
+// Windows Registry:
+
+RegistryItem gid_Regitem_Path
+    ModuleID = gid_Module_Root;
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "Software\LibreOffice\%PRODUCTNAME";
+    Name = "Path";
+    Value = "[INSTALLLOCATION]";
+End
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
new file mode 100644
index 0000000000..3fe7af2b97
--- /dev/null
+++ b/scp2/source/ooo/vc_redist.scp
@@ -0,0 +1,68 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#if defined(WITH_VC_REDIST)
+#if WITH_VC_REDIST == 143
+    #define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC143_CRT_x64
+    #define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC143_CRT_x64.msm"
+    #define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC143_CRT_x86
+    #define WINDOWS_X86_MERGEMODULE_FILE "Microsoft_VC143_CRT_x86.msm"
+#elif WITH_VC_REDIST == 142
+    #define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC142_CRT_x64
+    #define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC142_CRT_x64.msm"
+    #define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC142_CRT_x86
+    #define WINDOWS_X86_MERGEMODULE_FILE "Microsoft_VC142_CRT_x86.msm"
+#elif WITH_VC_REDIST == 141
+    #define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC141_CRT_x64
+    #define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC141_CRT_x64.msm"
+    #define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC141_CRT_x86
+    #define WINDOWS_X86_MERGEMODULE_FILE "Microsoft_VC141_CRT_x86.msm"
+#else
+    // The next string will result in "malformed par file" error, terminating build as expected.
+    // Possibly a new version of CRT was enabled in configure.ac, but not handled here yet?
+    error: unknown VC redist version WITH_VC_REDIST. Check configure.ac
+#endif
+#endif
+
+#if defined(WINDOWS_X86_MERGEMODULE)
+
+/* Attributes: msidbComponentAttributesPermanent = 0x10 */
+MergeModule WINDOWS_X86_MERGEMODULE
+    Feature = gm_Root;
+    Name = WINDOWS_X86_MERGEMODULE_FILE;
+    RootDir = "TARGETDIR";
+    ComponentCondition = "VC_REDIST=1";
+    Attributes_Add = "0x10";
+End
+
+#endif
+
+#if defined(WINDOWS_X64) && defined(WINDOWS_X64_MERGEMODULE)
+
+/* Attributes: msidbComponentAttributesPermanent = 0x10 */
+MergeModule WINDOWS_X64_MERGEMODULE
+    Feature = gm_Root;
+    Name = WINDOWS_X64_MERGEMODULE_FILE;
+    RootDir = "TARGETDIR";
+    ComponentCondition = "VC_REDIST=1";
+    Attributes_Add = "0x10";
+End
+
+#endif
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
new file mode 100644
index 0000000000..576daceeaf
--- /dev/null
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -0,0 +1,278 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "config_features.h"
+#include "macros.inc"
+
+WindowsCustomAction gid_Customaction_Regallmsdocdll
+	Name = "Regallmsdocdll";
+	Typ = "65";
+	Source = "reg4allmsdoc.dll";
+	Target = "FindRegisteredExtensions";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And _IsSetupTypeMin<>\"Custom\"", "CostFinalize");
+End
+
+WindowsCustomAction gid_Customaction_Restoreregallmsdocdll
+    Name = "Restoreregallmsdocdll";
+    Typ = "65";
+    Source = "reg4allmsdoc.dll";
+    Target = "RestoreRegAllMSDoc";
+    Inbinarytable = 1;
+    Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "end");
+End
+
+WindowsCustomAction gid_Customaction_Regactivexdll1
+	Name = "Regactivexdll1";
+	Typ = "65";
+	Source = "regactivex.dll";
+	Target = "InstallActiveXControl";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "(\&FEATURETEMPLATE=3 Or (\!FEATURETEMPLATE=3 And \&FEATURETEMPLATE=-1)) And Not PATCH", "end");
+End
+
+WindowsCustomAction gid_Customaction_Regactivexdll2
+	Name = "Regactivexdll2";
+	Typ = "65";
+	Source = "regactivex.dll";
+	Target = "DeinstallActiveXControl";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=2 And \!FEATURETEMPLATE=3 And Not PATCH", "RemoveExistingProducts");
+End
+
+#ifdef HAVE_WINDOWS_SDK
+
+WindowsCustomAction gid_Customaction_sdqsmsidll
+	Name = "sdqsmsidll";
+	Typ = "65";
+	Source = "sdqsmsi.dll";
+	Target = "ShutDownQuickstarter";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "", "CCPSearch");
+End
+
+WindowsCustomAction gid_Customaction_qslnkmsidll
+	Name = "qslnkmsidll";
+	Typ = "65";
+	Source = "qslnkmsi.dll";
+	Target = "RemoveQuickstarterLink";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "sdqsmsidll");
+End
+
+#endif /* HAVE_WINDOWS_SDK */
+
+WindowsCustomAction gid_Customaction_Instooofiltmsidll2
+	Name = "Instooofiltmsidll";
+	Typ = "65";
+	Source = "instooofiltmsi.dll";
+	Target = "RestartIndexingService";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "end");
+End
+
+WindowsCustomAction gid_Customaction_Shellextensionsdll3
+	Name = "Shellextensionsdll3";
+	Typ = "65";
+	Source = "shlxtmsi.dll";
+	Target = "InstallStartmenuFolderIcon";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "end");
+End
+
+WindowsCustomAction gid_Customaction_Shellextensionsdll4
+	Name = "Shellextensionsdll4";
+	Typ = "65";
+	Source = "shlxtmsi.dll";
+	Target = "DeinstallStartmenuFolderIcon";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "MigrateFeatureStates");
+End
+
+WindowsCustomAction gid_Customaction_Shellextensionsdll5
+	Name = "Shellextensionsdll5";
+	Typ = "321";
+	Source = "shlxtmsi.dll";
+	Target = "SetProductInstallMode";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "FindRelatedProducts");
+	Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "FindRelatedProducts");
+End
+
+WindowsCustomAction gid_Customaction_Check_Install_Directory
+	Name = "CheckInstallDirectory";
+	Typ = "65";
+	Source = "shlxtmsi.dll";
+	Target = "CheckInstallDirectory";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "Not Installed", "CheckVersions");
+	Assignment2 = ("ControlEvent", "SetupType", "Next", "DoAction", "CheckInstallDirectory", "_IsSetupTypeMin = \"Typical\" And Not Installed", "2");
+	Assignment3 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "CheckInstallDirectory", "Not Installed", "2");
+End
+
+WindowsCustomAction gid_Customaction_CheckPatchList
+	Name = "CheckPatchList";
+	Typ = "65";
+	Source = "shlxtmsi.dll";
+	Target = "CheckPatchList";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "PATCH", "Patch1NotInstalled");
+End
+
+WindowsCustomAction gid_Customaction_MigrateInstallPath
+      Name = "MigrateInstallPath";
+      Typ = "321";
+      Source = "shlxtmsi.dll";
+      Target = "MigrateInstallPath";
+      Inbinarytable = 1;
+      Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostInitialize");
+      Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostInitialize");
+End
+
+WindowsCustomAction gid_Customaction_CompleteInstallPath
+      Name = "CompleteInstallPath";
+      Typ = "321";
+      Source = "shlxtmsi.dll";
+      Target = "CompleteInstallPath";
+      Inbinarytable = 1;
+      Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "MigrateInstallPath");
+      Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "MigrateInstallPath");
+End
+
+#ifdef HAVE_WINDOWS_SDK
+
+WindowsCustomAction gid_Customaction_CheckVersions
+	Name = "CheckVersions";
+	Typ = "321";
+	Source = "sn_tools.dll";
+	Target = "CheckVersions";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "NOT Installed", "NewProductFound");
+	Assignment2 = ("InstallUISequence", "NOT Installed", "NewProductFound");
+End
+
+WindowsCustomAction gid_Customaction_SelectLanguage
+    Name = "SelectLanguage";
+    Typ = "321";
+    Source = "sellangmsi.dll";
+    Target = "SelectLanguage";
+    Inbinarytable = 1;
+    Assignment1 = ("InstallExecuteSequence", "NOT Installed And (ADDLOCAL=\"\" Or NOT UI_LANGS=\"\")", "MigrateFeatureStates");
+    Assignment2 = ("InstallUISequence", "NOT Installed And (ADDLOCAL=\"\" Or NOT UI_LANGS=\"\")", "MigrateFeatureStates");
+End
+
+WindowsCustomAction gid_Customaction_SortTree
+    Name = "SortTree";
+    Typ = "321";
+    Source = "sellangmsi.dll";
+    Target = "SortTree";
+    Inbinarytable = 1;
+    Assignment1 = ("ControlEvent", "CustomSetup", "Tree", "DoAction", "SortTree", "1", "1");
+End
+
+WindowsCustomAction gid_Customaction_LookForRegisteredExtensions
+	Name = "LookForRegisteredExtensions";
+	Typ = "65";
+	Source = "reg4allmsdoc.dll";
+	Target = "LookForRegisteredExtensions";
+	Inbinarytable = 1;
+	Assignment1 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "LookForRegisteredExtensions", "1", "2");
+End
+
+WindowsCustomAction gid_Customaction_RegisterSomeExtensions
+	Name = "RegisterSomeExtensions";
+	Typ = "65";
+	Source = "reg4allmsdoc.dll";
+	Target = "RegisterSomeExtensions";
+	Inbinarytable = 1;
+	Assignment1 = ("ControlEvent", "FileTypeDialog", "Next", "DoAction", "RegisterSomeExtensions", "1", "1");
+End
+
+#endif /* HAVE_WINDOWS_SDK */
+
+/* Deferred not-impersonated actions that will call regsvr32 to (un)register DLLs.
+ * Custom action type 1 (msidbCustomActionTypeDll + msidbCustomActionTypeBinaryData)
+ * + 64 (msidbCustomActionTypeContinue) + 1024 (msidbCustomActionTypeInScript)
+ * + 2048 (msidbCustomActionTypeNoImpersonate).
+ * Since deferred actions don't have access to current DB, the actions depend on
+ * immediate-executed action prep_reg_unreg_dlls (see below) that precedes it, and
+ * sets this action's CustomActionData property.
+ */
+
+WindowsCustomAction gid_Customaction_reg_dlls
+    Name = "reg_dlls";
+    Typ = "3137";
+    Source = "reg_dlls.dll";
+    Target = "RegDLLs";
+    Inbinarytable = 1;
+    Assignment1 = ("InstallExecuteSequence", "reg_dlls", "InstallFinalize");
+End
+
+WindowsCustomAction gid_Customaction_unreg_dlls
+    Name = "unreg_dlls";
+    Typ = "3137";
+    Source = "reg_dlls.dll";
+    Target = "UnregDLLs";
+    Inbinarytable = 1;
+    Assignment1 = ("InstallExecuteSequence", "unreg_dlls", "UnpublishComponents");
+End
+
+/* Immediately-executed action that adds registration command lines for spsupp_x*.dll
+ * to "[un]reg_dlls" properties.
+ * Custom action type 1 (msidbCustomActionTypeDll + msidbCustomActionTypeBinaryData)
+ * + 64 (msidbCustomActionTypeContinue).
+ */
+WindowsCustomAction gid_Customaction_prep_reg_dlls
+    Name = "prep_reg_unreg_dlls";
+    Typ = "65";
+    Source = "reg_dlls.dll";
+    Target = "PrepRegUnregDLLs";
+    Inbinarytable = 1;
+    Assignment1 = ("InstallExecuteSequence", "", "behind_CostFinalize");
+End
+
+#if HAVE_FEATURE_UPDATE_MAR
+
+WindowsCustomAction gid_Customaction_prepare_updateservice
+    Name = "prepare_updateservice";
+    Typ = "65";
+    Source = "install_updateservice.dll";
+    Target = "PrepareUpdateservice";
+    Inbinarytable = 1;
+    Assignment1 = ("InstallExecuteSequence", "", "behind_CostFinalize");
+End
+
+WindowsCustomAction gid_Customaction_install_updateservice
+    Name = "install_updateservice";
+    Typ = "3137";
+    Source = "install_updateservice.dll";
+    Target = "InstallUpdateservice";
+    Inbinarytable = 1;
+    Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "InstallFinalize");
+End
+
+WindowsCustomAction gid_Customaction_uninstall_updateservice
+    Name = "uninstall_updateservice";
+    Typ = "3137";
+    Source = "install_updateservice.dll";
+    Target = "UninstallUpdateservice";
+    Inbinarytable = 1;
+    Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\"", "UnpublishComponents");
+End
+
+#endif
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
new file mode 100644
index 0000000000..f1982cb493
--- /dev/null
+++ b/scp2/source/python/file_python.scp
@@ -0,0 +1,54 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#ifndef DISABLE_PYUNO
+
+File gid_File_Pyuno_Rdb
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program_Services;
+    Name = "pyuno.rdb";
+    Styles = (PACKED);
+End
+
+#ifndef SYSTEM_PYTHON
+
+#ifndef MACOSX
+Directory gid_Dir_Py_PythonCore
+    ParentID = gid_Brand_Dir_Program;
+    HostName = STRING(CONCAT2(python-core-,PYVERSION));
+End
+
+Directory gid_Dir_Py_PythonCore_Lib
+    ParentID = gid_Dir_Py_PythonCore;
+    HostName = "lib";
+End
+#endif
+
+#ifdef WNT
+Directory gid_Dir_Py_PythonCore_Bin
+    ParentID = gid_Dir_Py_PythonCore;
+    HostName = "bin";
+End
+#endif
+
+#endif // SYSTEM_PYTHON
+
+// DISABLE_PYUNO
+#endif
diff --git a/scp2/source/python/file_python_librelogo.scp b/scp2/source/python/file_python_librelogo.scp
new file mode 100644
index 0000000000..8c0f0defc6
--- /dev/null
+++ b/scp2/source/python/file_python_librelogo.scp
@@ -0,0 +1,18 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "macros.inc"
+
+#ifndef DISABLE_PYUNO
+File gid_File_Share_Registry_LibreLogo_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "librelogo.xcd";
+End
+#endif
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
new file mode 100644
index 0000000000..62c1bdcd4d
--- /dev/null
+++ b/scp2/source/python/module_python.scp
@@ -0,0 +1,82 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#ifndef DISABLE_PYUNO
+
+#include "AutoInstall/python"
+#include "AutoInstall/python_scriptprovider"
+
+Module gid_Module_Pyuno
+#ifdef ENABLE_LIBRELOGO
+    PackageInfo = "packinfo_office.txt";
+#else
+    PackageInfo = "packinfo_librelogo_disabled.txt";
+#endif
+    ParentID = gid_Module_Root_Brand;
+    Name = "PyUNO";
+    Description = "Python-UNO bridge";
+    Dirs = (gid_Dir_PythonFramework,
+            gid_Dir_PythonFramework_Versions,
+            gid_Dir_PythonFramework_Versions_ver,
+            gid_Dir_PythonFramework_Versions_ver_bin,
+            gid_Dir_PythonFramework_Versions_ver_lib,
+            gid_Dir_PythonFramework_Versions_ver_lib_pkgconfig,
+            gid_Dir_PythonFramework_Versions_ver_lib_pythonver,
+            gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config,
+            gid_Dir_Py_PythonCore,
+            gid_Dir_Py_PythonCore_Bin,
+            gid_Dir_Py_PythonCore_Lib);
+    Files = (auto_python_ALL,
+             gid_File_Pyuno_Rdb,
+             gid_File_Lib_Python_So,
+             gid_File_Lib_Python3_So);
+    Unixlinks = (gid_Unixlink_Python_Headers,
+                 gid_Unixlink_Python_LibreOfficePython,
+                 gid_Unixlink_Python_Resources,
+                 gid_Unixlink_Python_Versions_Current,
+                 gid_Unixlink_Python_Versions_ver_Headers,
+                 gid_Unixlink_Python_bin_idle,
+                 gid_Unixlink_Python_bin_pydoc,
+                 gid_Unixlink_Python_bin_python,
+                 gid_Unixlink_Python_bin_pythonconfig,
+                 gid_Unixlink_Python_bin_pythonw,
+                 gid_Unixlink_Python_bin_pyvenv,
+                 gid_Unixlink_Python_libpython,
+                 gid_Unixlink_Python_libpython_m,
+                 gid_Unixlink_Python_pkgconfig,
+                 gid_Unixlink_Python_pkgconfig_m,
+                 gid_Unixlink_Python_libpython_config_a,
+                 gid_Unixlink_Python_libpython_config_dylib,
+                 gid_Unixlink_Python_libpython_m_config_a,
+                 gid_Unixlink_Python_libpython_m_config_dylib);
+    Styles = (HIDDEN_ROOT);
+End
+
+Module gid_Module_Script_Provider_For_Python
+    Name = "Script Provider For Python";
+    Description = "Script Provider For Python";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Root_Brand;
+    Files = (auto_python_scriptprovider_ALL);
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+End
+
+#endif
diff --git a/scp2/source/python/module_python_librelogo.scp b/scp2/source/python/module_python_librelogo.scp
new file mode 100644
index 0000000000..a056d49acc
--- /dev/null
+++ b/scp2/source/python/module_python_librelogo.scp
@@ -0,0 +1,24 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/python_librelogo"
+
+#ifndef DISABLE_PYUNO
+Module gid_Module_Optional_Pyuno_LibreLogo
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON_LIBRELOGO );
+    ParentID = gid_Module_Optional;
+    Sortkey = "810";
+    Files = (auto_python_librelogo_ALL,
+             gid_File_Share_Registry_LibreLogo_Xcd);
+    Default = YES;
+    Styles = ( );
+End
+#endif
diff --git a/scp2/source/python/module_python_librelogo.ulf b/scp2/source/python/module_python_librelogo.ulf
new file mode 100644
index 0000000000..db5d265b5f
--- /dev/null
+++ b/scp2/source/python/module_python_librelogo.ulf
@@ -0,0 +1,13 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_PYTHON_LIBRELOGO]
+en-US = "LibreLogo"
+
+[STR_DESC_MODULE_OPTIONAL_PYTHON_LIBRELOGO]
+en-US = "Logo (turtle graphics) toolbar for Writer"
diff --git a/scp2/source/quickstart/module_quickstart.scp b/scp2/source/quickstart/module_quickstart.scp
new file mode 100644
index 0000000000..108052691e
--- /dev/null
+++ b/scp2/source/quickstart/module_quickstart.scp
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/quickstart"
+
+Module gid_Module_Optional_Quickstart
+    MOD_NAME_DESC ( MODULE_OPTIONAL_QUICKSTART );
+    Sortkey = "1400";
+    Default = YES;
+    ParentID = gid_Module_Optional;
+    Files = (auto_quickstart_ALL, gid_File_Tmp_Userinstall_Quickstart_Inf);
+End
diff --git a/scp2/source/quickstart/module_quickstart.ulf b/scp2/source/quickstart/module_quickstart.ulf
new file mode 100644
index 0000000000..b48f9c69d6
--- /dev/null
+++ b/scp2/source/quickstart/module_quickstart.ulf
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_OPTIONAL_QUICKSTART]
+en-US = "Quickstarter"
+
+[STR_DESC_MODULE_OPTIONAL_QUICKSTART]
+en-US = "Loads basic components on system start to accelerate start up time of %PRODUCTNAME %PRODUCTVERSION."
+
+
+
diff --git a/scp2/source/quickstart/registryitem_quickstart.scp b/scp2/source/quickstart/registryitem_quickstart.scp
new file mode 100644
index 0000000000..3f015aa61d
--- /dev/null
+++ b/scp2/source/quickstart/registryitem_quickstart.scp
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+RegistryItem gid_Regitem_Software_OpenOffice_RunQuickstartAtFirstStart
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME\%PRODUCTVERSION";
+    ModuleID = gid_Module_Optional_Quickstart;
+    Name = "RunQuickstartAtFirstStart";
+    Value = "1";
+    ComponentCondition = "QUICKSTART=1";
+End
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
new file mode 100644
index 0000000000..d0ebc0f6d1
--- /dev/null
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -0,0 +1,73 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/sdk"
+
+Installation gid_Installation_Sdk
+    ProductName = "${PRODUCTNAME}";
+    ProductVersion = "${PRODUCTVERSION}";
+    ProductExtension = "${PRODUCTEXTENSION}";
+#if defined WNT
+    DefaultDestPath = "<winprogpath>\%PRODUCTNAME";
+#else
+    DefaultDestPath = "/opt/%PRODUCTNAME";
+#endif
+End
+
+#ifdef WNT
+
+Directory gid_Dir_Sdkoo_Root
+    ParentID = PREDEFINED_PROGDIR;
+    HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
+    Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
+End
+
+#endif
+
+Directory gid_Dir_Sdkoo_Sdk
+#ifdef WNT
+    ParentID = gid_Dir_Sdkoo_Root;
+#else
+    ParentID = PREDEFINED_PROGDIR;
+#endif
+#ifdef MACOSX
+    DosName = "${PRODUCTNAME}${PRODUCTVERSION}_SDK";
+#else
+    DosName = "sdk";
+#endif
+End
+
+Directory gid_Dir_Sdkoo_Bin
+    ParentID = gid_Dir_Sdkoo_Sdk;
+    DosName = "bin";
+End
+
+Directory gid_Dir_Lib_Sdk
+    ParentID = gid_Dir_Sdkoo_Sdk;
+    DosName = "lib";
+End
+
+Module gid_Module_Root_SDK
+    Name = "sdkoo";
+    Description = "sdkoo";
+    PackageInfo = "packinfo_sdkoo.txt";
+    Files = (auto_sdk_ALL);
+End
+
diff --git a/scp2/source/spsupp/module_spsupp.scp b/scp2/source/spsupp/module_spsupp.scp
new file mode 100644
index 0000000000..ba1ec46020
--- /dev/null
+++ b/scp2/source/spsupp/module_spsupp.scp
@@ -0,0 +1,55 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/spsuppfiles"
+
+#ifdef WNT
+
+Module gid_Module_Optional_SharePointSupport
+    ParentID = gid_Module_Optional;
+    Name = "gid_Module_Optional_SharePointSupport";
+    Description = "gid_Module_Optional_SharePointSupport";
+    Sortkey = "1300";
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+    Files = (auto_spsuppfiles_ALL);
+End
+
+/*
+ * This is a feature with a single registry item, disabled by default, that controls custom action
+ * registering SharePoint.OpenDocuments class, which replaces registration of that class from MSO.
+ * It is disabled to allow co-existing with MS Office. To install, a transform must be used that
+ * would set its level to a non-0 value below INSTALLLEVEL, or a command line like
+ *
+ *     msiexec.exe /i path-to-msi ADDLOCAL=gm_SharePointSupport_SubstMSO
+ */
+Module gid_Module_SharePointSupport_SubstMSO
+    ParentID = gid_Module_Optional_SharePointSupport;
+    Name = "gid_Module_SharePointSupport_SubstMSO";
+    Description = "Registration of SharePoint.OpenDocuments class";
+    Sortkey = "1305";
+    Default = NO;
+    Independent = YES;
+    Styles = (HIDDEN_ROOT);
+End
+
+/*
+ * Create a component for the feature, with key path in registry, to track feature installed state
+ */
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_SharePointSupport_SubstMSO_Registered
+    ModuleID = gid_Module_SharePointSupport_SubstMSO;
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME\%PRODUCTVERSION\SharePointSupport\SubstMSO";
+    Name = "Registered";
+    Value = "1";
+End
+
+#endif
+
diff --git a/scp2/source/templates/module_helppack.sct b/scp2/source/templates/module_helppack.sct
new file mode 100644
index 0000000000..740b5d511f
--- /dev/null
+++ b/scp2/source/templates/module_helppack.sct
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+Module gid_Module_Helppack_Root_<LANGUAGE_>
+    ParentID = gid_Module_Helppack_Helproot;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_HELPPACK_<LANGUAGEBIG_>);
+#ifdef WITH_HELPPACK_INTEGRATION
+    Styles =(FORCEHELPPACK, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME, LANGUAGEMODULE);
+#else
+    Styles =(HELPPACK, HIDDEN_ROOT, USELANGUAGENAME, LANGUAGEMODULE);
+#endif
+End
diff --git a/scp2/source/templates/module_helppack_root.sct b/scp2/source/templates/module_helppack_root.sct
new file mode 100644
index 0000000000..6a19c4894b
--- /dev/null
+++ b/scp2/source/templates/module_helppack_root.sct
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+Module gid_Module_Helppack_Help_<LANGUAGE_>
+    ParentID = gid_Module_Helppack_Root_<LANGUAGE_>;
+    Sortkey = "200";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Helppack_Help_Template;
+    Name = "gid_Module_Helppack_Help_<LANGUAGE_>";
+    Description = "gid_Module_Helppack_Help_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_help.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack.sct b/scp2/source/templates/module_langpack.sct
new file mode 100644
index 0000000000..4e3811e4d9
--- /dev/null
+++ b/scp2/source/templates/module_langpack.sct
@@ -0,0 +1,25 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+Module gid_Module_Langpack_Root_<LANGUAGE_>
+    ParentID = gid_Module_Langpack_Languageroot;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
diff --git a/scp2/source/templates/module_langpack_accessories_samples.sct b/scp2/source/templates/module_langpack_accessories_samples.sct
new file mode 100644
index 0000000000..56db3598c9
--- /dev/null
+++ b/scp2/source/templates/module_langpack_accessories_samples.sct
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Accessories_Adv_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Adv_Root_<LANGUAGE_>;
+    Sortkey = "300";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Accessories_Adv_Template;
+    Name = "gid_Module_Optional_Accessories_Adv_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Accessories_Adv_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
+
+Module gid_Module_Optional_Accessories_Doc_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Doc_Root_<LANGUAGE_>;
+    Sortkey = "200";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Accessories_Doc_Template;
+    Name = "gid_Module_Optional_Accessories_Doc_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Accessories_Doc_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
+
+Module gid_Module_Optional_Accessories_Sam_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Sam_Root_<LANGUAGE_>;
+    Sortkey = "100";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Accessories_Sam_Template;
+    Name = "gid_Module_Optional_Accessories_Sam_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Accessories_Sam_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_accessories_samples_root.sct b/scp2/source/templates/module_langpack_accessories_samples_root.sct
new file mode 100644
index 0000000000..8ba426f188
--- /dev/null
+++ b/scp2/source/templates/module_langpack_accessories_samples_root.sct
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Accessories_Adv_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Advertisement;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
+
+Module gid_Module_Optional_Accessories_Doc_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Documentations;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
+
+Module gid_Module_Optional_Accessories_Sam_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Samples;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
diff --git a/scp2/source/templates/module_langpack_accessories_templates.sct b/scp2/source/templates/module_langpack_accessories_templates.sct
new file mode 100644
index 0000000000..8bb968923a
--- /dev/null
+++ b/scp2/source/templates/module_langpack_accessories_templates.sct
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Accessories_Tem_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Tem_Root_<LANGUAGE_>;
+    Sortkey = "50";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Accessories_Tem_Template;
+    Name = "gid_Module_Optional_Accessories_Tem_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Accessories_Tem_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_accessories_templates_root.sct b/scp2/source/templates/module_langpack_accessories_templates_root.sct
new file mode 100644
index 0000000000..97dd8e8453
--- /dev/null
+++ b/scp2/source/templates/module_langpack_accessories_templates_root.sct
@@ -0,0 +1,27 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Accessories_Tem_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Templates;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
diff --git a/scp2/source/templates/module_langpack_base.sct b/scp2/source/templates/module_langpack_base.sct
new file mode 100644
index 0000000000..34284aaf96
--- /dev/null
+++ b/scp2/source/templates/module_langpack_base.sct
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+Module gid_Module_Langpack_Base_<LANGUAGE_>
+    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
+    Sortkey = "800";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Langpack_Base_Template;
+    Name = "gid_Module_Langpack_Base_<LANGUAGE_>";
+    Description = "gid_Module_Langpack_Base_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_calc.sct b/scp2/source/templates/module_langpack_calc.sct
new file mode 100644
index 0000000000..011426695d
--- /dev/null
+++ b/scp2/source/templates/module_langpack_calc.sct
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+Module gid_Module_Langpack_Calc_<LANGUAGE_>
+    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
+    Sortkey = "450";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Langpack_Calc_Template;
+    Name = "gid_Module_Langpack_Calc_<LANGUAGE_>";
+    Description = "gid_Module_Langpack_Calc_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_draw.sct b/scp2/source/templates/module_langpack_draw.sct
new file mode 100644
index 0000000000..23d6985657
--- /dev/null
+++ b/scp2/source/templates/module_langpack_draw.sct
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+Module gid_Module_Langpack_Draw_<LANGUAGE_>
+    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
+    Sortkey = "600";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Langpack_Draw_Template;
+    Name = "gid_Module_Langpack_Draw_<LANGUAGE_>";
+    Description = "gid_Module_Langpack_Draw_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_impress.sct b/scp2/source/templates/module_langpack_impress.sct
new file mode 100644
index 0000000000..d06e1a4bb5
--- /dev/null
+++ b/scp2/source/templates/module_langpack_impress.sct
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+Module gid_Module_Langpack_Impress_<LANGUAGE_>
+    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
+    Sortkey = "500";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Langpack_Impress_Template;
+    Name = "gid_Module_Langpack_Impress_<LANGUAGE_>";
+    Description = "gid_Module_Langpack_Impress_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_math.sct b/scp2/source/templates/module_langpack_math.sct
new file mode 100644
index 0000000000..ab23718d56
--- /dev/null
+++ b/scp2/source/templates/module_langpack_math.sct
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+Module gid_Module_Langpack_Math_<LANGUAGE_>
+    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
+    Sortkey = "700";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Langpack_Math_Template;
+    Name = "gid_Module_Langpack_Math_<LANGUAGE_>";
+    Description = "gid_Module_Langpack_Math_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_root.sct b/scp2/source/templates/module_langpack_root.sct
new file mode 100644
index 0000000000..eb0b7764bb
--- /dev/null
+++ b/scp2/source/templates/module_langpack_root.sct
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+Module gid_Module_Langpack_Basis_<LANGUAGE_>
+    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
+    InstallOrder = "200";
+    Sortkey = "50";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Langpack_Basis_Template;
+    Name = "gid_Module_Langpack_Basis_<LANGUAGE_>";
+    Description = "gid_Module_Langpack_Basis_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
+
+Module gid_Module_Langpack_Fonts_<LANGUAGE_>
+    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
+    Sortkey = "300";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Langpack_Fonts_Template;
+    Name = "gid_Module_Langpack_Fonts_<LANGUAGE_>";
+    Description = "gid_Module_Langpack_Fonts_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
+
+Module gid_Module_Langpack_Brand_<LANGUAGE_>
+    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
+    Sortkey = "400";
+    InstallOrder = "1050";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Langpack_Brand_Template;
+    Name = "gid_Module_Langpack_Brand_<LANGUAGE_>";
+    Description = "gid_Module_Langpack_Brand_<LANGUAGE_>";
+    PackageInfo = "packinfo_brand.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_writer.sct b/scp2/source/templates/module_langpack_writer.sct
new file mode 100644
index 0000000000..301a5db39c
--- /dev/null
+++ b/scp2/source/templates/module_langpack_writer.sct
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+Module gid_Module_Langpack_Writer_<LANGUAGE_>
+    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
+    Sortkey = "400";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Langpack_Writer_Template;
+    Name = "gid_Module_Langpack_Writer_<LANGUAGE_>";
+    Description = "gid_Module_Langpack_Writer_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/modules.pl b/scp2/source/templates/modules.pl
new file mode 100644
index 0000000000..4cf828869f
--- /dev/null
+++ b/scp2/source/templates/modules.pl
@@ -0,0 +1,176 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+
+my $completelangiso_var = $ENV{COMPLETELANGISO_VAR};
+my $lastcompletelangiso_var = "";
+my $outfile = "";
+my $infile = "";
+my @infile = ();
+my $globalcounter = 0;
+my $globallinecounter = 0;
+my $verbose = 0;
+
+if ( !defined $completelangiso_var) {
+    print STDERR "ERROR: No language defined!\n";
+    exit 1;
+}
+
+startup_check();
+
+# if ( "$completelangiso_var" eq "$lastcompletelangiso_var" ) {
+#    print STDERR "No new languages. Keeping old file\n";
+#    exit 0;
+# }
+
+my @completelangiso = split " +", $completelangiso_var;
+
+open OUTFILE, ">$outfile" or die "$0 ERROR: cannot open $outfile for writing!\n";
+print OUTFILE "// generated file, do not edit\n\n";
+print OUTFILE "// languages used for last time generation\n";
+print OUTFILE "// completelangiso: $completelangiso_var\n\n";
+write_ALL_MODULES();
+close OUTFILE;
+check_counter();
+
+sub check_counter
+{
+    print STDERR "Wrote modules for $globalcounter languages ($globallinecounter lines)!\n" if $verbose;
+    if ( $globalcounter == 0 )
+    {
+        print STDERR "ERROR: No languages found!\n";
+        exit 1;
+    }
+
+    if ( $globallinecounter == 0 )
+    {
+        print STDERR "ERROR: No lines written!\n";
+        exit 1;
+    }
+}
+
+
+sub write_ALL_MODULES
+{
+    my $counter = 0;
+    my $linecounter = 0;
+    my $linecount = $#infile + 1;
+    # print STDERR "Lines in inputfile: $linecount!\n";
+
+    foreach $lang (@completelangiso) {
+        $language = $lang;
+        $language_ = $lang;
+        $language_ =~ s/-/_/;
+        $languagebig_ = uc($lang);
+        $languagebig_ =~ s/-/_/;
+        $counter++;
+        my $sortkey = 100 * $counter;
+
+        for ( $i = 0; $i <= $#infile; $i++) {
+            my $line = $infile[$i];
+            if (( $line =~  /^\s*\*/ ) || ( $line =~  /^\s*\/\*/ )) { next; }
+            $line =~ s/\<LANGUAGE\>/$language/g;
+            $line =~ s/\<LANGUAGE_\>/$language_/g;
+            $line =~ s/\<LANGUAGEBIG_\>/$languagebig_/g;
+            $line =~ s/\<SORTKEY\>/$sortkey/g;
+            print OUTFILE $line;
+            $linecounter++;
+        }
+        print OUTFILE "\n";
+    }
+    print OUTFILE "\n";
+
+    $globalcounter = $counter;
+    $globallinecounter = $linecounter;
+}
+
+sub startup_check
+{
+    my $i;
+
+    if ( $#ARGV >= 0 )
+    {
+        if ( $ARGV[0] eq "-verbose" )
+        {
+            $verbose = 1;
+            shift @ARGV;
+        }
+        elsif ( $ARGV[0] eq "-quiet" )
+        {
+            # no special quiet flag/mode
+            shift @ARGV;
+        }
+    }
+
+    for ( $i=0; $i <= $#ARGV; $i++) {
+        if ( "$ARGV[$i]" eq "-o" ) {
+            if ( defined $ARGV[ $i + 1] ) {
+                $outfile = $ARGV[ $i + 1];
+                $i++;
+            }
+        } elsif ( "$ARGV[$i]" eq "-i" ) {
+            if ( defined $ARGV[ $i + 1] ) {
+                $infile = $ARGV[ $i + 1];
+                $i++;
+            }
+        } else {
+            usage();
+        }
+    }
+
+    usage() if $i < 3;
+    usage() if "$outfile" eq "";
+    usage() if "$infile" eq "";
+
+    if ( -f "$infile" ) {
+        open INFILE, "$infile" or die "$0 - ERROR: $infile exists but isn't readable.\n";
+        @infile = <INFILE>;
+        close( INFILE );
+        print STDERR "Reading template file: $infile\n" if $verbose;
+        my $num = $#infile + 1;
+        # print STDERR "Number of lines: $num\n";
+    } else {
+        die "Template file \"$infile\" not found!\n";
+        exit 1;
+    }
+
+    if ( -f "$outfile" ) {
+        # changed script - run always
+        return if (stat($0))[9] > (stat("$outfile"))[9] ;
+        # changed template file - run always
+        return if (stat($infile))[9] > (stat("$outfile"))[9] ;
+
+        open OLDFILE, "$outfile" or die "$0 - ERROR: $outfile exists but isn't readable.\n";
+        while ( $line = <OLDFILE> ) {
+            if ( $line =~ /^\/\/.*completelangiso:/ ) {
+                $lastcompletelangiso_var = $line;
+                chomp $lastcompletelangiso_var;
+                $lastcompletelangiso_var =~ s/^\/\/.*completelangiso:\s*//;
+                last;
+            }
+        }
+        close OLDFILE;
+    }
+
+}
+
+sub usage
+{
+    print STDERR "Generate language modules from language script particle template (*.sct file)\n";
+    print STDERR "perl $0 [-verbose] -o outputfile -i inputfile\n";
+    exit  1;
+}
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
new file mode 100644
index 0000000000..3eb80bbec6
--- /dev/null
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+Directory gid_Dir_Shlxthdl
+    ParentID = gid_Brand_Dir_Program;
+    DosName = "shlxthdl";
+End
+
+#ifdef BUILD_X64
+Directory gid_Dir_Shlxthdl_x64
+    ParentID = gid_Dir_Shlxthdl;
+    DosName = ".";
+End
+#endif
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
new file mode 100644
index 0000000000..2acd44c1ed
--- /dev/null
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -0,0 +1,49 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/winexplorerextbinarytable"
+#include "AutoInstall/winexplorerext"
+#ifdef BUILD_X64
+#include "AutoInstall/winexplorerextwin64"
+#endif
+
+Module gid_Module_Optional_Winexplorerext
+    MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS );
+    Sortkey = "1205";
+    Default = YES;
+    ParentID = gid_Module_Optional;
+    Dirs = (gid_Dir_Shlxthdl);
+    Files = (auto_winexplorerextbinarytable_ALL,
+             auto_winexplorerext_ALL,
+             gid_File_Tmp_Userinstall_Winexplorerext_Inf);
+End
+
+#ifdef BUILD_X64
+Module gid_Module_Optional_Winexplorerext_x64
+    ParentID = gid_Module_Optional_Winexplorerext;
+    Name = "gid_Module_Optional_Winexplorerext_x64";
+    Description = "gid_Module_Optional_Winexplorerext_x64";
+    Sortkey = "1210";
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+    Dirs = (gid_Dir_Shlxthdl_x64);
+    Files = (auto_winexplorerextwin64_ALL);
+End
+#endif
diff --git a/scp2/source/winexplorerext/module_winexplorerext.ulf b/scp2/source/winexplorerext/module_winexplorerext.ulf
new file mode 100644
index 0000000000..1632108096
--- /dev/null
+++ b/scp2/source/winexplorerext/module_winexplorerext.ulf
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS]
+en-US = "Windows Explorer Extension"
+
+[STR_DESC_MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS]
+en-US = "Enables the Microsoft File Explorer to show information about %PRODUCTNAME documents, such as thumbnail previews, and perform full-text search."
+
+
+
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
new file mode 100644
index 0000000000..c144160f83
--- /dev/null
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -0,0 +1,501 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+
+// Begin registry items for the Infotip handler
+
+RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+End
+
+#endif
+
+RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_TM
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_TM_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+#endif
+
+RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_Approved
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+    Value = "%PRODUCTNAME Infotip Handler";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_Approved_x64
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+    Value = "%PRODUCTNAME Infotip Handler";
+End
+
+#endif
+
+// End registry items for the Infotip handler
+
+// Begin registry items for the Thumbnail viewer
+
+RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+End
+
+#endif
+
+RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_TM
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+    Val64 = "Apartment";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_TM_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+
+#endif
+
+RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_Approved
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+    Value = "%PRODUCTNAME Thumbnail Viewer";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_Approved_x64
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+    Value = "%PRODUCTNAME Thumbnail Viewer";
+End
+
+#endif
+
+// End registry items for the Thumbnail viewer
+
+// Begin registry items for the Column handler
+
+RegistryItem gid_Regitem_Folder_shellex_ColHandl_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
+    Value = "%PRODUCTNAME Column Handler";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Folder_shellex_ColHandl_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
+    Value = "%PRODUCTNAME Column Handler";
+End
+
+#endif
+
+RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+End
+
+#endif
+
+RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_TM
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_TM_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+
+#endif
+
+RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_Approved
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
+    Value = "%PRODUCTNAME Column Handler";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_Approved_x64
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
+    Value = "%PRODUCTNAME Column Handler";
+End
+
+#endif
+
+// End registry items for the Column handler
+
+// Begin registry items for the MS Indexing server filter component
+
+RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
+    Value = "OpenDocument Format Filter";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
+    Value = "OpenDocument Format Filter";
+End
+
+#endif
+
+RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\ooofilt.dll";
+    Val64 = "[INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
+End
+
+#endif
+
+RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_TM
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_TM_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+
+#endif
+
+RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+    Value = "OpenDocument Format Persistent Handler";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+    Value = "OpenDocument Format Persistent Handler";
+End
+
+#endif
+
+RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsReg
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}";
+    Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsReg_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}";
+    Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
+End
+
+#endif
+
+// End registry items for the MS Indexing server filter component
+
+// Begin registry entries for the PropertySheet handler
+
+RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
+End
+
+#endif
+
+RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_TM
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_TM_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+
+#endif
+
+RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_Approved
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+    Value = "%PRODUCTNAME Property Sheet Handler";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_Approved_x64
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+    Value = "%PRODUCTNAME Property Sheet Handler";
+End
+
+#endif
+
+// End registry entries for the PropertySheet handler
+
+// Begin registry entries for the Property handler
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Value = "%PRODUCTNAME Property Handler";
+End
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Name = "EnableShareDenyNone";
+    Value = "#1";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Value = "%PRODUCTNAME Property Handler";
+End
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Name = "EnableShareDenyNone";
+    Value = "#1";
+End
+
+#endif
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\propertyhdl.dll";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
+    Value = "[INSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll";
+End
+
+#endif
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_TM
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_TM_x64
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
+    Name = "ThreadingModel";
+    Value = "Apartment";
+End
+
+#endif
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Value = "%PRODUCTNAME Property Handler";
+End
+
+#ifdef BUILD_X64
+
+RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved_x64
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Optional_Winexplorerext_x64;
+    ComponentCondition = "VersionNT64";
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
+    Name = "{AE424E85-F6DF-4910-A6A9-438797986431}";
+    Value = "%PRODUCTNAME Property Handler";
+End
+
+#endif
+
+// End registry entries for the Property handler
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
new file mode 100644
index 0000000000..d29e1594a4
--- /dev/null
+++ b/scp2/source/writer/file_writer.scp
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#if defined WITH_HELPPACKS
+File gid_File_Help_Swriter_Zip
+    Dir = FILELIST_DIR;
+    FILELIST_TXT_FILE_BODY_HELPPACK;
+    EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(swriter);
+End
+#endif
+
+File gid_File_Share_Registry_Writer_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "writer.xcd";
+End
diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp
new file mode 100644
index 0000000000..306fc888d2
--- /dev/null
+++ b/scp2/source/writer/folderitem_writer.scp
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#ifndef ENABLE_SILENT_MSI
+FolderItem gid_Folderitem_Swriter
+    Name = "%PRODUCTNAME Writer";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    FolderID = gid_Folder_Staroffice51;
+    FileID = auto_writer_brand_exe_swriter;
+    IconFile = auto_writer_brand_exe_swriter;
+    IconID = 0;
+    WkDir = gid_Brand_Dir_Program;
+    Parameter = "";
+    Styles = (NON_ADVERTISED);
+    ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER);
+End
+
+FolderItemProperty gid_Fip_Swriter_AppID
+    ShortcutID = gid_Folderitem_Swriter;
+    Key = "System.AppUserModel.ID";
+    Value = "TheDocumentFoundation.LibreOffice.Writer";
+End
+#endif
diff --git a/scp2/source/writer/folderitem_writer.ulf b/scp2/source/writer/folderitem_writer.ulf
new file mode 100644
index 0000000000..5ccf70abb5
--- /dev/null
+++ b/scp2/source/writer/folderitem_writer.ulf
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_FI_NAME_HTMLDOKUMENT]
+en-US = "HTML Document"
+
+[STR_FI_NAME_TEXTDOKUMENT]
+en-US = "Text Document"
+
+[STR_FI_TOOLTIP_WRITER]
+en-US = "Create and edit text and images in letters, reports, documents and Web pages by using Writer."
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
new file mode 100644
index 0000000000..9a0ed77ac4
--- /dev/null
+++ b/scp2/source/writer/module_writer.scp
@@ -0,0 +1,80 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/writer"
+#include "AutoInstall/writer_brand"
+
+Module gid_Module_Prg_Wrt
+    MOD_NAME_DESC(MODULE_PRG_WRT);
+    ParentID = gid_Module_Prg;
+    Sortkey = "100";
+    Styles =(APPLICATIONMODULE);
+End
+
+Module gid_Module_Prg_Wrt_Bin
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC ( MODULE_PRG_WRT_BIN );
+    ParentID = gid_Module_Prg_Wrt;
+    Sortkey = "100";
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+    Files = (auto_writer_ALL,
+    gid_File_Share_Registry_Writer_Xcd,
+    gid_File_Tmp_Userinstall_Wrt_Inf);
+End
+
+Module gid_Module_Brand_Prg_Wrt
+    PackageInfo = "packinfo_brand.txt";
+    Name = "gid_Module_Brand_Prg_Wrt";
+    Description = "gid_Module_Brand_Prg_Wrt";
+    ParentID = gid_Module_Prg_Wrt;
+    Sortkey = "100";
+    InstallOrder = "1040";
+    Default = YES;
+    Styles = (HIDDEN_ROOT);
+    Files = (auto_writer_brand_ALL);
+End
+
+Module gid_Module_Langpack_Writer_Template
+    ParentID = gid_Module_Prg_Wrt_Bin;
+    Name = "gid_Module_Langpack_Writer_Template";
+    Description = "gid_Module_Langpack_Writer_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = ();
+End
+
+Module gid_Module_Prg_Wrt_MSO_Reg
+    ParentID = gid_Module_Prg_Wrt;
+    Name = "gid_Module_Prg_Wrt_MSO_Reg";
+    Description = "gid_Module_Prg_Wrt_MSO_Reg";
+    Styles = (HIDDEN_ROOT);
+    Default = YES;
+End
+
+Module gid_Module_Prg_Wrt_Other_Reg
+    ParentID = gid_Module_Prg_Wrt;
+    Name = "gid_Module_Prg_Wrt_Other_Reg";
+    Description = "gid_Module_Prg_Wrt_Other_Reg";
+    Styles = (HIDDEN_ROOT);
+    Default = YES;
+End
+
+#include "alllangmodules_writer.inc"
+
diff --git a/scp2/source/writer/module_writer.ulf b/scp2/source/writer/module_writer.ulf
new file mode 100644
index 0000000000..9068573788
--- /dev/null
+++ b/scp2/source/writer/module_writer.ulf
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_PRG_WRT]
+en-US = "%PRODUCTNAME Writer"
+
+[STR_DESC_MODULE_PRG_WRT]
+en-US = "Create and edit text and images in letters, reports, documents and Web pages by using %PRODUCTNAME Writer."
+
+[STR_NAME_MODULE_PRG_WRT_BIN]
+en-US = "Program Module"
+
+[STR_DESC_MODULE_PRG_WRT_BIN]
+en-US = "The application %PRODUCTNAME Writer"
+
+[STR_NAME_MODULE_PRG_WRT_HELP]
+en-US = "%PRODUCTNAME Writer Help"
+
+[STR_DESC_MODULE_PRG_WRT_HELP]
+en-US = "Help about %PRODUCTNAME Writer"
+
+[STR_NAME_MODULE_PRG_WRT_WRITER2LATEX]
+en-US = "LaTeX Export"
+
+[STR_DESC_MODULE_PRG_WRT_WRITER2LATEX]
+en-US = "LaTeX export filter for Writer documents."
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
new file mode 100644
index 0000000000..e8b931314a
--- /dev/null
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -0,0 +1,1770 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+// MSOLE embedded object in SO7 file format
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e_
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}";
+    REG_VALUE_LNG(SO60_TEXT)
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Auxusertype_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\AuxUserType\2";
+    Value = "%PRODUCTNAME";
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Auxusertype_3
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\AuxUserType\3";
+    REG_VALUE_LNG(SO60_TEXT)
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Dataformats_Getset_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\DataFormats\GetSet\0";
+    Value = "Embed Source,1,8,1";
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Dataformats_Getset_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\DataFormats\GetSet\1";
+    Value = "3,1,32,1";
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Dataformats_Getset_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\DataFormats\GetSet\2";
+    Value = "2,1,16,1";
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,0";
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Inprochandler32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\InprocHandler32";
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\Insertable";
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Localserver32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\LocalServer32";
+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Miscstatus
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\MiscStatus";
+    Value = "16";
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Progid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\ProgID";
+    Value = "soffice.StarWriterDocument.6";
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Programmable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\Programmable";
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\verb\0";
+    Value = "&Edit,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\verb\-1";
+    Value = "Show,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\verb\-2";
+    Value = "Open,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Versionindependentprogid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\VersionIndependentProgID";
+    Value = "soffice.StarWriterDocument.6";
+End
+
+// MSOLE embedded object in OASIS file format
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad_
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}";
+    REG_VALUE_LNG(OO_WRITER)
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Auxusertype_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\AuxUserType\2";
+    Value = "%PRODUCTNAME";
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Auxusertype_3
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\AuxUserType\3";
+    REG_VALUE_LNG(OO_WRITER)
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Dataformats_Getset_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\DataFormats\GetSet\0";
+    Value = "Embed Source,1,8,1";
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Dataformats_Getset_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\DataFormats\GetSet\1";
+    Value = "3,1,32,1";
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Dataformats_Getset_2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\DataFormats\GetSet\2";
+    Value = "2,1,16,1";
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,0";
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Inprochandler32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\InprocHandler32";
+    Value = "<progpath>\program\inprocserv.dll";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\Insertable";
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Localserver32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\LocalServer32";
+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Miscstatus
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\MiscStatus";
+    Value = "16";
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Progid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\ProgID";
+    Value = "LibreOffice.WriterDocument.1";
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Programmable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\Programmable";
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\verb\0";
+    Value = "&Edit,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\verb\-1";
+    Value = "Show,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\verb\-2";
+    Value = "Open,0,0";
+End
+
+RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Versionindependentprogid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\VersionIndependentProgID";
+    Value = "LibreOffice.WriterDocument.1";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6";
+    REG_VALUE_LNG(SO60_TEXT)
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Clsid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6\CLSID";
+    Value = "{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,1";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Writer";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(SO60_TEXT)
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6\Insertable";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Protocol_Stdfileediting_Server
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6\protocol\StdFileEditing\server";
+    Value = "<progpath>\program\soffice.exe";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Protocol_Stdfileediting_Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6\protocol\StdFileEditing\verb\0";
+    Value = "&Edit";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Protocol_Stdfileediting_Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6\protocol\StdFileEditing\verb\-1";
+    Value = "&Show";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Protocol_Stdfileediting_Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6\protocol\StdFileEditing\verb\-2";
+    Value = "&Open";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6\shell";
+    Value = "open";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6\shell\new";
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6\shell\new\command";
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6\shell\open\command";
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6\shell\print\command";
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6\shell\printto\command";
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterdocument_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument\CurVer";
+    Value = "soffice.StarWriterDocument.6";
+End
+
+RegistryItem gid_Regitem_StarWriterGlobalDocument_6_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterGlobalDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarWriterGlobalDocument.6";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    REG_VALUE_LNG(SO60_MASTERDOC)
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarWriterGlobalDocument.6\DefaultIcon";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "<progpath>\program\soffice.bin,9";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterGlobalDocument.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Writer";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterGlobalDocument.6";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(SO60_MASTERDOC)
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarWriterGlobalDocument.6\shell";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "open";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarWriterGlobalDocument.6\shell\new";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarWriterGlobalDocument.6\shell\new\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarWriterGlobalDocument.6\shell\open\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarWriterGlobalDocument.6\shell\print\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarWriterGlobalDocument.6\shell\printto\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarWriterGlobalDocument\CurVer";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "soffice.StarWriterGlobalDocument.6";
+End
+
+RegistryItem gid_Regitem_StarWriterTemplate_6_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterTemplate.6\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwritertemplate_6
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarWriterTemplate.6";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    REG_VALUE_LNG(SO60_WRITER_TEMPLATE)
+End
+
+RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarWriterTemplate.6\DefaultIcon";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "<progpath>\program\soffice.bin,2";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterTemplate.6";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Writer";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterTemplate.6";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(SO60_WRITER_TEMPLATE)
+End
+
+RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterTemplate.6\shell";
+    Value = "new";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterTemplate.6\shell\new";
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterTemplate.6\shell\new\command";
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarWriterTemplate.6\shell\open\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarWriterTemplate.6\shell\print\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "soffice.StarWriterTemplate.6\shell\printto\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+RegistryItem gid_Regitem_Stw_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".stw\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Stw_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".stw\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Stw_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".stw\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_Stw
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".stw";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "soffice.StarWriterTemplate.6";
+End
+
+RegistryItem gid_Regitem_Stw_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".stw";
+    Name = "Content Type";
+    Value = "application/vnd.sun.xml.writer.template";
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_stw_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "soffice.StarWriterTemplate.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_stw_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".stw";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Sxg_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".sxg\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Sxg_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".sxg\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Sxg_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".sxg\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_Sxg
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".sxg";
+    Value = "soffice.StarWriterGlobalDocument.6";
+End
+
+RegistryItem gid_Regitem_Sxg_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".sxg";
+    Name = "Content Type";
+    Value = "application/vnd.sun.xml.writer.global";
+End
+
+RegistryItem gid_Regitem_Sxg_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.sun.xml.writer.global";
+    Name = "Extension";
+    Value = ".sxg";
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_sxg_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "soffice.StarWriterGlobalDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_sxg_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".sxg";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Sxw_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".sxw\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Sxw_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".sxw\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Sxw_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".sxw\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_Sxw_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".sxw";
+    Name = "Content Type";
+    Value = "application/vnd.sun.xml.writer";
+End
+
+RegistryItem gid_Regitem_Sxw_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.sun.xml.writer";
+    Name = "Extension";
+    Value = ".sxw";
+End
+
+RegistryItem gid_Regitem_StarWriterDocument_6_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "soffice.StarWriterDocument.6\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem__Sxw
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".sxw";
+    Value = "soffice.StarWriterDocument.6";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxw
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = ".sxw";
+    Value = "soffice.StarWriterDocument.6";
+    Styles = ();
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_sxw_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "soffice.StarWriterDocument.6";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_sxw_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".sxw";
+    Value = "document";
+End
+
+// new odt file extension
+
+RegistryItem gid_Regitem_Odt_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".odt\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Odt_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".odt\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Odt_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".odt\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_WriterDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem__Odt
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".odt";
+    Value = "LibreOffice.WriterDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_odt
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = ".odt";
+    Value = "LibreOffice.WriterDocument.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_MimeAssociations_odt
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\MimeAssociations";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "application/vnd.oasis.opendocument.text";
+    Value = "LibreOffice.WriterDocument.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Odt_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".odt";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.text";
+End
+
+RegistryItem gid_Regitem_Odt_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.text";
+    Name = "Extension";
+    Value = ".odt";
+End
+
+RegistryItem gid_Regitem_Odt_Openoffice_Writerdocument_1_Shellnew
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".odt\LibreOffice.WriterDocument.1\ShellNew";
+    Name = "FileName";
+    Value = "<progpath>\share\template\shellnew\soffice.odt";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument\CurVer";
+    Value = "LibreOffice.WriterDocument.1";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1";
+    REG_VALUE_LNG(OO_WRITER)
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Clsid
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1\CLSID";
+    Value = "{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1\DefaultIcon";
+    Value = "<progpath>\program\soffice.bin,1";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Writer";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(OO_WRITER)
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1\Insertable";
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_odt_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "LibreOffice.WriterDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_odt_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".odt";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Server
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\server";
+    Value = "<progpath>\program\soffice.exe";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Verb_0
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\verb\0";
+    Value = "&Edit";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Verb__1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\verb\-1";
+    Value = "&Show";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Verb__2
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1\protocol\StdFileEditing\verb\-2";
+    Value = "&Open";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1\shell";
+    Value = "open";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1\shell\new";
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1\shell\new\command";
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1\shell\open\command";
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1\shell\print\command";
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterDocument.1\shell\printto\command";
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+// Writer Web Document
+RegistryItem gid_Regitem_Openoffice_Writerwebdocument_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterWebDocument\CurVer";
+    Value = "LibreOffice.WriterWebDocument.1";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterWebDocument.1";
+    REG_VALUE_LNG(OO_WRITER)
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterWebDocument.1\shell\open\command";
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_WriterApplication
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "Writer.Application\CLSID";
+    Value = "{82154421-0FBF-11d4-8313-005004526AB4}";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Clsid__82154421_0FBF_11d4_8313_005004526AB4__Localserver32
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "CLSID\{82154421-0FBF-11d4-8313-005004526AB4}\LocalServer32";
+    Value = "<progpath>\program\soffice.exe --nodefault --nologo";
+End
+
+// .fodt
+
+RegistryItem gid_Regitem__Fodt
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".fodt";
+    Value = "LibreOffice.WriterDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodt
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Root;
+    Name = ".fodt";
+    Value = "LibreOffice.WriterDocument.1";
+End
+
+RegistryItem gid_Regitem_Fodt_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".fodt";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.text";
+End
+
+RegistryItem gid_Regitem_fodt_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".fodt";
+    Value = "document";
+End
+
+// new ott file extension
+
+RegistryItem gid_Regitem_Ott_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".ott\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Ott_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".ott\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Ott_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".ott\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_WriterTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Ott
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".ott";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "LibreOffice.WriterTemplate.1";
+End
+
+RegistryItem gid_Regitem_Ott_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".ott";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.text-template";
+End
+
+RegistryItem gid_Regitem_Otm_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".otm";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.text-master-template";
+End
+
+RegistryItem gid_Regitem_Soffice_Starwritertemplate_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterTemplate.1";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    REG_VALUE_LNG(OO_WRITER_TEMPLATE)
+End
+
+RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterTemplate.1\DefaultIcon";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "<progpath>\program\soffice.bin,2";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writertemplate_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterTemplate.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Writer";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writertemplate_1_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterTemplate.1";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(OO_WRITER_TEMPLATE)
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_ott_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "LibreOffice.WriterTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_ott_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".ott";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterTemplate.1\shell";
+    Value = "new";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterTemplate.1\shell\new";
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterTemplate.1\shell\new\command";
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterTemplate.1\shell\open\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterTemplate.1\shell\print\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterTemplate.1\shell\printto\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+// new odm file extension
+
+RegistryItem gid_Regitem_Odm_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".odm\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Odm_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".odm\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Odm_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".odm\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_WriterGlobalDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Odm
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".odm";
+    Value = "LibreOffice.WriterGlobalDocument.1";
+End
+
+RegistryItem gid_Regitem_Odm_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".odm";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.text-master";
+End
+
+RegistryItem gid_Regitem_Odm_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.text-master";
+    Name = "Extension";
+    Value = ".odm";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterGlobalDocument\CurVer";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "LibreOffice.WriterGlobalDocument.1";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterGlobalDocument.1";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    REG_VALUE_LNG(OO_MASTERDOC)
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterGlobalDocument.1\DefaultIcon";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "<progpath>\program\soffice.bin,9";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterGlobalDocument.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Writer";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterGlobalDocument.1";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(OO_MASTERDOC)
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_odm_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "LibreOffice.WriterGlobalDocument.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_odm_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".odm";
+    Value = "document";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "open";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\new";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\new\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\open\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\print\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterGlobalDocument.1\shell\printto\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+// new oth file extension
+
+RegistryItem gid_Regitem_Oth_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".oth\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Oth_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".oth\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Oth_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".oth\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_WriterWebTemplate_Shellex_PropertySheetHandlers_MyPropSheet1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterWebTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
+End
+
+RegistryItem gid_Regitem_Oth
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".oth";
+    Value = "LibreOffice.WriterWebTemplate.1";
+End
+
+RegistryItem gid_Regitem_Oth_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".oth";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.text-web";
+End
+
+RegistryItem gid_Regitem_Oth_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.text-web";
+    Name = "Extension";
+    Value = ".oth";
+End
+
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_Curver
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterWebTemplate\CurVer";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "LibreOffice.WriterWebTemplate.1";
+End
+
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterWebTemplate.1";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    REG_VALUE_LNG(OO_WEBDOC)
+End
+
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Defaulticon
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterWebTemplate.1\DefaultIcon";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "<progpath>\program\soffice.bin,10";
+End
+
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_AppUserModelID
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterWebTemplate.1";
+    Name = "AppUserModelID";
+    Value = "TheDocumentFoundation.LibreOffice.Writer";
+End
+
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_FriendlyTypeName
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "LibreOffice.WriterWebTemplate.1";
+    Name = "FriendlyTypeName";
+    REG_VALUE_LNG(OO_WEBDOC)
+End
+
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "open";
+End
+
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_New
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell\new";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    REG_VALUE_LNG(NEW)
+End
+
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_New_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell\new\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Open_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell\open\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Print_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell\print\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
+End
+
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Printto_Command
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "LibreOffice.WriterWebTemplate.1\shell\printto\command";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
+End
+
+#ifdef _MSC_VER
+RegistryItem gid_Regitem_oth_FullDetails
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Optional_Winexplorerext;
+    Subkey = "LibreOffice.WriterWebTemplate.1";
+    Name = "FullDetails";
+    Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
+End
+#endif
+
+RegistryItem gid_Regitem_oth_KindMap
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
+    Name = ".oth";
+    Value = "document";
+End
+
+// "OpenWith" Windows Registry keys for extensions supported by Writer
+
+// .ODT
+RegistryItem gid_Regitem_OpenOffice_ODT_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".odt\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "LibreOffice.WriterDocument.1";
+    Value = " ";
+End
+
+// .OTT
+RegistryItem gid_Regitem_OpenOffice_OTT_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".ott\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "LibreOffice.WriterTemplate.1";
+    Value = " ";
+End
+
+// .OTH
+RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".oth\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "LibreOffice.WriterWebTemplate.1";
+    Value = " ";
+End
+
+// .ODM
+RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".odm\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "LibreOffice.WriterGlobalDocument.1";
+    Value = " ";
+End
+
+// .SXW
+RegistryItem gid_Regitem_OpenOffice_SXW_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".sxw\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "soffice.StarWriterDocument.6";
+    Value = " ";
+End
+
+// .STW
+RegistryItem gid_Regitem_OpenOffice_STW_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".stw\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "soffice.StarWriterTemplate.6";
+    Value = " ";
+End
+
+// .TXT
+RegistryItem gid_Regitem_OpenOffice_TXT_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".txt\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "soffice.StarWriterDocument.6";
+    Value = " ";
+End
+
+// .HTM
+RegistryItem gid_Regitem_OpenOffice_HTM_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".htm\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "soffice.StarWriterDocument.6";
+    Value = " ";
+End
+
+// .HTML
+RegistryItem gid_Regitem_OpenOffice_HTML_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".html\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "soffice.StarWriterDocument.6";
+    Value = " ";
+End
+
+// .XML
+RegistryItem gid_Regitem_OpenOffice_XML_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".xml\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "soffice.StarWriterDocument.6";
+    Value = " ";
+End
+
+// .WPD
+RegistryItem gid_Regitem_OpenOffice_WPD_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".wpd\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "soffice.StarWriterDocument.6";
+    Value = " ";
+End
+
+// .WPS
+RegistryItem gid_Regitem_OpenOffice_WPS_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".wps\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "LibreOffice.WriterDocument.1";
+    Value = " ";
+End
+
+// .WRI
+RegistryItem gid_Regitem_OpenOffice_WRI_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".wri\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "LibreOffice.WriterDocument.1";
+    Value = " ";
+End
+
+// .HWP
+RegistryItem gid_Regitem_OpenOffice_HWP_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".hwp\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "soffice.StarWriterDocument.6";
+    Value = " ";
+End
+
+// .SXG
+RegistryItem gid_Regitem_OpenOffice_SXG_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".sxg\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "soffice.StarWriterGlobalDocument.6";
+    Value = " ";
+End
+
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Ott
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = ".ott";
+    Value = "LibreOffice.WriterTemplate.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Stw
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = ".stw";
+    Value = "soffice.StarWriterTemplate.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Txt
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = ".txt";
+    Value = "soffice.StarWriterDocument.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Htm
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = ".htm";
+    Value = "soffice.StarWriterDocument.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Html
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = ".html";
+    Value = "soffice.StarWriterDocument.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xml
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = ".xml";
+    Value = "soffice.StarWriterDocument.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Wpd
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = ".wpd";
+    Value = "soffice.StarWriterDocument.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Hwp
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = ".hwp";
+    Value = "soffice.StarWriterDocument.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sxg
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = ".sxg";
+    Name = "soffice.StarWriterGlobalDocument.6";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Oth
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = ".oth";
+    Value = "LibreOffice.WriterWebTemplate.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Odm
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = ".odm";
+    Value = "LibreOffice.WriterGlobalDocument.1";
+    Styles = ();
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Swriter_Exe
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\swriter.exe";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Value = "<progpath>\program\swriter.exe";
+End
+
+RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Swriter_Exepath
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\swriter.exe";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "Path";
+    Value = "<progpath>";
+End
+
+// registering the property handler for the supported file types
+
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odt )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( ott )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( oth )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( odm )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxw )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stw )
+REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxg )
+
+// registering the mso file types
+// CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,                 key,  cond, disp_name,        icon_id, app, default, dox_type)
+
+CONDITIONAL_REGISTER_DOC_EXTENSION( Doc,  gid_Module_Prg_Wrt_MSO_Reg, doc,  DOC,  MS_WORD_DOCUMENT_OLD, 1, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_MSO_Reg, docx, DOCX, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_MSO_Reg, docm, DOCM, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot,  gid_Module_Prg_Wrt_MSO_Reg, dot,  DOT,  MS_WORD_TEMPLATE_OLD, 2, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_MSO_Reg, dotx, DOTX, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_MSO_Reg, dotm, DOTM, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf,  gid_Module_Prg_Wrt_MSO_Reg, rtf,  RTF,  MS_RTF_DOCUMENT, 1, swriter.exe, open, Writer )
+
+// Registering OOXML MIME content types, to allow OS/applications to redirect such content to LO even if extension is unknown
+
+RegistryItem gid_Regitem_Docx_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+    Name = "Extension";
+    Value = ".docx";
+End
+
+RegistryItem gid_Regitem_Dotx_Mime_Database
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = "MIME\Database\Content Type\application/vnd.openxmlformats-officedocument.wordprocessingml.template";
+    Name = "Extension";
+    Value = ".dotx";
+End
+
+// registering other supported types
+
+CONDITIONAL_REGISTER_DOC_EXTENSION( Uot,  gid_Module_Prg_Wrt_Other_Reg, uot,  UOT,  UNIFORM_OFFICE_FORMAT_TEXT, 1, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Lwp,  gid_Module_Prg_Wrt_Other_Reg, lwp,  LWP,  WORDPRO_DOCUMENT, 1, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( 602,  gid_Module_Prg_Wrt_Other_Reg, 602,  602,  T602_TEXT_FILE, 1, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pages, gid_Module_Prg_Wrt_Other_Reg, pages, PAGES, PAGES_DOCUMENT, 1, swriter.exe, open, Writer )
+
+// registering ms-word URI scheme handler
+CONDITIONAL_REGISTER_URI_HANDLER( ms-word, ms_word, gid_Module_Prg_Wrt_MSO_Reg, SELECT_WORD )
+REGISTRY_ENTRY_CAPABILITIES_URL(ms-word, ms_word, gid_Module_Prg_Wrt_MSO_Reg, vnd.libreoffice.command)
diff --git a/scp2/source/writer/registryitem_writer.ulf b/scp2/source/writer/registryitem_writer.ulf
new file mode 100644
index 0000000000..db39d38ddd
--- /dev/null
+++ b/scp2/source/writer/registryitem_writer.ulf
@@ -0,0 +1,68 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_REG_VAL_NEW]
+en-US = "&New"
+
+[STR_REG_VAL_SO60_TEXT]
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Text Document"
+
+[STR_REG_VAL_SO60_MASTERDOC]
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Master Document"
+
+[STR_REG_VAL_SO60_WRITER_TEMPLATE]
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Text Document Template"
+
+[STR_REG_VAL_OO_WRITER]
+en-US = "OpenDocument Text"
+
+[STR_REG_VAL_OO_WRITER_TEMPLATE]
+en-US = "OpenDocument Text Template"
+
+[STR_REG_VAL_OO_MASTERDOC]
+en-US = "OpenDocument Master Document"
+
+[STR_REG_VAL_OO_WEBDOC]
+en-US = "HTML Document Template"
+
+[STR_REG_VAL_MS_WORD_DOCUMENT_OLD]
+en-US = "Microsoft Word 97-2003 Document"
+
+[STR_REG_VAL_MS_WORD_DOCUMENT]
+en-US = "Microsoft Word Document"
+
+[STR_REG_VAL_MS_WORD_TEMPLATE_OLD]
+en-US = "Microsoft Word 97-2003 Template"
+
+[STR_REG_VAL_MS_WORD_TEMPLATE]
+en-US = "Microsoft Word Template"
+
+[STR_REG_VAL_MS_RTF_DOCUMENT]
+en-US = "Rich Text Document"
+
+[STR_REG_VAL_UNIFORM_OFFICE_FORMAT_TEXT]
+en-US = "Uniform Office Format Text Document"
+
+[STR_REG_VAL_WORDPRO_DOCUMENT]
+en-US = "Lotus Word Pro Document"
+
+[STR_REG_VAL_T602_TEXT_FILE]
+en-US = "T602 Text File"
+
+[STR_REG_VAL_PAGES_DOCUMENT]
+en-US = "Apple Pages"
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
new file mode 100644
index 0000000000..04ad0b115f
--- /dev/null
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -0,0 +1,27 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+File gid_File_Share_Registry_Xsltfilter_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Share_Registry;
+    Name = "xsltfilter.xcd";
+End
+
diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp
new file mode 100644
index 0000000000..b4f5b936f9
--- /dev/null
+++ b/scp2/source/xsltfilter/module_xsltfilter.scp
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "macros.inc"
+
+#include "AutoInstall/xsltfilter"
+
+Module gid_Module_Optional_Xsltfiltersamples
+    PackageInfo = "packinfo_office.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_XSLTFILTERSAMPLES);
+    Sortkey = "700";
+    ParentID = gid_Module_Optional;
+    Files = (auto_xsltfilter_ALL,
+    gid_File_Share_Registry_Xsltfilter_Xcd );
+    Default = YES;
+    Styles = ( );
+End
diff --git a/scp2/source/xsltfilter/module_xsltfilter.ulf b/scp2/source/xsltfilter/module_xsltfilter.ulf
new file mode 100644
index 0000000000..c3cce08512
--- /dev/null
+++ b/scp2/source/xsltfilter/module_xsltfilter.ulf
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+[STR_NAME_MODULE_OPTIONAL_XSLTFILTERSAMPLES]
+en-US = "XSLT Sample Filters"
+
+[STR_DESC_MODULE_OPTIONAL_XSLTFILTERSAMPLES]
+en-US = "XSLT Sample Filters"
+
+
+