Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream

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

33 files changed, 7388 insertions, 0 deletions

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
new file mode 100644
index 000000000..5eba313cd
--- /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 = "http://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 "/ridl.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 000000000..d172f74a3
--- /dev/null
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -0,0 +1,613 @@
+/*
+ * 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_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_Educate
+    ParentID = gid_Dir_Template_Common;
+    DosName = "educate";
+End
+
+Directory gid_Dir_Template_Common_Finance
+    ParentID = gid_Dir_Template_Common;
+    DosName = "finance";
+End
+
+Directory gid_Dir_Template_Common_Forms
+    ParentID = gid_Dir_Template_Common;
+    DosName = "forms";
+End
+
+Directory gid_Dir_Template_Common_Internal
+    ParentID = gid_Dir_Template_Common;
+    DosName = "internal";
+End
+
+Directory gid_Dir_Template_Common_Labels
+    ParentID = gid_Dir_Template_Common;
+    DosName = "labels";
+End
+
+Directory gid_Dir_Template_Common_Layout
+    ParentID = gid_Dir_Template_Common;
+    DosName = "layout";
+End
+
+Directory gid_Dir_Template_Common_Misc
+    ParentID = gid_Dir_Template_Common;
+    DosName = "misc";
+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 000000000..b7174607e
--- /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 000000000..47a32179d
--- /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 000000000..350b0363a
--- /dev/null
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -0,0 +1,72 @@
+/*************************************************************************
+ *
+ * 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
+
+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
+
+#endif
+
+#if defined _MSC_VER
+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
+
+#endif
+
+#if defined _MSC_VER
+
+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 000000000..0610c31bb
--- /dev/null
+++ b/scp2/source/ooo/file_ooo.scp
@@ -0,0 +1,753 @@
+/*************************************************************************
+*
+ * 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_HELP
+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_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
+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
+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_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_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
+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_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_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 000000000..707c3594c
--- /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 000000000..a9f68ffd3
--- /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 000000000..22f8a37f7
--- /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 000000000..f5ef1c91d
--- /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 000000000..70cf667e4
--- /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 000000000..e2beb9841
--- /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 000000000..18a1a0e54
--- /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 000000000..904cea242
--- /dev/null
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -0,0 +1,112 @@
+/*
+ * 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"
+
+#ifdef AIX
+#ifndef SYSTEM_CURL
+Unixlink gid_Unixlink_File_Lib_Curl
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(libcurl,UNXSUFFIX));
+    Styles = (PACKED);
+    Target = STRING(CONCAT3(libcurl,UNXSUFFIX,.3));
+End
+#endif
+#ifndef SYSTEM_REDLAND
+Unixlink gid_Unixlink_File_Lib_Raptor
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(libraptor,UNXSUFFIX));
+    Styles = (PACKED);
+    Target = STRING(CONCAT3(libraptor,UNXSUFFIX,.1));
+End
+
+Unixlink gid_Unixlink_File_Lib_Rasqal
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(librasqal,UNXSUFFIX));
+    Styles = (PACKED);
+    Target = STRING(CONCAT3(librasqal,UNXSUFFIX,.1));
+End
+
+Unixlink gid_Unixlink_File_Lib_Rdf
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(librdf,UNXSUFFIX));
+    Styles = (PACKED);
+    Target = STRING(CONCAT3(librdf,UNXSUFFIX,.0));
+End
+#endif
+#ifndef SYSTEM_LIBXSLT
+Unixlink gid_Unixlink_File_Lib_Xslt
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(libxslt,UNXSUFFIX));
+    Styles = (PACKED);
+    Target = STRING(CONCAT3(libxslt,UNXSUFFIX,.1));
+End
+Unixlink gid_Unixlink_File_Lib_eXslt
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(libexslt,UNXSUFFIX));
+    Styles = (PACKED);
+    Target = STRING(CONCAT3(libexslt,UNXSUFFIX,.0));
+End
+#endif
+#endif
+
+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 000000000..76003780f
--- /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 000000000..9f8fc9d14
--- /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 000000000..ecfedfb5c
--- /dev/null
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -0,0 +1,743 @@
+/*
+ * 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_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 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 000000000..80af179c7
--- /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 000000000..0c1db4fd4
--- /dev/null
+++ b/scp2/source/ooo/module_ooo.scp
@@ -0,0 +1,721 @@
+/*
+ * 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_Unixlink_File_Lib_Curl,
+             gid_Unixlink_File_Lib_Raptor,
+             gid_Unixlink_File_Lib_Rasqal,
+             gid_Unixlink_File_Lib_Rdf,
+             gid_Unixlink_File_Lib_Xslt,
+             gid_Unixlink_File_Lib_eXslt,
+             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);
+    Unixlinks = (gid_Unixlink_File_Lib_Curl,
+                 gid_Unixlink_File_Lib_Raptor,
+                 gid_Unixlink_File_Lib_Rasqal,
+                 gid_Unixlink_File_Lib_Rdf,
+                 gid_Unixlink_File_Lib_Xslt,
+                 gid_Unixlink_File_Lib_eXslt);
+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_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_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_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_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_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 000000000..5f7609eba
--- /dev/null
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -0,0 +1,365 @@
+/*
+ * 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_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_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_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_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_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 000000000..25e0a92d4
--- /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 000000000..4b6c02673
--- /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 000000000..626f242e7
--- /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 000000000..b42f2c4fa
--- /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 000000000..d17959b60
--- /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 000000000..6ca5dba8d
--- /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 000000000..9a7998ace
--- /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 000000000..c07b641a0
--- /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 000000000..415963480
--- /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 000000000..b945523fe
--- /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 000000000..09109ebc4
--- /dev/null
+++ b/scp2/source/ooo/ure.scp
@@ -0,0 +1,308 @@
+/*
+ * 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
+
+// Public Dynamic Libraries:
+
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Cppu
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_UNO_NORMAL("cppu");
+    Styles = (PACKED);
+    Target = SCP2_URE_DL_UNO_VER("cppu", "3");
+End
+#endif
+
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Cppuhelper
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
+    Styles = (PACKED);
+    Target = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
+End
+#endif
+
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_PurpEnvHelper
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
+    Styles = (PACKED);
+    Target = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
+End
+#endif
+
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Sal
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_UNO_NORMAL("sal");
+    Styles = (PACKED);
+    Target = SCP2_URE_DL_UNO_VER("sal", "3");
+End
+#endif
+
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Salhelper
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
+    Styles = (PACKED);
+    Target = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
+End
+#endif
+
+// Private Dynamic Libraries:
+
+#if defined _MSC_VER
+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
+
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Libxml2
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_NORMAL("xml2");
+    Styles = (PACKED);
+    Target = SCP2_URE_DL_VER("xml2", "2");
+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_Unixlink_File_Dl_Cppu,
+            gid_Unixlink_File_Dl_Cppuhelper,
+            gid_Unixlink_File_Dl_PurpEnvHelper,
+            gid_Unixlink_File_Dl_Sal,
+            gid_Unixlink_File_Dl_Salhelper,
+            gid_File_Misc_TypesRdb,
+            gid_File_Misc_ServicesRdb);
+    Unixlinks = (gid_Unixlink_File_Dl_Sal,
+                 gid_Unixlink_File_Dl_Salhelper,
+                 gid_Unixlink_File_Dl_Cppu,
+                 gid_Unixlink_File_Dl_Cppuhelper,
+                 gid_Unixlink_File_Dl_PurpEnvHelper,
+                 gid_Unixlink_File_Dl_Libxml2);
+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 000000000..75ccf2b8d
--- /dev/null
+++ b/scp2/source/ooo/vc_redist.scp
@@ -0,0 +1,57 @@
+/*
+ * 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_VC142_REDIST)
+    #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 defined(WITH_VC141_REDIST)
+    #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"
+#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 000000000..116b437b1
--- /dev/null
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -0,0 +1,264 @@
+/*
+ * 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"
+
+WindowsCustomAction gid_Customaction_RenamePrgFolder
+	Name = "RenamePrgFolder";
+	Typ = "1";
+	Source = "shlxtmsi.dll";
+	Target = "RenamePrgFolder";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "ValidateProductID");
+End
+
+WindowsCustomAction gid_Customaction_RemovePrgFolder
+	Name = "RemovePrgFolder";
+	Typ = "1";
+	Source = "shlxtmsi.dll";
+	Target = "RemovePrgFolder";
+	Inbinarytable = 1;
+	Assignment1 = ("InstallExecuteSequence", "OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "end");
+End
+
+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