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

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Dec 29 20:53:48 2008
New Revision: 14958
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14958&view=rev

Log:
2008-12-29  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/apply: more patches upstreamed in dev300-m38.


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Dec 29 20:53:48 2008
@@ -1975,6 +1975,7 @@
 calc-formula-variable-separators-svx.diff,       n#447164, i#92056, kohei
 calc-formula-variable-separators-officecfg.diff, n#447164, i#92056, kohei
 
+[ CalcFixes < dev300-m38 ]
 # Fix parse failure on non-ASCII sheet names in Excel A1 and R1C1 modes.
 calc-xls-parser-sheet-name-fix-sc.diff, n#407807, i#92379, kohei
 
@@ -1990,12 +1991,18 @@
 # strip the fraction part of a date-time value when using DATEVALUE.
 calc-formula-datevalue-strip-time.diff, i#94765, kohei
 
+[ CalcFixes < dev300-m38 ]
 # Implement external range names.
 calc-external-defined-names-sc.diff, i#3740, i#4385, n#355685, kohei
 calc-external-defined-names-offapi.diff, i#3740, i#4385, n#355685, kohei
 calc-external-defined-names-officecfg.diff, i#3740, i#4385, n#355685, kohei
 calc-external-defined-names-svtools.diff, i#3740, i#4385, n#355685, kohei
 
+[ CalcFixes >= dev300-m38 ]
+# Implement external range names.
+# TODO: this feature is partially upstreamed.  Enable this in ooo-build.
+
+[ CalcFixes ]
 # Don't adjust row height on xls load for better layout preservation and
 # faster file load.
 calc-xls-disable-adjust-row-height.diff, kohei