Merge branch 'master' into feature/killsdf

Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx

25 files changed, 113 insertions, 1443 deletions

diff --git a/scp2/CustomTarget_langmacros.mk b/scp2/CustomTarget_langmacros.mk
index 1d1a15793d69..19c680fcac02 100644
--- a/scp2/CustomTarget_langmacros.mk
+++ b/scp2/CustomTarget_langmacros.mk
@@ -31,10 +31,10 @@ $(call gb_CustomTarget_get_target,scp2/macros) : $(call gb_CustomTarget_get_work
 
 $(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 $(SRCDIR)/set_soenv.stamp
+$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc : $(SRCDIR)/scp2/macros/macro.pl $(SRCDIR)/config_host.mk.stamp
 	$(call gb_Helper_abbreviate_dirs,\
 		export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \
-		$(PERL) $< -verbose -o $@ -c $(SRCDIR)/set_soenv.stamp \
+		$(PERL) $< -verbose -o $@ -c $(SRCDIR)/config_host.mk.stamp \
 	)
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_binfilter.mk b/scp2/InstallModule_binfilter.mk
deleted file mode 100644
index c6ee85cff875..000000000000
--- a/scp2/InstallModule_binfilter.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_InstallModule_InstallModule,scp2/binfilter))
-
-$(eval $(call gb_InstallModule_add_scpfiles,scp2/binfilter,\
-    scp2/source/binfilter/file_binfilter \
-))
-
-$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/binfilter,\
-    scp2/source/binfilter/module_binfilter \
-	$(if $(filter WNT,$(GUI)),\
-		scp2/source/binfilter/registryitem_binfilter \
-	) \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 5ca6b6c97408..2a7b91ae3107 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -53,9 +53,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_CURL \
 	SYSTEM_DB \
 	SYSTEM_EXPAT \
-	SYSTEM_GDKPIXBUF \
-	SYSTEM_GETTEXT \
-	SYSTEM_GLIB \
 	SYSTEM_GRAPHITE \
 	SYSTEM_HSQLDB \
 	SYSTEM_HUNSPELL \
@@ -63,12 +60,9 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_ICU \
 	SYSTEM_JPEG \
 	SYSTEM_LCMS2 \
-	SYSTEM_LIBCROCO \
 	SYSTEM_LIBEXTTEXTCAT \
-	SYSTEM_LIBGSF \
 	SYSTEM_LIBJPEG \
 	SYSTEM_LIBLANGTAG \
-	SYSTEM_LIBRSVG \
 	SYSTEM_LIBXML \
 	SYSTEM_LIBXSLT \
 	SYSTEM_LPSOLVE \
@@ -114,10 +108,10 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 	MINGW_JPEG_DLL \
 	MINGW_LCMS2_DLL \
 	MINGW_LIBEXSLT_DLL \
+	MINGW_LIBLANGTAG_DLL \
 	MINGW_LIBXML_DLL \
 	MINGW_LIBXSLT_DLL \
 	MINGW_LPSOLVE_DLL \
-	MINGW_MINIZIP_DLL \
 	MINGW_MYTHES_DLL \
 	MINGW_NEON_DLL \
 	MINGW_NSPR4_DLL \
@@ -130,6 +124,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 	MINGW_RAPTOR_DLL \
 	MINGW_RASQAL_DLL \
 	MINGW_REDLAND_DLL \
+	MINGW_SMIME3_DLL \
 	MINGW_SQLITE3_DLL \
 	MINGW_SSH2_DLL \
 	MINGW_SSL3_DLL \
@@ -139,9 +134,6 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 ))
 
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-	$(if $(filter INTERNAL,$(ENABLE_LIBRSVG)),\
-		-DENABLE_LIBRSVG \
-	) \
 	$(if $(filter gcj,$(JDK)),\
 		-DGCJ \
 	) \
@@ -157,9 +149,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 	$(if $(filter YES,$(SYSTEM_HSQLDB)),\
 		-DHSQLDB_JAR=\""$(call gb_Helper_make_path,$(HSQLDB_JAR))"\" \
 	) \
-	$(if $(filter YES,$(SYSTEM_SAXON)),\
-		-DSAXON_JAR=\""$(call gb_Helper_make_path,$(SAXON_JAR))"\" \
-	) \
 	$(if $(filter-out YES,$(WITH_MOZILLA)),\
 		-DWITHOUT_MOZILLA \
 	) \
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index cbe59b470497..dd9a4d023879 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -49,9 +49,6 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
 			scp2/winexplorerext \
 		) \
 	) \
-	$(if $(filter YES,$(WITH_BINFILTER)),\
-		scp2/binfilter \
-	) \
 	$(if $(filter TRUE,$(ENABLE_CRASHDUMP)),\
 		scp2/crashrep \
 	) \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 95b1df2ce429..c4f8145d7e60 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -58,9 +58,6 @@ $(eval $(call gb_Module_add_targets,scp2,\
 			InstallModule_winexplorerext \
 		) \
 	) \
