[Libreoffice-commits] .: scp2/source

[Michael Meeks]

 scp2/source/ooo/directory_ooo.scp        |    5 +++++
 scp2/source/ooo/file_extra_ooo.scp       |   13 ++++++-------
 scp2/source/ooo/module_hidden_ooo.scp    |    1 +
 scp2/source/ooo/module_lang_template.scp |    1 -
 4 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 57922de77be186fb088492cbed31dac152d1415e
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Dec 8 15:27:32 2010 +0000

    make impress templates language neutral to save space

diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 9668742..ea53086 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -975,6 +975,11 @@ Directory gid_Dir_Share_Template_Wizard
     DosName = "wizard";
 End
 
+Directory gid_Dir_Share_Template_Layout
+    ParentID = gid_Dir_Template;
+    DosName = "layout";
+End
+
 Directory gid_Dir_Share_Template_Wizard_Bitmap
     ParentID = gid_Dir_Share_Template_Wizard;
     DosName = "bitmap";
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index ee8c46f..49f3fb7 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -350,13 +350,6 @@ File gid_File_Extra_Symbols
     Name = "symbols.zip";
 End
 
-File gid_File_Extra_Tpllayoutimpr_Lang
-    Dir = gid_Dir_Template_Layout;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tpllayoutimpr,zip);
-End
-
 File gid_File_Extra_Tplpresntimpr_Lang
     Dir = gid_Dir_Template_Presnt;
     TXT_FILE_BODY;
@@ -364,6 +357,12 @@ File gid_File_Extra_Tplpresntimpr_Lang
     EXTRA_ALL_LANG(tplpresntimpr,zip);
 End
 
+File gid_File_Extra_Tpllayoutimpr
+    Dir = gid_Dir_Share_Template_Layout;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "tpllayoutimpr.zip";
+End
+
 File gid_File_Extra_Tplwizbitmap
     Dir = gid_Dir_Share_Template_Wizard_Bitmap;
     ARCHIVE_TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index b276571..84f96a5 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -507,6 +507,7 @@ Module gid_Module_Root_Files_6
 	gid_File_Extra_Gallwwwgraf,
 	gid_File_Extra_Migration,
 	gid_File_Extra_Migration_Lang_Multi,
+	gid_File_Extra_Tpllayoutimpr,
 	gid_File_Extra_Tplwizbitmap,
 	gid_File_Extra_Tplwizletter,
 	gid_File_Extra_Tplwizletter_en_US,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 4e4b55d..e95ca32 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -32,7 +32,6 @@ Module gid_Module_Langpack_Basis_Template
     Styles = (TEMPLATEMODULE);
     Files = (gid_File_Extra_Autotextshare_Lang,
              gid_File_Extra_Palettes_Lang,
-             gid_File_Extra_Tpllayoutimpr_Lang,
              gid_File_Extra_Tplpresntimpr_Lang,
              gid_File_Extra_Tplwizagenda_Lang,
              gid_File_Extra_Tplwizdesktop_Lang,