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

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Feb 23 21:01:12 2009
New Revision: 15401
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15401&view=rev

Log:
2009-02-23  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-autofill-increment-fix.diff: fixed a case where 
	autofill failed to increment "1 foo". (i#5550)


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/calc-autofill-increment-fix.diff

Modified: trunk/patches/dev300/calc-autofill-increment-fix.diff
==============================================================================
--- trunk/patches/dev300/calc-autofill-increment-fix.diff	(original)
+++ trunk/patches/dev300/calc-autofill-increment-fix.diff	Mon Feb 23 21:01:12 2009
@@ -1,8 +1,8 @@
 diff --git sc/source/core/data/table4.cxx sc/source/core/data/table4.cxx
-index 07ede6d..5d23780 100644
+index 2d43cbe..9ca13d2 100644
 --- sc/source/core/data/table4.cxx
 +++ sc/source/core/data/table4.cxx
-@@ -93,48 +93,70 @@ extern USHORT nScFillModeMouseModifier;		// global.cxx
+@@ -94,48 +94,74 @@ extern USHORT nScFillModeMouseModifier;		// global.cxx
  
  short lcl_DecompValueString( String& aValue, sal_Int32& nVal, USHORT* pMinDigits = NULL )
  {
@@ -53,6 +53,7 @@
 +    xub_StrLen nSign = (p[0] == '+' || p[0] == '-') ? 1 : 0;
 +    xub_StrLen nDot = nLen, nFirst = nLen;
 +    String aBuf;
++    bool bLeadingNum = true;
 +    for (xub_StrLen i = nSign; i < nLen; ++i)
 +    {
 +        sal_Unicode c = p[i];
@@ -62,9 +63,12 @@
 +            continue;
 +        }
 +        else
-+            aBuf.Erase();
-+
-+        // numerical sequence ended.
++        {
++            if (bLeadingNum)
++                bLeadingNum = false;
++            else
++                aBuf.Erase();
++        }
 +
 +        if (nFirst == nLen)
 +            nFirst = i;