Merge remote-tracking branch 'origin/master' into feature/gbuild_extensions

Conflicts:
	Module_tail_build.mk
	Repository.mk
	extensions/util/makefile.pmk
	postprocess/prj/build.lst
	svx/AllLangResTarget_svx.mk

18 files changed, 13 insertions, 873 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 4f23947e6097..c0f2eff6f7b6 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -511,26 +511,20 @@ End
 #define SCP2_URE_DL_DIR gid_Dir_Ure_Bin
 #define SCP2_URE_DL_NORMAL(n) n ".dll"
 #define SCP2_URE_DL_BARE(n) n ".dll"
-#if defined _MSC
 #define SCP2_URE_DL_VER(n, v) n v ".dll"
 #define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll"
 #define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
 #define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
-#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
 #define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
+#if defined _MSC
+#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
 #if defined _DEBUG_RUNTIME
 #define SCP2_STDLP_DEBUG "d"
 #else
 #define SCP2_STDLP_DEBUG ""
 #endif
 #else // GCC
-#define SCP2_URE_DL_VER(n, v) n v ".dll"
-#define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll"
-#define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
-#define SCP2_URE_DL_UNO_VER(n, v) "uno_" n v ".dll"
-#define SCP2_URE_DL_UNO_COMID_VER(n, v)	\
-    "uno_" n STRING(COMID) v ".dll"
-#define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
+#define SCP2_URE_DL_UNO_COMID_VER(n, v) n STRING(COMID) ".dll"
 #define SCP2_STDLP_DEBUG ""
 #endif
 #else
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index 69e5dc50fbbb..c17ac8c53d5b 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -88,20 +88,6 @@ End
 
 #endif
 
-/* ** Lightproof ** */
-
-#ifdef WITH_EXTENSION_LIGHTPROOF
-
-Directory gid_Brand_Dir_Share_Extensions_LightProof
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName (en-US) = "lightproof-en-US";
-    DosName (hu) = "lightproof-hu";
-    DosName (ru) = "lightproof-ru";
-    DosName = "lightproof";
-End
-
-#endif
-
 /* ** Numbertext ** */
 
 #ifdef WITH_EXTENSION_NUMBERTEXT
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 48f9e4219117..439006a50a4b 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -98,21 +98,6 @@ End
 
 #endif
 
-/* ** Lightproof ** */
-
-#ifdef WITH_EXTENSION_LIGHTPROOF
-
-File gid_File_Oxt_LightProof
-    TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_LightProof;
-    Name (en-US) = "lightproof-en.oxt";
-    Name (hu) = "lightproof-hu.oxt";
-    Name (ru) = "lightproof-ru.oxt";
-End
-
-#endif
-
 /* ** Numbertext ** */
 
 #ifdef WITH_EXTENSION_NUMBERTEXT
diff --git a/scp2/source/extensions/makefile.mk b/scp2/source/extensions/makefile.mk
index a2c6299d8d6e..77828ca05cc5 100644
--- a/scp2/source/extensions/makefile.mk
+++ b/scp2/source/extensions/makefile.mk
@@ -45,14 +45,12 @@ SCP_PRODUCT_TYPE=osl
 PARFILES= \
         module_extensions.par                        \
         module_extensions_sun_templates.par          \
-        module_extensions_lightproof.par             \
         directory_extensions.par                     \
         file_extensions.par
 
 ULFFILES= \
         module_extensions.ulf                        \
-        module_extensions_sun_templates.ulf          \
-        module_extensions_lightproof.ulf
+        module_extensions_sun_templates.ulf
 
 #--- File ---------------------------------------------------------
 .INCLUDE :  target.mk
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
index 91e6baf34f7f..329a499f11e2 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -117,19 +117,6 @@ Module gid_Module_Optional_Extensions_PDFIMPORT
 End
 #endif
 
-/* ** Lightproof ** */
-
-#ifdef WITH_EXTENSION_LIGHTPROOF
-Module gid_Module_Optional_Extensions_LightProof
-    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF);
-    ParentID = gid_Module_Optional_Extensions;
-    Minimal = NO;
-    Default = YES;
-    Styles = ( );
-End
-
-#endif
-
 /* ** Numbertext ** */
 
 #ifdef WITH_EXTENSION_NUMBERTEXT
diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf
index 3c7cb80898d7..d6108b09525e 100644
--- a/scp2/source/extensions/module_extensions.ulf
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -63,12 +63,6 @@ en-US = "PDF Import"
 [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT]
 en-US = "PDF Import"
 
-[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF]
-en-US = "Lightproof"
-
-[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF]
-en-US = "Lightproof"
-
 [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
 en-US = "Numbertext"
 
diff --git a/scp2/source/extensions/module_extensions_lightproof.scp b/scp2/source/extensions/module_extensions_lightproof.scp
deleted file mode 100644
index 2d78024ecd94..000000000000
--- a/scp2/source/extensions/module_extensions_lightproof.scp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 3.
- *
- *
- *    GNU Lesser General Public License Version 3
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library 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 for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-/* ** LightProof ** */
-
-#ifdef WITH_EXTENSION_INTEGRATION
-
-#ifdef WITH_EXTENSION_LIGHTPROOF
-
-Module gid_Module_Optional_Extensions_LightProof_Template
-    ParentID = gid_Module_Optional_Extensions_LightProof;
-    Name = "gid_Module_Optional_Extensions_LightProof_Template";
-    Description = "gid_Module_Optional_Extensions_LightProof_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = ( gid_File_Oxt_LightProof );
-    Minimal = NO;
-    Default = YES;
-End
-
-#include "alllangmodules_extensions_lightproof.inc"
-
-#endif
-
-#endif
diff --git a/scp2/source/extensions/module_extensions_lightproof.ulf b/scp2/source/extensions/module_extensions_lightproof.ulf
deleted file mode 100644
index e54f8bab0ba0..000000000000
--- a/scp2/source/extensions/module_extensions_lightproof.ulf
+++ /dev/null
@@ -1,695 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 3.
- *
- *
- *    GNU Lesser General Public License Version 3
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library 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 for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
- *
- ************************************************************************/
-
-
-[STR_NAME_MODULE_LANGPACK_EN_US]
-en-US = "English"
-
-[STR_DESC_MODULE_LANGPACK_EN_US]
-en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_DE]
-en-US = "German"
-
-[STR_DESC_MODULE_LANGPACK_DE]
-en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FR]
-en-US = "French"
-
-[STR_DESC_MODULE_LANGPACK_FR]
-en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_IT]
-en-US = "Italian"
-
-[STR_DESC_MODULE_LANGPACK_IT]
-en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ES]
-en-US = "Spanish"
-
-[STR_DESC_MODULE_LANGPACK_ES]
-en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SV]
-en-US = "Swedish"
-
-[STR_DESC_MODULE_LANGPACK_SV]
-en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PT]
-en-US = "Portuguese"
-
-[STR_DESC_MODULE_LANGPACK_PT]
-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PT_BR]
-en-US = "Portuguese (Brazil)"
-
-[STR_DESC_MODULE_LANGPACK_PT_BR]
-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_JA]
-en-US = "Japanese"
-
-[STR_DESC_MODULE_LANGPACK_JA]
-en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KO]
-en-US = "Korean"
-
-[STR_DESC_MODULE_LANGPACK_KO]
-en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ZH_CN]
-en-US = "Chinese (simplified)"
-
-[STR_DESC_MODULE_LANGPACK_ZH_CN]
-en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ZH_TW]
-en-US = "Chinese (traditional)"
-
-[STR_DESC_MODULE_LANGPACK_ZH_TW]
-en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NL]
-en-US = "Dutch"
-
-[STR_DESC_MODULE_LANGPACK_NL]
-en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HU]
-en-US = "Hungarian"
-
-[STR_DESC_MODULE_LANGPACK_HU]
-en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PL]
-en-US = "Polish"
-
-[STR_DESC_MODULE_LANGPACK_PL]
-en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RU]
-en-US = "Russian"
-
-[STR_DESC_MODULE_LANGPACK_RU]
-en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TR]
-en-US = "Turkish"
-
-[STR_DESC_MODULE_LANGPACK_TR]
-en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EL]
-en-US = "Greek"
-
-[STR_DESC_MODULE_LANGPACK_EL]
-en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TH]
-en-US = "Thai"
-
-[STR_DESC_MODULE_LANGPACK_TH]
-en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_CS]
-en-US = "Czech"
-
-[STR_DESC_MODULE_LANGPACK_CS]
-en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SK]
-en-US = "Slovak"
-
-[STR_DESC_MODULE_LANGPACK_SK]
-en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HR]
-en-US = "Croatian"
-
-[STR_DESC_MODULE_LANGPACK_HR]
-en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ET]
-en-US = "Estonian"
-
-[STR_DESC_MODULE_LANGPACK_ET]
-en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_VI]
-en-US = "Vietnamese"
-
-[STR_DESC_MODULE_LANGPACK_VI]
-en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BG]
-en-US = "Bulgarian"
-
-[STR_DESC_MODULE_LANGPACK_BG]
-en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KM]
-en-US = "Khmer"
-
-[STR_DESC_MODULE_LANGPACK_KM]
-en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_PA_IN]
-en-US = "Punjabi"
-
-[STR_DESC_MODULE_LANGPACK_PA_IN]
-en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GU_IN]
-en-US = "Gujarati"
-
-[STR_DESC_MODULE_LANGPACK_GU_IN]
-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TA]
-en-US = "Tamil"
-
-[STR_DESC_MODULE_LANGPACK_TA]
-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TA_IN]
-en-US = "Tamil"
-
-[STR_DESC_MODULE_LANGPACK_TA_IN]
-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HI]
-en-US = "Hindi"
-
-[STR_DESC_MODULE_LANGPACK_HI]
-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HI_IN]
-en-US = "Hindi"
-
-[STR_DESC_MODULE_LANGPACK_HI_IN]
-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ST]
-en-US = "Southern Sotho (Sutu)"
-
-[STR_DESC_MODULE_LANGPACK_ST]
-en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TN]
-en-US = "Tswana"
-
-[STR_DESC_MODULE_LANGPACK_TN]
-en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_XH]
-en-US = "Xhosa"
-
-[STR_DESC_MODULE_LANGPACK_XH]
-en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ZU]
-en-US = "Zulu"
-
-[STR_DESC_MODULE_LANGPACK_ZU]
-en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AF]
-en-US = "Afrikaans"
-
-[STR_DESC_MODULE_LANGPACK_AF]
-en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SW]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_LANGPACK_SW]
-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SW_TZ]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_LANGPACK_SW_TZ]
-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_LO]
-en-US = "Lao"
-
-[STR_DESC_MODULE_LANGPACK_LO]
-en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MY]
-en-US = "Burmese"
-
-[STR_DESC_MODULE_LANGPACK_MY]
-en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NSO]
-en-US = "Northern Sotho"
-
-[STR_DESC_MODULE_LANGPACK_NSO]
-en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BN]
-en-US = "Bengali"
-
-[STR_DESC_MODULE_LANGPACK_BN]
-en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BN_BD]
-en-US = "Bengali (Bangladesh)"
-
-[STR_DESC_MODULE_LANGPACK_BN_BD]
-en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BN_IN]
-en-US = "Bengali (India)"
-
-[STR_DESC_MODULE_LANGPACK_BN_IN]
-en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_OR]
-en-US = "Oriya"
-
-[STR_DESC_MODULE_LANGPACK_OR]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_OR_IN]
-en-US = "Oriya"
-
-[STR_DESC_MODULE_LANGPACK_OR_IN]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MR]
-en-US = "Marathi"
-
-[STR_DESC_MODULE_LANGPACK_MR]
-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MR_IN]
-en-US = "Marathi"
-
-[STR_DESC_MODULE_LANGPACK_MR_IN]
-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NE]
-en-US = "Nepali"
-
-[STR_DESC_MODULE_LANGPACK_NE]
-en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AR]
-en-US = "Arabic"
-
-[STR_DESC_MODULE_LANGPACK_AR]
-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AR_SA]
-en-US = "Arabic"
-
-[STR_DESC_MODULE_LANGPACK_AR_SA]
-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_CA]
-en-US = "Catalan"
-
-[STR_DESC_MODULE_LANGPACK_CA]
-en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_DA]
-en-US = "Danish"
-
-[STR_DESC_MODULE_LANGPACK_DA]
-en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FI]
-en-US = "Finnish"
-
-[STR_DESC_MODULE_LANGPACK_FI]
-en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HE]
-en-US = "Hebrew"
-
-[STR_DESC_MODULE_LANGPACK_HE]
-en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_IS]
-en-US = "Icelandic"
-
-[STR_DESC_MODULE_LANGPACK_IS]
-en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NB]
-en-US = "Norwegian (Bokmal)"
-
-[STR_DESC_MODULE_LANGPACK_NB]
-en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NN]
-en-US = "Norwegian (Nynorsk)"
-
-[STR_DESC_MODULE_LANGPACK_NN]
-en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RM]
-en-US = "Rhaeto-Romance"
-
-[STR_DESC_MODULE_LANGPACK_RM]
-en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RO]
-en-US = "Romanian"
-
-[STR_DESC_MODULE_LANGPACK_RO]
-en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SQ]
-en-US = "Albanian"
-
-[STR_DESC_MODULE_LANGPACK_SQ]
-en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UR]
-en-US = "Urdu"
-
-[STR_DESC_MODULE_LANGPACK_UR]
-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ID]
-en-US = "Indonesian"
-
-[STR_DESC_MODULE_LANGPACK_ID]
-en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UK]
-en-US = "Ukrainian"
-
-[STR_DESC_MODULE_LANGPACK_UK]
-en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BE]
-en-US = "Belarusian"
-
-[STR_DESC_MODULE_LANGPACK_BE]
-en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SL]
-en-US = "Slovenian"
-
-[STR_DESC_MODULE_LANGPACK_SL]
-en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_LV]
-en-US = "Latvian"
-
-[STR_DESC_MODULE_LANGPACK_LV]
-en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_LT]
-en-US = "Lithuanian"
-
-[STR_DESC_MODULE_LANGPACK_LT]
-en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_HY]
-en-US = "Armenian"
-
-[STR_DESC_MODULE_LANGPACK_HY]
-en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EU]
-en-US = "Basque"
-
-[STR_DESC_MODULE_LANGPACK_EU]
-en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MK]
-en-US = "Macedonian"
-
-[STR_DESC_MODULE_LANGPACK_MK]
-en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MT]
-en-US = "Maltese"
-
-[STR_DESC_MODULE_LANGPACK_MT]
-en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_CY]
-en-US = "Welsh"
-
-[STR_DESC_MODULE_LANGPACK_CY]
-en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GL]
-en-US = "Galician"
-
-[STR_DESC_MODULE_LANGPACK_GL]
-en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SH_YU]
-en-US = "Serbian (Latin)"
-
-[STR_DESC_MODULE_LANGPACK_SH_YU]
-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SH]
-en-US = "Serbian (Latin)"
-
-[STR_DESC_MODULE_LANGPACK_SH]
-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GA]
-en-US = "Irish"
-
-[STR_DESC_MODULE_LANGPACK_GA]
-en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SR_CS]
-en-US = "Serbian (Cyrillic)"
-
-[STR_DESC_MODULE_LANGPACK_SR_CS]
-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SR]
-en-US = "Serbian (Cyrillic)"
-
-[STR_DESC_MODULE_LANGPACK_SR]
-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BS]
-en-US = "Bosnian"
-
-[STR_DESC_MODULE_LANGPACK_BS]
-en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_AS_IN]
-en-US = "Assamese"
-
-[STR_DESC_MODULE_LANGPACK_AS_IN]
-en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_RW]
-en-US = "Kinyarwanda"
-
-[STR_DESC_MODULE_LANGPACK_RW]
-en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SA]
-en-US = "Sanskrit"
-
-[STR_DESC_MODULE_LANGPACK_SA]
-en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FA]
-en-US = "Farsi"
-
-[STR_DESC_MODULE_LANGPACK_FA]
-en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_FO]
-en-US = "Faroese"
-
-[STR_DESC_MODULE_LANGPACK_FO]
-en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SB]
-en-US = "Sorbian"
-
-[STR_DESC_MODULE_LANGPACK_SB]
-en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TT]
-en-US = "Tatar"
-
-[STR_DESC_MODULE_LANGPACK_TT]
-en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TS]
-en-US = "Tsonga"
-
-[STR_DESC_MODULE_LANGPACK_TS]
-en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_YI]
-en-US = "Yiddish"
-
-[STR_DESC_MODULE_LANGPACK_YI]
-en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_BR]
-en-US = "Breton"
-
-[STR_DESC_MODULE_LANGPACK_BR]
-en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_NR]
-en-US = "Ndebele South"
-
-[STR_DESC_MODULE_LANGPACK_NR]
-en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_SS]
-en-US = "Swazi"
-
-[STR_DESC_MODULE_LANGPACK_SS]
-en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_VE]
-en-US = "Venda"
-
-[STR_DESC_MODULE_LANGPACK_VE]
-en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KN]
-en-US = "Kannada"
-
-[STR_DESC_MODULE_LANGPACK_KN]
-en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MS]
-en-US = "Malay (Malaysian)"
-
-[STR_DESC_MODULE_LANGPACK_MS]
-en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TG]
-en-US = "Tajik"
-
-[STR_DESC_MODULE_LANGPACK_TG]
-en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KU]
-en-US = "Kurdish"
-
-[STR_DESC_MODULE_LANGPACK_KU]
-en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_DZ]
-en-US = "Dzongkha"
-
-[STR_DESC_MODULE_LANGPACK_DZ]
-en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KA]
-en-US = "Georgian"
-
-[STR_DESC_MODULE_LANGPACK_KA]
-en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EO]
-en-US = "Esperanto"
-
-[STR_DESC_MODULE_LANGPACK_EO]
-en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_GU]
-en-US = "Gujarati"
-
-[STR_DESC_MODULE_LANGPACK_GU]
-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EN_ZA]
-en-US = "English (South Africa)"
-
-[STR_DESC_MODULE_LANGPACK_EN_ZA]
-en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_EN_GB]
-en-US = "English (United Kingdom)"
-
-[STR_DESC_MODULE_LANGPACK_EN_GB]
-en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UR_IN]
-en-US = "Urdu"
-
-[STR_DESC_MODULE_LANGPACK_UR_IN]
-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_ML_IN]
-en-US = "Malayalam"
-
-[STR_DESC_MODULE_LANGPACK_ML_IN]
-en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TE_IN]
-en-US = "Telugu"
-
-[STR_DESC_MODULE_LANGPACK_TE_IN]
-en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_TI_ER]
-en-US = "Tigrinya"
-
-[STR_DESC_MODULE_LANGPACK_TI_ER]
-en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_UZ]
-en-US = "Uzbek"
-
-[STR_DESC_MODULE_LANGPACK_UZ]
-en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_MN]
-en-US = "Mongolian"
-
-[STR_DESC_MODULE_LANGPACK_MN]
-en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_LANGPACK_KK]
-en-US = "Kazakh"
-
-[STR_DESC_MODULE_LANGPACK_KK]
-en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 8b84916172ac..88a2926bab9c 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -41,7 +41,7 @@ Module gid_Module_Optional_Gnome
     XpdCheckSolaris = "SUNWgnome-vfs";
 #endif
     Files = (
-      gid_File_Lib_Evoab_2,
+      gid_File_Lib_Evoab,
       gid_File_Lib_Fps_Gnome,
       gid_File_Lib_Vclplug_Gtk,
 #ifdef ENABLE_GTK3
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp
index 5b6dffb7d14a..984b2470247c 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -34,5 +34,5 @@ Module gid_Module_Optional_Grfflt
     ParentID = gid_Module_Optional;
     Default = YES;
     Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport,
-    		 gid_File_Share_Registry_Graphicfilter_Xcd);
+    		 gid_File_Lib_VisioImport, gid_File_Share_Registry_Graphicfilter_Xcd);
 End
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index cf94b1892f2f..eecc16df0c07 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1479,15 +1479,6 @@ STD_LIB_FILE( gid_File_Lib_Updchkui , updatecheckui )
 
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
 
