|
 |
62353db |
From 75d215d47331f816c5d41a34b63badf6e1636ac8 Mon Sep 17 00:00:00 2001
|
|
|
62353db |
From: Stephan Bergmann <sbergman@redhat.com>
|
|
|
62353db |
Date: Fri, 16 Dec 2011 09:53:31 +0100
|
|
|
62353db |
Subject: [PATCH] Fix typo and clean up.
|
|
|
62353db |
|
|
|
62353db |
---
|
|
|
62353db |
scp2/source/ooo/module_hidden_ooo.scp | 1 -
|
|
|
62353db |
scp2/source/python/module_python.scp | 2 +-
|
|
|
62353db |
scp2/source/python/module_python_mailmerge.scp | 2 +-
|
|
|
62353db |
3 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
62353db |
|
|
|
62353db |
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
|
|
|
62353db |
index da5775b..024ec68 100644
|
|
|
62353db |
--- a/scp2/source/ooo/module_hidden_ooo.scp
|
|
|
62353db |
+++ b/scp2/source/ooo/module_hidden_ooo.scp
|
|
|
62353db |
@@ -616,7 +616,6 @@ Module gid_Module_Root_Files_6
|
|
|
62353db |
gid_File_Share_Registry_Main_Xcd,
|
|
|
62353db |
gid_File_Share_Registry_Forcedefault_Xcd,
|
|
|
62353db |
gid_File_Pymailmerge,
|
|
|
62353db |
- gid_File_Pymailmerge_msgbox,
|
|
|
62353db |
gid_File_Xsl_Common_Measure_Conversion,
|
|
|
62353db |
gid_File_Xsl_Common_Math_Functions,
|
|
|
62353db |
gid_File_Xsl_Export_Common_Body,
|
|
|
62353db |
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
|
|
|
62353db |
index 32f0dc8..6ee8345 100644
|
|
|
62353db |
--- a/scp2/source/python/module_python.scp
|
|
|
62353db |
+++ b/scp2/source/python/module_python.scp
|
|
|
62353db |
@@ -41,7 +41,7 @@ Module gid_Module_Optional_Pyuno
|
|
|
62353db |
gid_Dir_PythonFramework_Versions_ver_lib,
|
|
|
62353db |
gid_Dir_PythonFramework_Versions_ver_lib_pythonver,
|
|
|
62353db |
gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config);
|
|
|
62353db |
- Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
|
|
|
62353db |
+ Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
|
|
|
62353db |
Unixlinks = (gid_Unixlink_Python_Headers,
|
|
|
62353db |
gid_Unixlink_Python_Resources,
|
|
|
62353db |
gid_Unixlink_Python_Versions_Current,
|
|
|
62353db |
diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
|
|
|
62353db |
index 3027e85..cf5ad7e 100644
|
|
|
62353db |
--- a/scp2/source/python/module_python_mailmerge.scp
|
|
|
62353db |
+++ b/scp2/source/python/module_python_mailmerge.scp
|
|
|
62353db |
@@ -32,7 +32,7 @@
|
|
|
62353db |
File gid_File_Pymailmerge
|
|
|
62353db |
TXT_FILE_BODY;
|
|
|
62353db |
Dir = gid_Brand_Dir_Program;
|
|
|
62353db |
- name = "mailmerge.zip";
|
|
|
62353db |
+ Name = "mailmerge.zip";
|
|
|
62353db |
Styles = (ARCHIVE);
|
|
|
62353db |
End
|
|
|
62353db |
#endif
|
|
|
62353db |
--
|
|
|
62353db |
1.7.7.3
|
|
|
62353db |
|