18 files changed, 3 insertions, 941 deletions
diff --git a/configure.in b/configure.in
index 40cf257ba5f8..84d7b506501d 100644
--- a/configure.in
+++ b/configure.in
@@ -327,14 +327,6 @@ AC_ARG_ENABLE(ext-languagetool,
         [Enable the LanguageTool extension.])
 )
 
-AC_ARG_ENABLE(ext-lightproof,
-    AS_HELP_STRING([--enable-ext-lightproof],
-        [Enable the Lightproof extension. The enable switch can contain only
-         the desired languages: --enable-lightproof="en hu ru"]),
-    [enable_ext_lightproof="$enableval"],
-    [enable_ext_lightproof=no]
-)
-
 AC_ARG_ENABLE(ext-mysql-connector,
     AS_HELP_STRING([--enable-ext-mysql-connector],
         [Enable the build of the MySQL Connector extension.])
@@ -8124,48 +8116,6 @@ fi
 AC_SUBST(WITH_EXTENSION_INTEGRATION)
 
 dnl ===================================================================
-dnl Test whether to include Lightproof extensions
-dnl ===================================================================
-AC_MSG_CHECKING([for Lightproof extensions integration (only supported languages displayed)])
-LIGHTPROOF_LANG=
-LIGHTPROOF_HU_PACK=
-LIGHTPROOF_RU_PACK=
-LIGHTPROOF_EN_US_PACK=
-if test "x$enable_ext_lightproof" = "xno" -o "x$enable_extension_integration" = "xno"; then
-    AC_MSG_RESULT([no integration])
-else
-    SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LIGHTPROOF"
-    if test "x$enable_ext_lightproof" = "xyes" -o "x$enable_ext_lightproof" = "x"; then
-        wanted_lightproof="en-US hu ru"
-    else
-        for lang in $enable_ext_lightproof ; do
-            case $lang in
-                en-US|hu|ru)
-                    wanted_lightproof="$wanted_lightproof $lang"
-                    ;;
-                *)
-                    AC_MSG_ERROR([Unknown value for --enable-ext-lightproof: $lang])
-                    ;;
-                esac
-        done
-    fi
-    for lang in $wanted_lightproof ; do
-        LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
-        case $lang in
-            en-US) LIGHTPROOF_EN_US_PACK="0ab55ac8e88f04258f1d3e79e984382f-lightproof-en_US-0.1.oxt" ;;
-            hu) LIGHTPROOF_HU_PACK="76345f925e34fef2d29bade4f29108e9-lightproof-hu_1.3.oxt" ;;
-            ru) LIGHTPROOF_RU_PACK="673860e8649cff2ebdc68bd46f2f7f1a-lightproof-ru_0.1.oxt" ;;
-            *) AC_MSG_ERROR([Unknown value for --enable-ext-lightproof: $lang]) ;;
-        esac
-    done
-    AC_MSG_RESULT([$LIGHTPROOF_LANG])
-fi
-AC_SUBST(LIGHTPROOF_LANG)
-AC_SUBST(LIGHTPROOF_HU_PACK)
-AC_SUBST(LIGHTPROOF_RU_PACK)
-AC_SUBST(LIGHTPROOF_EN_US_PACK)
-
-dnl ===================================================================
 dnl Test whether to include Watch Window extension
 dnl ===================================================================
 AC_MSG_CHECKING([for Watch Window extension integration])
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
index 16b065b9e7d0..aacd3ba4ad1b 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -36,7 +36,6 @@
 --enable-ext-scripting-javascript
 --enable-ext-google-docs
 --enable-ext-hunart
---enable-ext-lightproof
 --enable-ext-nlpsolver
 --enable-ext-numbertext
 --enable-ext-typo
diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf
index c46bddec96e0..04b92ddb2f58 100644
--- a/distro-configs/OxygenOfficeWin32.conf
+++ b/distro-configs/OxygenOfficeWin32.conf
@@ -23,7 +23,6 @@
 --enable-ext-scripting-javascript
 --enable-ext-google-docs
 --enable-ext-hunart
---enable-ext-lightproof
 --enable-ext-nlpsolver
 --enable-ext-numbertext
 --enable-ext-typo
diff --git a/download b/download
index 4b8c2426d46c..279263ca6180 100755
--- a/download
+++ b/download
@@ -270,7 +270,7 @@ if [ "$OXYGENOFFICE_PACK" = "YES" ] ; then
 fi
 
 # Extensions copy
