[Libreoffice-commits] .: instsetoo_native/util scp2/source

[Michael Meeks]

 instsetoo_native/util/makefile.mk              |    3 ++-
 scp2/source/ooo/module_hidden_ooo.scp          |    1 +
 scp2/source/python/module_python_mailmerge.scp |    6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit c5ffff8d0e618d46af9853a1d390b55e9ada48c7
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri May 6 14:38:48 2011 +0100

    install the new msgbox.py helper

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 5672bf2..3c93c3f 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -73,7 +73,8 @@ LOCALPYFILES= \
     $(BIN)$/unohelper.py \
     $(BIN)$/pythonloader.py \
     $(BIN)$/officehelper.py \
-    $(BIN)$/mailmerge.py
+    $(BIN)$/mailmerge.py \
+    $(BIN)$/msgbox.py
 .ENDIF
 
 help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 2331fe9..4e4fbb9 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -670,6 +670,7 @@ 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/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
index ee92ef1..53ed507 100644
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@ -35,5 +35,11 @@ File gid_File_Pymailmerge
     Name = "mailmerge.py";
     Styles = (PACKED);
 End
+File gid_File_Pymailmerge_msgbox
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Program;
+    Name = "msgbox.py";
+    Styles = (PACKED);
+End
 #endif
 #endif