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

[Thorsten Behrens]

 scp2/source/python/file_python.scp             |    7 -------
 scp2/source/python/module_python_mailmerge.scp |   10 ++--------
 2 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 5aa51baf5260486c7830f3a8fb46700609ac62ad
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Wed Dec 7 17:43:22 2011 +0100

    Python mailmerge stuff is now inside mailmerge.zip

diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index ba83a9c..cdcd744 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -58,13 +58,6 @@ File gid_File_Py_Unohelper
     Styles = (PACKED);
 End
 
-File gid_File_Py_Officehelper
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "officehelper.py";
-    Styles = (PACKED);
-End
-
 File gid_File_Py_Uno
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
index 222e33f..d33f982 100644
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@ -32,14 +32,8 @@
 File gid_File_Pymailmerge
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
-    Name = "mailmerge.py";
-    Styles = (PACKED);
-End
-File gid_File_Pymailmerge_msgbox
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "msgbox.py";
-    Styles = (PACKED);
+    name = "mailmerge.zip";
+    Styles = (ARCHIVE);
 End
 #endif
 #endif