ooo-build r14520 - in branches/ooo-build-3-0: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Nov 17 21:25:46 2008
New Revision: 14520
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14520&view=rev

Log:
2008-11-17  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-autofill-increment-fix.diff: fixed a regression
	where leading non-numeric letter sequence is incorrectly interpreted as
	leading number sequence (n#439441).


Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/calc-autofill-increment-fix.diff

Modified: branches/ooo-build-3-0/patches/dev300/calc-autofill-increment-fix.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/calc-autofill-increment-fix.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/calc-autofill-increment-fix.diff	Mon Nov 17 21:25:46 2008
@@ -1,8 +1,8 @@
 diff --git sc/source/core/data/table4.cxx sc/source/core/data/table4.cxx
-index 5dabb8e..e36b4f8 100644
+index 07ede6d..5d23780 100644
 --- sc/source/core/data/table4.cxx
 +++ sc/source/core/data/table4.cxx
-@@ -93,48 +93,68 @@ extern USHORT nScFillModeMouseModifier;		// global.cxx
+@@ -93,48 +93,70 @@ extern USHORT nScFillModeMouseModifier;		// global.cxx
  
  short lcl_DecompValueString( String& aValue, sal_Int32& nVal, USHORT* pMinDigits = NULL )
  {
@@ -61,6 +61,8 @@
 +            aBuf.Append(c);
 +            continue;
 +        }
++        else
++            aBuf.Erase();
 +
 +        // numerical sequence ended.
 +
@@ -79,8 +81,8 @@
 +            // leading number
 +            if (nDot < nLen)
 +            {
-+                // If a dot has been previously encounted, then use the first
-+                // numerical segment.
++                // If a dot has been previously encountered, then use the
++                // first numerical segment.
 +                i = nFirst;
 +                aBuf = aValue.Copy(0, nFirst);
 +            }