-#ifdef WNT
-File gid_File_Lib_Onlinecheck
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "onlinecheck.dll";
-End
-#endif
-
 #ifndef SYSTEM_OPENSSL
 File gid_File_Lib_Openssl
     LIB_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index da5775bed73d..8a3889f06479 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -482,7 +482,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Svtmisc,
     gid_File_Lib_Updchkui,
     gid_File_Lib_Updatefeed,
-	gid_File_Lib_Onlinecheck,
 	gid_File_Lib_Cli_Oootypes_Assembly,
 	gid_File_Lib_Policy_Cli_Oootypes_Assembly,
 	gid_File_Lib_Policy_Cli_Oootypes_Config);
@@ -616,7 +615,6 @@ Module gid_Module_Root_Files_6
     gid_File_Share_Registry_Main_Xcd,
     gid_File_Share_Registry_Forcedefault_Xcd,
 	gid_File_Pymailmerge,
-	gid_File_Pymailmerge_msgbox,
     gid_File_Xsl_Common_Measure_Conversion,
 	gid_File_Xsl_Common_Math_Functions,
 	gid_File_Xsl_Export_Common_Body,
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index aece7265edd2..58d8ec017ae6 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -191,7 +191,11 @@ End
 File gid_File_Dl_Cppuhelper
     LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#if defined WNT && !defined _MSC // Hack for not gbuild'ified cppuhelper on MinGW:
