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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Mar  3 23:52:00 2009
New Revision: 15450
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15450&view=rev

Log:
2009-03-03  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/apply: removed two chart related patches that have 
	been integrated in ooo310-m3 via koheiformula02.


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Mar  3 23:52:00 2009
@@ -929,9 +929,11 @@
 # modify the autofill behavior to bring it a little closer to Excel's.
 calc-autofill-increment-fix.diff, i#5550, kohei
 
+[ CalcFixes < dev300-m42 < ooo310-m3 ]
 # fixed chart wizard failure when the formula syntax is set to Excel A1/R1C1.
 chart-wizard-xls-address-convention-fix.diff, n#411450, i#94696, kohei
 
+[ CalcFixes ]
 # fixed change track export to xls files wrt cell change records.
 calc-change-track-xls-export-fix.diff, n#416045, i#93839, kohei
 
@@ -1991,9 +1993,11 @@
 
 calc-grammar-xls-english-sc.diff, kohei
 
+[ CalcFixes < dev300-m42 < ooo310-m3 ]
 # fix assertions to prevent them from being incorrectly triggered.
 chart-odf-export-assert-removal.diff, i#97563, kohei
 
+[ CalcFixes ]
 # Support custom sheet tab colors option (by Daniel Watson).
 calc-sheet-tab-color-officecfg.diff, kohei/danielbw
 calc-sheet-tab-color-svtools.diff, kohei/danielbw