-for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $OOOBLOGGER_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_RU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do
+for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $OOOBLOGGER_EXTENSION_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do
     check_file $TARFILE_LOCATION/$pack
     packfilename=`echo "$pack" | cut -f 2- -s -d - | cut -f 1 -d _`
     echo "Copy extension: '$pack' as '$packfilename.oxt' ..."
diff --git a/ooo.lst.in b/ooo.lst.in
index 938b54f5f073..bac48e7fb63e 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -112,9 +112,6 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/
 @HUNART_EXTENSION_PACK@
 @TYPO_EXTENSION_PACK@
 @OOOBLOGGER_EXTENSION_PACK@
-@LIGHTPROOF_EN_US_PACK@
-@LIGHTPROOF_HU_PACK@
-@LIGHTPROOF_RU_PACK@
 @SUNTEMPLATES_DE_PACK@
 @SUNTEMPLATES_EN_US_PACK@
 @SUNTEMPLATES_ES_PACK@
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/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         \
diff --git a/set_soenv.in b/set_soenv.in
index d1728e7a6de6..06c8b3011272 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1772,10 +1772,6 @@ ToFile( "SUNTEMPLATES_ES_PACK", "@SUNTEMPLATES_ES_PACK@","e" );
 ToFile( "SUNTEMPLATES_FR_PACK", "@SUNTEMPLATES_FR_PACK@","e" );
 ToFile( "SUNTEMPLATES_HU_PACK", "@SUNTEMPLATES_HU_PACK@","e" );
 ToFile( "SUNTEMPLATES_IT_PACK", "@SUNTEMPLATES_IT_PACK@","e" );
-ToFile( "LIGHTPROOF_EN_US_PACK", "@LIGHTPROOF_EN_US_PACK@","e" );
-ToFile( "LIGHTPROOF_HU_PACK", "@LIGHTPROOF_HU_PACK@","e" );
-ToFile( "LIGHTPROOF_RU_PACK", "@LIGHTPROOF_RU_PACK@","e" );
-ToFile( "LIGHTPROOF_LANG",   "@LIGHTPROOF_LANG@",  "e" );
 ToFile( "WITH_FONTS",        "@WITH_FONTS@",       "e" );
 ToFile( "WITH_AGFA_MONOTYPE_FONTS",  "@WITH_AGFA_MONOTYPE_FONTS@", "e" );
 ToFile( "WITHOUT_AFMS",      "@WITHOUT_AFMS@",     "e" );
diff --git a/setup_native/source/packinfo/packinfo_extensions.txt b/setup_native/source/packinfo/packinfo_extensions.txt
index 16057a8f340f..483154e975d8 100644
--- a/setup_native/source/packinfo/packinfo_extensions.txt
+++ b/setup_native/source/packinfo/packinfo_extensions.txt
@@ -92,22 +92,6 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
-module = "gid_Module_Optional_Extensions_LightProof"
-script = "shellscripts_extensions.txt"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-lightproof"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-lightproof"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
-linuxpatchrequires = ""
-copyright = "2009 by FSF.hu"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "Lightproof extension for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-End
-
-Start
 module = "gid_Module_Optional_Extensions_NumberText"
 solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-numbertext"
 solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
diff --git a/setup_native/source/packinfo/packinfo_office_lang.txt b/setup_native/source/packinfo/packinfo_office_lang.txt
index 66618cb8c20b..c33d84c1414e 100755
--- a/setup_native/source/packinfo/packinfo_office_lang.txt
+++ b/setup_native/source/packinfo/packinfo_office_lang.txt
@@ -192,22 +192,6 @@ destpath = "/opt"
 packageversion = "%ABOUTBOXPRODUCTVERSION"
 End
 
-Start
-module = "gid_Module_Optional_Extensions_LightProof_M"
-script = "shellscripts_extensions.txt"
-solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-lightproof-%LANGUAGESTRING"
-solarisrequires =  "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-lightproof-%LANGUAGESTRING"
-requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
-linuxpatchrequires = ""
-copyright = "1999-2008 by OpenOffice.org"
-solariscopyright = "solariscopyrightfile"
-vendor = "The Document Foundation"
-description = "Lightproof (%LANGUAGESTRING) %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%ABOUTBOXPRODUCTVERSION"
-End
-
 # Language depended package definitions for OxygenOffice Professional
 
 # 1/4 Templates