ooo-build r12612 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue May 20 23:04:27 2008
New Revision: 12612
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12612&view=rev

Log:
forgot this one...

Added:
   trunk/patches/dev300/wpsimport-scp2-m12.diff
      - copied unchanged from r12608, /trunk/patches/dev300/wpsimport-scp2.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/wpsimport-scp2.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue May 20 23:04:27 2008
@@ -272,7 +272,13 @@
 # MS Works import filter (following patches depend on each other) Fridrich
 wpsimport-config_office.diff
 wpsimport-filter.diff
+
+[ CWSBackports < dev300-m13 ]
+wpsimport-scp2-m12.diff
+[ CWSBackports >= dev300-m13 ]
 wpsimport-scp2.diff
+
+[ CWSBackports ]
 wpsimport-writerperfect.diff
 libwps.diff
 

Modified: trunk/patches/dev300/wpsimport-scp2.diff
==============================================================================
--- trunk/patches/dev300/wpsimport-scp2.diff	(original)
+++ trunk/patches/dev300/wpsimport-scp2.diff	Tue May 20 23:04:27 2008
@@ -11,11 +11,12 @@
  File gid_File_Lib_Mozabdrv
 --- scp2/source/writer/module_writer.scp	2 Jan 2007 15:31:51 -0000	1.17
 +++ scp2/source/writer/module_writer.scp	29 Jan 2007 10:54:40 -0000	1.16.158.2
-@@ -53,6 +53,7 @@ Module gid_Module_Prg_Wrt_Bin
+@@ -52,7 +52,7 @@
      gid_File_Lib_Swd,
      gid_File_Lib_Swui,
      gid_File_Lib_Wpft,
+-    gid_File_Lib_Writerfilter,
 +    gid_File_Lib_Msworks,
      gid_File_Lib_T602Filter,
-     gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml,
-     gid_File_Share_Config_Sofficecfg_Writerweb_Menubar_Xml,
+     gid_File_Lib_Writerfilter,
+     gid_File_Lib_Wlwp,