ooo-build r11675 - in trunk: . patches/src680

[jonp svn gnome org]

Author: jonp
Date: Thu Feb 21 23:14:20 2008
New Revision: 11675
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11675&view=rev

Log:
	* patches/src680/sc-date-fix.diff: Added; Allows "june-2007" to be parsed as
	  "June 1 2007" in en-US locales.
	* patches/src680/apply: Add sc-date-fix.diff.


Added:
   trunk/patches/src680/sc-date-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Feb 21 23:14:20 2008
@@ -697,6 +697,9 @@
 # Paste clipboard when ENTER is pressed, then clear clipboard.
 sc-paste-on-enter.diff, n#358545, i#28535, jonp
 
+# Allow 'june-2007' to be properly parsed as June 1 2007 in en-US locales.
+sc-date-fix.diff, n#358750, jonp
+
 [ CalcFixes < ooh680-m4 ]
 # Add named range support for INDIRECT and INDIRECT_XL
 sc-indirect-named-range.diff, i#4695, n#274387, kohei

Added: trunk/patches/src680/sc-date-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/sc-date-fix.diff	Thu Feb 21 23:14:20 2008
@@ -0,0 +1,40 @@
+Index: svtools/source/numbers/zforfind.cxx
+===================================================================
+RCS file: /cvs/util/svtools/source/numbers/zforfind.cxx,v
+retrieving revision 1.47
+diff -u -p -r1.47 zforfind.cxx
+--- svtools/source/numbers/zforfind.cxx	27 Jun 2007 21:56:34 -0000	1.47
++++ svtools/source/numbers/zforfind.cxx	21 Feb 2008 23:01:27 -0000
+@@ -1120,9 +1120,16 @@ input for the following reasons:
+                         switch (DateFmt)
+                         {
+                             case MDY:
+-                            case YMD:
+-                                pCal->setValue( CalendarFieldIndex::DAY_OF_MONTH, ImplGetDay(0) );
++                            case YMD: {
++                                USHORT nDay = ImplGetDay(0);
++                                USHORT nYear = ImplGetYear(0);
++                                if (nDay == 0 || nDay > 32) {
++                                    pCal->setValue( CalendarFieldIndex::YEAR, nYear);
++                                }
++                                else
++                                    pCal->setValue( CalendarFieldIndex::DAY_OF_MONTH, ImplGetDay(0) );
+                                 break;
++                            }
+                             case DMY:
+                                 pCal->setValue( CalendarFieldIndex::YEAR, ImplGetYear(0) );
+                                 break;
+@@ -1543,6 +1550,13 @@ BOOL ImpSvNumberInputScan::ScanStartStri
+         }
+     }
+ 
++    // skip any trailing '-' or '/' chars
++    if (nPos < rString.Len())
++    {
++        while (SkipChar ('-', rString, nPos) || SkipChar ('/', rString, nPos)) {
++            // do nothing
++        }
++    }
+     if (nPos < rString.Len())                       // not everything consumed
+     {
+         // Does input StartString equal StartString of format?