[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scp2/source

[Michael Meeks]

 scp2/source/ooo/file_extra_ooo.scp       |    6 ------
 scp2/source/ooo/module_hidden_ooo.scp    |   11 -----------
 scp2/source/ooo/module_lang_template.scp |    1 -
 3 files changed, 18 deletions(-)

New commits:
commit 845302e921d8d2c5db702c14d74fda35f16c662d
Author: Andras Timar <atimar at novell.com>
Date:   Sat Apr 16 21:56:39 2011 +0200

    do not ship Letter Wizard templates twice fdo#35722

diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 03458fc..7cf102c 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -375,12 +375,6 @@ File gid_File_Extra_Tplwizletter
     Name = "tplwizletter.zip";
 End
 
-File gid_File_Extra_Tplwizletter_Lang
-    Dir = gid_Dir_Template_Wizard_Letter;
-    ARCHIVE_TXT_FILE_BODY;
-    EXTRA_ALL_LANG(tplwizletter,zip);
-End
-
 File gid_File_Extra_Tplwizfax_Lang
     Dir = gid_Dir_Template_Wizard_Fax;
     TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index e6a3ba7..c27d21d 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -512,17 +512,6 @@ Module gid_Module_Root_Files_6
 	gid_File_Extra_Tpllayoutimpr,
 	gid_File_Extra_Tplwizbitmap,
 	gid_File_Extra_Tplwizletter,
-	gid_File_Extra_Tplwizletter_en_US,
-	gid_File_Extra_Tplwizletter_de,
-	gid_File_Extra_Tplwizletter_fr,
-	gid_File_Extra_Tplwizletter_es,
-	gid_File_Extra_Tplwizletter_it,
-	gid_File_Extra_Tplwizletter_pt_BR,
-	gid_File_Extra_Tplwizletter_sv,
-	gid_File_Extra_Tplwizletter_ja,
-	gid_File_Extra_Tplwizletter_ko,
-	gid_File_Extra_Tplwizletter_zh_CN,
-	gid_File_Extra_Tplwizletter_zh_TW,
 	gid_File_Extra_Tplwizmemo_Lang,
 	gid_File_Extra_Autotextuser_Lang,
 	gid_File_Extra_Dir_Fonts,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 8c24b6d..6825ed2 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -35,7 +35,6 @@ Module gid_Module_Langpack_Basis_Template
              gid_File_Extra_Tplwizagenda_Lang,
              gid_File_Extra_Tplwizdesktop_Lang,
              gid_File_Extra_Tplwizfax_Lang,
-             gid_File_Extra_Tplwizletter_Lang,
              gid_File_Extra_Tplwizreport_Lang,
              gid_File_Extra_Tplwizstyles_Lang,
              gid_File_Extra_Wordbook,