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

[tml svn gnome org]

Author: tml
Date: Mon Dec  8 08:27:15 2008
New Revision: 14774
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14774&view=rev

Log:
2008-12-08  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply: Comment out sw-mailmerge-faster.diff, too
	risky (bnc#447047).



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Dec  8 08:27:15 2008
@@ -640,12 +640,18 @@
 sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
 # Allows to edit a csv data source after a mail merge
 sw-remove-csv-lock.diff, i#85133, mloiseleur
+
 [ WriterFixes < dev300-m36 ]
 # Provides a great speed-up for a mail merge operation : 7x faster
-sw-mailmerge-faster-m35.diff, i#40827, mloiseleur
+# It seems possible that this patch breaks mail merge, see
+# bnc#447047.  Let's not risk it.
+#sw-mailmerge-faster-m35.diff, i#40827, mloiseleur
+
 [ WriterFixes >= dev300-m36 ]
 # Provides a great speed-up for a mail merge operation : 7x faster
-sw-mailmerge-faster.diff, i#40827, mloiseleur
+# It seems possible that this patch breaks mail merge, see
+# bnc#447047.  Let's not risk it.
+#sw-mailmerge-faster.diff, i#40827, mloiseleur
 
 
 [ CalcFixes ]