summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-07-17 15:34:20 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-07-17 15:34:20 +0000
commit6be4831fe619292107304bf7664697c566f2c932 (patch)
tree0e3a728e7629d19911b5e13549b682c8136abe2b /scp2
parentcbfaf9968c55f254cb50f23538d140b181d781c3 (diff)
INTEGRATION: CWS native168 (1.104.14); FILE MERGED
2008/07/10 15:10:34 is 1.104.14.1: #158212# avoid same files at different modules
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp6
1 files changed, 5 insertions, 1 deletions
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 6b9e3bba8c25..03708553ed6c 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: module_hidden_ooo.scp,v $
- * $Revision: 1.110 $
+ * $Revision: 1.111 $
*
* This file is part of OpenOffice.org.
*
@@ -225,6 +225,7 @@ Module gid_Module_Root_Files_4
gid_File_Lib_TextConversionDlgs,
gid_File_Lib_Tk,
gid_File_Lib_Acc,
+ gid_File_Lib_BaseBmp,
gid_File_Lib_Tools,
gid_File_Lib_Utl,
gid_File_Lib_Uui,
@@ -241,6 +242,7 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Vclplug_Gen,
gid_File_Lib_Vclplug_Gtk,
gid_File_Lib_Vclplug_Kde,
+ gid_File_Lib_Vclplug_Svp,
gid_File_Lib_Basctl,
gid_File_Lib_CanvasTools,
gid_File_Lib_CppCanvas,
@@ -763,6 +765,8 @@ Module gid_Module_Root_Files_6
gid_File_Registry_Spool_Oo_TypeDetection_Impress_UISort_Xcu,
gid_File_Registry_Spool_Oo_TypeDetection_Math_UISort_Xcu,
gid_File_Registry_Spool_Oo_Office_Linguistic_Forcedefaultlanguage_Xcu,
+ gid_File_Registry_Spool_Oo_Office_Writer_PyMailMerge_Xcu,
+ gid_File_Pymailmerge,
gid_File_Xsl_Common_Measure_Conversion,
gid_File_Xsl_Common_Math_Functions,
gid_File_Xsl_Export_Common_Body,