+    Name = "uno_cppuhelpergcc33.dll";
+#else
     Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "D2A191E6-2023-41F5-9032-B98C50C37964";
 End
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index 32f0dc8def4b..6ee83450fe1f 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -41,7 +41,7 @@ Module gid_Module_Optional_Pyuno
             gid_Dir_PythonFramework_Versions_ver_lib,
             gid_Dir_PythonFramework_Versions_ver_lib_pythonver,
             gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config);
-    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
+    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
     Unixlinks = (gid_Unixlink_Python_Headers,
                  gid_Unixlink_Python_Resources,
                  gid_Unixlink_Python_Versions_Current,
diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
index 3027e85693e7..cf5ad7e230d1 100644
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@ -32,7 +32,7 @@
 File gid_File_Pymailmerge
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
-	name = "mailmerge.zip";
+    Name = "mailmerge.zip";
     Styles = (ARCHIVE);
 End
 #endif
diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk
index 46b9ac24daa3..32026b7e7774 100755
--- a/scp2/source/templates/makefile.mk
+++ b/scp2/source/templates/makefile.mk
@@ -40,7 +40,7 @@ TARGET=templates
 COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
 .EXPORT : COMPLETELANGISO_VAR
 
-ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_templates_root.inc $(INCCOM)$/alllangmodules_accessories_samples_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc $(INCCOM)$/alllangmodules_extensions_templates.inc $(INCCOM)$/alllangmodules_extensions_lightproof.inc $(INCCOM)$/allhelpmodules.inc $(INCCOM)$/allhelpmodules_root.inc
+ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_templates_root.inc $(INCCOM)$/alllangmodules_accessories_samples_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc $(INCCOM)$/alllangmodules_extensions_templates.inc $(INCCOM)$/allhelpmodules.inc $(INCCOM)$/allhelpmodules_root.inc
 
 .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk $(MISC)$/$(TARGET)_help_track.mk
 .IF "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
diff --git a/scp2/source/templates/module_langpack_extensions_lightproof.sct b/scp2/source/templates/module_langpack_extensions_lightproof.sct
deleted file mode 100644
index 248120f7f083..000000000000
--- a/scp2/source/templates/module_langpack_extensions_lightproof.sct
+++ /dev/null
@@ -1,49 +0,0 @@
-/*************************************************************************
- *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 3.
- *
- *
- *    GNU Lesser General Public License Version 3
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library 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 for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-Module gid_Module_Optional_Extensions_LightProof_Root_<LANGUAGE_>
-    ParentID = gid_Module_Optional_Extensions_LightProof;
-    Sortkey = "<SORTKEY>";
-    Language = "<LANGUAGE>";
-    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
-    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
-End
-
-Module gid_Module_Optional_Extensions_LightProof_M_<LANGUAGE_>
-    ParentID = gid_Module_Optional_Extensions_LightProof_Root_<LANGUAGE_>;
-    Sortkey = "50";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Optional_Extensions_LightProof_Template;
-    Name = "gid_Module_Optional_Extensions_LightProof_<LANGUAGE_>";
-    Description = "gid_Module_Optional_Extensions_LightProof_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 47b48a06b67d..86831d588bf6 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -76,7 +76,6 @@ SCP1FILES  = installation_ooo.par          \
              file_graphicfilter.par        \
              module_extensions.par         \
              module_extensions_sun_templates.par         \
-             module_extensions_lightproof.par   \
              directory_extensions.par                     \
              file_extensions.par           \
              module_xsltfilter.par         \