-	$(if $(filter YES,$(WITH_BINFILTER)),\
-		InstallModule_binfilter \
-	) \
 	$(if $(filter TRUE,$(ENABLE_CRASHDUMP)),\
 		InstallModule_crashrep \
 	) \
diff --git a/scp2/README b/scp2/README
new file mode 100644
index 000000000000..8f9d58356093
--- /dev/null
+++ b/scp2/README
@@ -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
index 8f0a08b05a4d..c10a136e915a 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -131,14 +131,6 @@
         Styles  = (PACKED); \
     End
 
-#define BINFILTER_RES_FILE(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        Name    = STRING(CONCAT3(name,en-US,.res)); \
-        Dir     = gid_Dir_Resource; \
-        Styles  = (PACKED); \
-    End
-
 #define STD_FILTER_FILE(id,name) \
     File id \
         PACKED_LIB_FILE_BODY; \
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index 9ea949cccf74..dc5d2a978a31 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -261,7 +261,7 @@ sub args_require_build
         # changed script - run always
         return 1 if (stat($0))[9] > (stat("$destfile"))[9] ;
 
-        # changed set_soenv.stamp - run always
+        # changed config timestamp - run always
         if (-f "$config_stamp") {
             return 1 if (stat($config_stamp))[9] > (stat($destfile))[9];
         }
diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp
deleted file mode 100644
index 538d1a25e318..000000000000
--- a/scp2/source/binfilter/file_binfilter.scp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************
- *
- * 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"
-
-File gid_File_Share_Registry_Binfilter_Xcd
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Share_Registry;
-    Name = "binfilter.xcd";
-End
-
-File gid_Starregistry_Legacy_Binfilters_Rdb
-    TXT_FILE_BODY;
-    Name = "legacy_binfilters.rdb";
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-End
-
-
-
-STD_LIB_FILE( gid_File_Lib_Bf_Go, bf_go)
-STD_LIB_FILE( gid_File_Lib_Bf_Sch, bf_sch)
-STD_LIB_FILE( gid_File_Lib_Bf_Xo, bf_xo)
-STD_LIB_FILE( gid_File_Lib_Bf_Svx, bf_svx)
-STD_LIB_FILE( gid_File_Lib_Bf_Svt, bf_svt)
-STD_LIB_FILE( gid_File_Lib_Bf_Frm, bf_frm)
-STD_LIB_FILE( gid_File_Lib_Bf_Ofa, bf_ofa)
-STD_LIB_FILE( gid_File_Lib_Bf_Sb, bf_sb)
-STD_LIB_FILE( gid_File_Lib_Bf_Sc, bf_sc)
-STD_LIB_FILE( gid_File_Lib_Bf_Sd, bf_sd)
-STD_LIB_FILE( gid_File_Lib_Bf_Sm, bf_sm)
-STD_LIB_FILE( gid_File_Lib_Bf_Sw, bf_sw)
-STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapper)
-STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_binfilters)
-STD_LIB_FILE( gid_File_Lib_Bf_So, bf_so)
-STD_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter)
-STD_LIB_FILE( gid_File_Lib_Bindet, bindet)
-
-BINFILTER_RES_FILE( gid_File_Res_Bf_Sch, bf_sch )
-BINFILTER_RES_FILE( gid_File_Res_Bf_Svx, bf_svx )
-BINFILTER_RES_FILE( gid_File_Res_Bf_Svt, bf_svt )
-BINFILTER_RES_FILE( gid_File_Res_Bf_Frm, bf_frm )
-BINFILTER_RES_FILE( gid_File_Res_Bf_Ofa, bf_ofa )
-BINFILTER_RES_FILE( gid_File_Res_Bf_Sc, bf_sc )
-BINFILTER_RES_FILE( gid_File_Res_Bf_Sd, bf_sd )
-BINFILTER_RES_FILE( gid_File_Res_Bf_Sm, bf_sm)
-BINFILTER_RES_FILE( gid_File_Res_Bf_Sw, bf_sw )
diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp
deleted file mode 100644
index 873652e6e16a..000000000000
--- a/scp2/source/binfilter/module_binfilter.scp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************
- *
- * 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"
-
-Module gid_Module_Optional_Binfilter
-    PackageInfo = "packinfo_office.txt";
-    MOD_NAME_DESC ( MODULE_OPTIONAL_BINFILTER );
-    Sortkey = "700";
-    InstallOrder = "1100";
-    ParentID = gid_Module_Optional;
-    Default = NO;
-    Files = (gid_File_Share_Registry_Binfilter_Xcd,
-    gid_Starregistry_Legacy_Binfilters_Rdb,
-    gid_File_Lib_Bf_Go,
-    gid_File_Lib_Bf_Sch,
-    gid_File_Lib_Bf_Lng,
-    gid_File_Lib_Bf_Xo,
-    gid_File_Lib_Bf_Svx,
-    gid_File_Lib_Bf_Svt,
-    gid_File_Lib_Bf_Frm,
-    gid_File_Lib_Bf_Ofa,
-    gid_File_Lib_Bf_Sb,
-    gid_File_Lib_Bf_Sc,
-    gid_File_Lib_Bf_Sd,
-    gid_File_Lib_Bf_Sm,
-    gid_File_Lib_Bf_So,
-    gid_File_Lib_Bf_Sw,
-    gid_File_Lib_Bf_Wrapper,
-    gid_File_Lib_Legacy_Binfilters,
-    gid_File_Lib_Bf_Migratefilter,
-    gid_File_Lib_Bindet,
-    gid_File_Res_Bf_Sch,
-    gid_File_Res_Bf_Svx,
-    gid_File_Res_Bf_Svt,
-    gid_File_Res_Bf_Frm,
-    gid_File_Res_Bf_Ofa,
-    gid_File_Res_Bf_Sc,
-    gid_File_Res_Bf_Sd,
-    gid_File_Res_Bf_Sm,
-    gid_File_Res_Bf_Sw,
-    gid_File_Res_Bf_Sfx);
-End
diff --git a/scp2/source/binfilter/module_binfilter.ulf b/scp2/source/binfilter/module_binfilter.ulf
deleted file mode 100644
index c72f682cbe05..000000000000
--- a/scp2/source/binfilter/module_binfilter.ulf
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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_BINFILTER]
-en-US = "Legacy Filters"
-
-[STR_DESC_MODULE_OPTIONAL_BINFILTER]
-en-US = "Legacy filters, e.g. StarOffice 5.2 binary file formats."
diff --git a/scp2/source/binfilter/registryitem_binfilter.scp b/scp2/source/binfilter/registryitem_binfilter.scp
deleted file mode 100644
index a1e884e14f86..000000000000
--- a/scp2/source/binfilter/registryitem_binfilter.scp
+++ /dev/null
@@ -1,931 +0,0 @@
-/*************************************************************************
- *
- * 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"
-
-RegistryItem gid_Regitem_Sdw_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdw";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.writer";
-End
-
-RegistryItem gid_Regitem_Sdw_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.writer";
-    Name = "Extension";
-    Value = ".sdw";
-End
-
-RegistryItem gid_Regitem_Sdw_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-starwriter";
-    Name = "Extension";
-    Value = ".sdw";
-End
-
-RegistryItem gid_Regitem_Sgl_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sgl";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.writer-global";
-End
-
-RegistryItem gid_Regitem_Sgl_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.writer-global";
-    Name = "Extension";
-    Value = ".sgl";
-End
-
-RegistryItem gid_Regitem__Sdw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdw";
-    Value = "soffice.StarWriterDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdw
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sdw";
-    Value = "soffice.StarWriterDocument.5";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sgl
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sgl";
-    Value = "soffice.StarWriterGlobalDocument.5";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem__Sgl
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sgl";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "soffice.StarWriterGlobalDocument.5";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterDocument.5";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(SO52_TEXT_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.bin,1";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarWriterDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(SO51_MASTERDOC_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\DefaultIcon";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "<progpath>\program\soffice.bin,9";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell\new";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell\new\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell\open\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell\print\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarWriterGlobalDocument.5\shell\printto\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-// calc
-
-RegistryItem gid_Regitem_Sdc_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdc";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.calc";
-End
-
-RegistryItem gid_Regitem_Sdc_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.calc";
-    Name = "Extension";
-    Value = ".sdc";
-End
-
-RegistryItem gid_Regitem_Sdc_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-starcalc";
-    Name = "Extension";
-    Value = ".sdc";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5";
-    REG_VALUE_LNG(SO51_SPREADSHEET_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.bin,3";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarCalcDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem__Sdc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdc";
-    Value = "soffice.StarCalcDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdc
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sdc";
-    Value = "soffice.StarCalcDocument.5";
-    Styles = ();
-End
-
-// impress
-RegistryItem gid_Regitem_Sdd_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdd";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.impress";
-End
-
-RegistryItem gid_Regitem_Sdd_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.impress";
-    Name = "Extension";
-    Value = ".sdd";
-End
-
-RegistryItem gid_Regitem_Sdd_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-starimpress";
-    Name = "Extension";
-    Value = ".sdd";
-End
-
-RegistryItem gid_Regitem_Sdp_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdp";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.impress-packed";
-End
-
-RegistryItem gid_Regitem_Sdp_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.impress-packed";
-    Name = "Extension";
-    Value = ".sdp";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5";
-    REG_VALUE_LNG(SO51_PRESENT_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.bin,7";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarImpressDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem__Sdd
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdd";
-    Value = "soffice.StarImpressDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdd
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sdd";
-    Value = "soffice.StarImpressDocument.5";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem__Sdp
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sdp";
-    Value = "soffice.StarStorageDocument.5";
-End
-
-// .sdp no longer supported
-// RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdp
-//     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-//     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-//     ModuleID = gid_Module_Optional_Binfilter;
-//     Name = ".sdp";
-//     Value = "soffice.StarStorageDocument.5";
-//     Styles = ();
-// End
-
-// draw
-
-RegistryItem gid_Regitem_Sda_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sda";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.draw";
-End
-
-RegistryItem gid_Regitem_Sda_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.draw";
-    Name = "Extension";
-    Value = ".sda";
-End
-
-RegistryItem gid_Regitem_Sda_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-stardraw";
-    Name = "Extension";
-    Value = ".sda";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5";
-    REG_VALUE_LNG(SO51_DRAWING_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.bin,5";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Stardrawdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarDrawDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem__Sda
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sda";
-    Value = "soffice.StarDrawDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sda
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sda";
-    Value = "soffice.StarDrawDocument.5";
-    Styles = ();
-End
-
-// chart
-RegistryItem gid_Regitem_Sds_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".sds";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.chart";
-End
-
-RegistryItem gid_Regitem_Sds_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.chart";
-    Name = "Extension";
-    Value = ".sds";
-End
-
-RegistryItem gid_Regitem_Sds_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-starchart";
-    Name = "Extension";
-    Value = ".sds";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(SO52_CHART_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\DefaultIcon";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "<progpath>\program\soffice.bin,0";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell\new";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell\new\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell\open\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell\print\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument.5\shell\printto\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starchartdocument_Curver
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarChartDocument\CurVer";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "soffice.StarChartDocument.5";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(SO50_TEMPLATE_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\DefaultIcon";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "<progpath>\program\soffice.bin,10";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "new";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell\new";
-    ModuleID = gid_Module_Optional_Binfilter;
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell\new\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell\open\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell\print\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starofficetemplate_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "soffice.StarOfficeTemplate.5\shell\printto\command";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem__Sds
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sds";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "soffice.StarChartDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sds
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".sds";
-    Value = "soffice.StarChartDocument.5";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem__Vor
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Value = "soffice.StarOfficeTemplate.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_vor
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".vor";
-    Value = "soffice.StarOfficeTemplate.5";
-    Styles = ();
-End
-
-// StarMath
-RegistryItem gid_Regitem_Smf_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".smf";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.math";
-End
-
-RegistryItem gid_Regitem_Smf_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.math";
-    Name = "Extension";
-    Value = ".smf";
-End
-
-RegistryItem gid_Regitem_Smf_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "MIME\Database\Content Type\application/x-starmath";
-    Name = "Extension";
-    Value = ".smf";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5";
-    REG_VALUE_LNG(SO51_FORMULA_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.bin,12";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starmathdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = "soffice.StarMathDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
-RegistryItem gid_Regitem__Smf
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Optional_Binfilter;
-    Subkey = ".smf";
-    Value = "soffice.StarMathDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_smf
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = ".smf";
-    Value = "soffice.StarMathDocument.5";
-    Styles = ();
-End
-
-
-// .SDW
-RegistryItem gid_Regitem_OpenOffice_SDW_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdw\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarWriterDocument.5";
-    Value = " ";
-End
-
-// .VOR
-RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarWriterDocument.5";
-    Value = " ";
-End
-
-// .SGL
-RegistryItem gid_Regitem_OpenOffice_SGL_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sgl\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarWriterGlobalDocument.5";
-    Value = " ";
-End
-
-// .SDC
-RegistryItem gid_Regitem_OpenOffice_SDC_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdc\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarCalcDocument.5";
-    Value = " ";
-End
-
-// .VOR
-RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarCalcDocument.5";
-    Value = " ";
-End
-
-// .SDD
-RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdd\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarImpressDocument.5";
-    Value = " ";
-End
-
-// .SDP
-RegistryItem gid_Regitem_OpenOffice_SDP_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdp\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarImpressDocument.5";
-    Value = " ";
-End
-
-// .SDA
-RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sda\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarImpressDocument.5";
-    Value = " ";
-End
-
-// .VOR
-RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Impress
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarImpressDocument.5";
-    Value = " ";
-End
-
-// .SDA
-RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Draw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sda\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarDrawDocument.5";
-    Value = " ";
-End
-
-// .SDD
-RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Draw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdd\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarDrawDocument.5";
-    Value = " ";
-End
-
-// .VOR
-RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Draw
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarDrawDocument.5";
-    Value = " ";
-End
-
-// .SMF
-RegistryItem gid_Regitem_OpenOffice_SMF_OpenWith_Math
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".smf\OpenWithProgIDs";
-    ModuleID = gid_Module_Optional_Binfilter;
-    Name = "soffice.StarMathDocument.5";
-    Value = " ";
-End
-
-
diff --git a/scp2/source/binfilter/registryitem_binfilter.ulf b/scp2/source/binfilter/registryitem_binfilter.ulf
deleted file mode 100644
index 610b36969a2c..000000000000
--- a/scp2/source/binfilter/registryitem_binfilter.ulf
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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_SO52_TEXT_OOO]
-en-US = "StarOffice 5.0 Text Document"
-
-[STR_REG_VAL_SO51_MASTERDOC_OOO]
-en-US = "StarOffice 5.0 Master Document"
-
-[STR_REG_VAL_SO51_SPREADSHEET_OOO]
-en-US = "StarOffice 5.0 Spreadsheet"
-
-[STR_REG_VAL_SO51_PRESENT_OOO]
-en-US = "StarOffice 5.0 Presentation"
-
-[STR_REG_VAL_SO51_DRAWING_OOO]
-en-US = "StarOffice 5.0 Drawing"
-
-[STR_REG_VAL_SO51_FORMULA_OOO]
-en-US = "StarOffice 5.0 Formula"
-
-[STR_REG_VAL_SO52_CHART_OOO]
-en-US = "StarOffice 5.0 Chart"
-
-[STR_REG_VAL_SO50_TEMPLATE_OOO]
-en-US = "StarOffice 5.0 Template"
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index 27968b546fc6..9672965b589b 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -33,6 +33,8 @@ File gid_File_Lib_GIO
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
 End
+
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Losessioninstall, losessioninstall.uno)
 #endif
 
 #ifdef ENABLE_GNOMEVFS
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 80ec3f7a2143..3a2604d09590 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -55,6 +55,7 @@ Module gid_Module_Optional_Gnome
 #endif
 #ifdef ENABLE_GIO
       gid_File_Lib_GIO,
+      gid_File_Lib_Losessioninstall,
 #endif
 #ifdef ENABLE_GCONF
       gid_File_Lib_Gconfbe,
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5c90285ecbe7..6617e4ad9570 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -84,7 +84,6 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Share_Registry_O5oo_Xcd,
              gid_Brand_File_Script_Unopkg,
              gid_Brand_File_Share_Xdg_Base,
-             gid_Brand_File_Share_Xdg_BinFilter,
              gid_Brand_File_Share_Xdg_Calc,
              gid_Brand_File_Share_Xdg_Draw,
              gid_Brand_File_Share_Xdg_Extension,
@@ -765,15 +764,6 @@ End
 #endif
 
 #if defined UNX && ! defined MACOSX
-File gid_Brand_File_Share_Xdg_BinFilter
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Name = "binfilter.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;
@@ -1257,9 +1247,6 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls
 #ifdef SYSTEM_HSQLDB
     ValueList1 = HSQLDB_JAR;
 #endif
-#ifdef SYSTEM_SAXON
-    ValueList2 = SAXON_JAR;
-#endif
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index f5990938f1df..b766327ed7bf 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -109,6 +109,12 @@ Directory gid_Dir_Wizards_Fax
     DosName = "fax";
 End
 
+Directory gid_Dir_Wizards_Letter
+    Styles = (CREATE);
+    ParentID = gid_Dir_Wizards;
+    DosName = "letter";
+End
+
 Directory gid_Dir_Resource
     ParentID = gid_Brand_Dir_Program;
     DosName = "resource";
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 104f32ceb922..0781dfc046d3 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -143,6 +143,42 @@ STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Bold, LinBiolinum_RB_G.ttf, Linux Bio
 STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Italic, LinBiolinum_RI_G.ttf, Linux Biolinum G Italic)
 #endif
 
+// PT Serif fonts
+
+#ifndef WITHOUT_FONTS
+STD_FONT_FILE( gid_File_Fnt_PtSerif_Regular, PT_Serif-Web-Regular.ttf, PT Serif Regular)
+STD_FONT_FILE( gid_File_Fnt_PtSerif_Bold, PT_Serif-Web-Bold.ttf, PT Serif Bold)
+STD_FONT_FILE( gid_File_Fnt_PtSerif_Italic, PT_Serif-Web-Italic.ttf, PT Serif Italic)
+STD_FONT_FILE( gid_File_Fnt_PtSerif_BoldItalic, PT_Serif-Web-BoldItalic.ttf, PT Serif Bold Italic)
+#endif
+
+// Open Sans fonts
+
+#ifndef WITHOUT_FONTS
+STD_FONT_FILE( gid_File_Fnt_OpenSans_Regular, OpenSans-Regular.ttf, Open Sans Regular)
+STD_FONT_FILE( gid_File_Fnt_OpenSans_Bold, OpenSans-Bold.ttf, Open Sans Bold)
+STD_FONT_FILE( gid_File_Fnt_OpenSans_Italic, OpenSans-Italic.ttf, Open Sans Italic)
+STD_FONT_FILE( gid_File_Fnt_OpenSans_BoldItalic, OpenSans-BoldItalic.ttf, Open Sans Bold Italic)
+#endif
+
+
+// Source Sans Pro fonts
+
+#ifndef WITHOUT_FONTS
+STD_FONT_FILE( gid_File_Fnt_SourceSans_Regular, SourceSansPro-Regular.ttf, Source Sans Pro Regular)
+STD_FONT_FILE( gid_File_Fnt_SourceSans_Bold, SourceSansPro-Bold.ttf, Source Sans Pro Bold)
+STD_FONT_FILE( gid_File_Fnt_SourceSans_Italic, SourceSansPro-Italic.ttf, Source Sans Pro Italic)
+STD_FONT_FILE( gid_File_Fnt_SourceSans_BoldItalic, SourceSansPro-BoldItalic.ttf, Source Sans Pro Bold Italic)
+#endif
+
+
+// Source Code Pro fonts
+
+#ifndef WITHOUT_FONTS
+STD_FONT_FILE( gid_File_Fnt_SourceCode_Regular, SourceCodePro-Regular.ttf, Source Code Pro Regular)
+STD_FONT_FILE( gid_File_Fnt_SourceCode_Bold, SourceCodePro-Bold.ttf, Source Code Pro Bold)
+#endif
+
 // fontconfig updates to allow proper use of local fonts
 
 #ifdef UNX
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 66f3a77e59f6..d3c08f3dc921 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -186,7 +186,7 @@ File gid_File_Lib_Curl
     #ifdef MACOSX
        Name = STRING(CONCAT2(libcurl.4,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.4));
+       Name = STRING(CONCAT2(libcurl,UNXSUFFIX));
     #endif
   #else
    #ifdef _gcc3
@@ -573,7 +573,6 @@ End
 
 #if !defined SYSTEM_CAIRO \
     && (defined ENABLE_CAIRO_CANVAS \
-        || (ENABLE_LIBRSVG && !defined SYSTEM_LIBRSVG) \
         || (defined WNT && !defined ENABLE_DIRECTX))
 
 File gid_File_Lib_Cairo
@@ -759,12 +758,16 @@ File gid_File_Lib_Langtag
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef MACOSX
-    Name = STRING(CONCAT4(liblangtag,.,0,UNXSUFFIX));
+    Name = STRING(CONCAT4(liblangtag,.,1,UNXSUFFIX));
   #elif defined WNT
-    // Nothing, statically linked to libi18nisolang1
+    #if defined _gcc3
+        Name = STRING(CONCAT4(liblangtag,-,1,.dll));
+    #else
+        // Nothing, statically linked to libi18nisolang1
+    #endif
   #else
     // FIXME: use version vars
-    Name = STRING(CONCAT4(liblangtag,UNXSUFFIX,.,0));
+    Name = STRING(CONCAT4(liblangtag,UNXSUFFIX,.,1));
   #endif
 End
 
@@ -902,6 +905,7 @@ End
 #else
 
 STD_LIB_FILE(gid_File_Lib_Mork,mork)
+SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
 
 #endif
 
@@ -1442,7 +1446,6 @@ STD_LIB_FILE( gid_File_Lib_Textfd, textfd )
 STD_LIB_FILE( gid_File_Lib_Odfflatxml, odfflatxml )
 
 #ifdef SOLAR_JAVA
-STD_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter )
 STD_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate )
 #endif
 
@@ -1721,161 +1724,6 @@ STD_LIB_FILE(gid_File_Lib_Unordf, unordf)
 STD_LIB_FILE( gid_File_Lib_For, for)
 STD_LIB_FILE( gid_File_Lib_Forui, forui)
 
-#if !defined SYSTEM_GLIB \
-    && ((defined ENABLE_LIBLANGTAG && !defined SYSTEM_LIBLANGTAG) \
-        || (ENABLE_LIBRSVG && !defined SYSTEM_LIBRSVG))
-File gid_File_Lib_Glib
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libglib-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gliblo.dll";
-    #endif
-End
-File gid_File_Lib_Gthread
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgthread-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gthreadlo.dll";
-    #endif
-End
-File gid_File_Lib_Gobject
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgobject-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gobjectlo.dll";
-    #endif
-End
-File gid_File_Lib_Gio
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgio-2.0.0.dylib";
-    #elif defined WNT
-    Name = "giolo.dll";
-    #endif
-End
-File gid_File_Lib_Gmodule
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgmodule-2.0.0.dylib";
-    #elif defined WNT
-    Name = "gmodulelo.dll";
-    #endif
-End
-#endif
-
-// RSVG and dependencies
-#if ENABLE_LIBRSVG
-#if ! defined (SYSTEM_GETTEXT)
-File gid_File_Lib_Intl
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libintl.8.dylib";
-    #elif defined WNT
-    Name = "intl.dll";
-    #endif
-End
-#endif
-
-#if ! defined SYSTEM_GDKPIXBUF
-File gid_File_Lib_Gdkpixbuf
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libgdk_pixbuf-2.0.0.dylib";
-    #elif defined WNT
-    Name = "libgdk_pixbuf-2.0-0.dll";
-    #endif
-End
-#endif
-
-#if ! defined SYSTEM_LIBCROCO
-File gid_File_Lib_Libcroco
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libcroco-0.6.3.0.1.dylib";
-    #elif defined WNT
-    Name = "libcroco-0.6-3.dll";
-    #endif
-End
-#endif
-
-#if ! defined LIBO_HEADLESS
-#if ! defined SYSTEM_PANGO
-File gid_File_Lib_Libpango
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libpango-1.0.0.dylib";
-    #elif defined WNT
-    Name = "pangolo.dll";
-    #endif
-End
-File gid_File_Lib_Libpangocairo
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "libpangocairo-1.0.0.dylib";
-    #elif defined WNT
-    Name = "pangocairolo.dll";
-    #endif
-End
-#if defined WNT
-File gid_File_Lib_Libpangowin32
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "pangowin32lo.dll";
-End
-#endif
-#endif
-#endif
-
-#if ! defined SYSTEM_LIBGSF
-File gid_File_Lib_Libgsf
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-#ifdef WNT
-    Name = "gsf-1.dll";
-#endif
-End
-#endif
-
-#if ! defined SYSTEM_LIBRSVG
-File gid_File_Lib_Librsvg
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    #ifdef MACOSX
-    Name = "librsvg-2.2.dylib";
-    #elif defined WNT
-    Name = "librsvg-2-2.dll";
-    #endif
-End
-#endif
-
-#endif // #if ENABLE_LIBRSVG
-
 #if defined(WNT) && defined(HAVE_WINDOWS_SDK)
 
 File gid_File_Lib_sellangmsi
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index ea102c302fdb..eaf929478a1f 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -430,9 +430,7 @@ End
 #ifdef SOLAR_JAVA
 STD_JAR_FILE( gid_File_Jar_Report, report )
 STD_JAR_FILE( gid_File_Jar_Table, table )
-STD_JAR_FILE( gid_File_Jar_Letter, letter )
 STD_JAR_FILE( gid_File_Jar_Form, form )
-STD_JAR_FILE( gid_File_Jar_Fax, fax )
 STD_JAR_FILE( gid_File_Jar_Agenda, agenda )
 STD_JAR_FILE( gid_File_Jar_Query, query )
 STD_JAR_FILE( gid_File_Jar_Web, web )
@@ -474,12 +472,6 @@ End
 
 #endif
 
-#ifdef SOLAR_JAVA
-#ifndef SYSTEM_SAXON
-STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 )
-#endif
-#endif
-
 #ifndef AIX
 #ifndef DISABLE_PYUNO
 
@@ -492,7 +484,13 @@ End
 File gid_File_Wizards_Fax
     Dir = gid_Dir_Wizards_Fax;
     ARCHIVE_TXT_FILE_BODY;
-    Name = "pyfax.zip";
+    Name = "fax.zip";
+End
+
+File gid_File_Wizards_Letter
+    Dir = gid_Dir_Wizards_Letter;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "letter.zip";
 End
 
 #endif
@@ -740,7 +738,7 @@ End
 #endif
 #endif
 
-// new user interface configuration files
+// user interface configuration files
 File gid_File_Share_Config_Sofficecfg_uiconfig_Zip
     TXT_FILE_BODY;
     Styles = (ARCHIVE);
@@ -749,6 +747,14 @@ File gid_File_Share_Config_Sofficecfg_uiconfig_Zip
     Patchfiles = ();
 End
 
+// user interface configuration file translations
+File gid_File_Share_Config_Sofficecfg_uiconfig_Zip_Lang
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE);
+    Dir = gid_Dir_Share_Config_Sofficecfg;
+    EXTRA_ALL_LANG_BUT_EN_US(uiconfig,zip);
+End
+
 #ifdef WNT
 
 STD_SHELLNEW_FILE(gid_File_Shellnew_Ods_Soffice, soffice.ods)
diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp
index 7124530a3ddd..17d1139cb003 100644
--- a/scp2/source/ooo/mingw_dlls.scp
+++ b/scp2/source/ooo/mingw_dlls.scp
@@ -73,13 +73,7 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdb, MINGW_DB_DLL )
 #endif
 #endif
 
-#ifdef SYSTEM_CURL
-#ifdef NEEDS_MINGW_INTL_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libintl,     MINGW_INTL_DLL )
-#endif
-#ifdef NEEDS_MINGW_IDN_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdn,       MINGW_IDN_DLL )
-#endif
+#if defined SYSTEM_CURL || defined SYSTEM_NSS
 #ifdef NEEDS_MINGW_NSPR4_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libnspr,     MINGW_NSPR4_DLL )
 #endif
@@ -98,12 +92,24 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_nss,         MINGW_NSS3_DLL )
 #ifdef NEEDS_MINGW_SSL3_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_ssl,         MINGW_SSL3_DLL )
 #endif
+#ifdef NEEDS_MINGW_SMIME3_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_smime,         MINGW_SMIME3_DLL )
+#endif
+#endif
+
+#ifdef SYSTEM_CURL
 #ifdef NEEDS_MINGW_GPG_ERROR_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgpgerror, MINGW_GPG_ERROR_DLL )
 #endif
 #ifdef NEEDS_MINGW_GCRYPT_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgcrypt,   MINGW_GCRYPT_DLL )
 #endif
+#ifdef NEEDS_MINGW_INTL_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libintl,     MINGW_INTL_DLL )
+#endif
+#ifdef NEEDS_MINGW_IDN_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdn,       MINGW_IDN_DLL )
+#endif
 #ifdef NEEDS_MINGW_SSH2_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libssh,      MINGW_SSH2_DLL )
 #endif
@@ -136,12 +142,6 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgrahpite, MINGW_GRAPHITE2_DLL )
 #endif
 #endif
 
-#ifdef SYSTEM_MINIZIP
-#ifdef NEEDS_MINGW_MINIZP_DLL
-MINGW_DLL( gid_Brand_File_Lib_Mingw_Libminizip, MINGW_MINIZIP_DLL )
-#endif
-#endif
-
 #ifdef SYSTEM_NEON
 #ifdef NEEDS_MINGW_TASN1_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libtasn,   MINGW_TASN1_DLL )
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 4085de195d89..671264880469 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -137,7 +137,6 @@ Module gid_Module_Root_Files_3
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Dat_Root3,
-	gid_File_Jar_Saxon,
 	gid_File_Jar_Unoil,
 	gid_File_Jar_Hsqldb,
 	gid_File_Jar_Hsqldb_Sdbc,
@@ -306,32 +305,6 @@ Module gid_Module_Root_Files_5
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Dat_Root5,
-#if ! defined SYSTEM_GETTEXT
-    gid_File_Lib_Intl,
-#endif
-#if ! defined SYSTEM_GLIB
-    gid_File_Lib_Glib,
-    gid_File_Lib_Gobject,
-    gid_File_Lib_Gthread,
-    gid_File_Lib_Gmodule,
-    gid_File_Lib_Gio,
-#endif
-#if ! defined SYSTEM_GDKPIXBUF
-    gid_File_Lib_Gdkpixbuf,
-#endif
-#if ! defined SYSTEM_LIBCROCO
-    gid_File_Lib_Libcroco,
-#endif
-#if ! defined SYSTEM_PANGO
-    gid_File_Lib_Libpango,
-    gid_File_Lib_Libpangocairo,
-#ifdef WNT
-    gid_File_Lib_Libpangowin32,
-#endif
-#endif
-#if ! defined SYSTEM_LIBGSF
-    gid_File_Lib_Libgsf,
-#endif
 	gid_File_Lib_Dict_Ja,
 	gid_File_Lib_Dict_Zh,
     gid_File_Lib_Collator_Data,
@@ -339,6 +312,7 @@ Module gid_Module_Root_Files_5
     gid_File_Lib_Textconv_Dict,
 	gid_File_Lib_Basprov,
 	gid_File_Lib_Configmgr,
+	gid_File_Lib_Losessioninstall,
 	gid_File_Lib_Crypto,
 	gid_File_Lib_Dlgprov,
 	gid_File_Lib_Stringresource,
@@ -792,7 +766,21 @@ Module gid_Module_Root_Fonts_OOo_Hidden
 	gid_File_Fnt_LiberationSerif_Bold,
 	gid_File_Fnt_LiberationSerif_BoldItalic,
 	gid_File_Fnt_LiberationSerif_Italic,
-	gid_File_Fnt_LiberationSerif_Regular);
+	gid_File_Fnt_LiberationSerif_Regular
+	gid_File_Fnt_PtSerif_Regular
+	gid_File_Fnt_PtSerif_Bold
+	gid_File_Fnt_PtSerif_Italic
+	gid_File_Fnt_PtSerif_BoldItalic
+	gid_File_Fnt_OpenSans_Regular
+	gid_File_Fnt_OpenSans_Bold
+	gid_File_Fnt_OpenSans_Italic
+	gid_File_Fnt_OpenSans_BoldItalic
+	gid_File_Fnt_SourceSans_Regular
+	gid_File_Fnt_SourceSans_Bold
+	gid_File_Fnt_SourceSans_Italic
+	gid_File_Fnt_SourceSans_BoldItalic
+	gid_File_Fnt_SourceCode_Regular
+	gid_File_Fnt_SourceCode_Bold);
 End
 #endif
 
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 213b00ec69a8..9a85f8884988 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -30,7 +30,8 @@ Module gid_Module_Langpack_Basis_Template
     Name = "gid_Module_Langpack_Root_Template";
     Description = "gid_Module_Langpack_Root_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Extra_Autotextshare_Lang,
+    Files = (gid_File_Share_Config_Sofficecfg_uiconfig_Zip_Lang,
+             gid_File_Extra_Autotextshare_Lang,
              gid_File_Registry_Filter_Zip,
              gid_File_Registry_Lang,
              gid_File_Registry_Spool_Langpack_Lang,
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 0df44d301f75..c6f7c29052cc 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -91,13 +91,6 @@ End
 
 #endif
 
-Shortcut gid_Shortcut_Lib_Libcroco
-    FileID = gid_File_Lib_Libcroco;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "libcroco-0.6.3.dylib";
-    Styles = (NETWORK, RELATIVE);
-End
-
 #endif
 
 //i44154 -end-
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index be2c52f4d78f..a53ddcb6abb6 100644..100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -592,7 +592,7 @@ End
 File gid_File_Lib_Cli_Cppuhelper_Assembly
     TXT_FILE_BODY;
     Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
-    Name = "cli_cppuhelper.dll";
+    Name = "assembly/cli_cppuhelper.dll";
     Dir = SCP2_URE_DL_DIR;
     Assemblyname = "cli_cppuhelper";
     PublicKeyToken = "ce2cb7e279207b9e";