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

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Jan  7 20:00:06 2008
New Revision: 11213
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11213&view=rev

Log:
2008-01-07  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/sc-openformula-sumif.diff: MAXCOLCOUNT-1 -> MAXCOL for
	the sake of clean-looking code.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/sc-openformula-sumif.diff

Modified: trunk/patches/src680/sc-openformula-sumif.diff
==============================================================================
--- trunk/patches/src680/sc-openformula-sumif.diff	(original)
+++ trunk/patches/src680/sc-openformula-sumif.diff	Mon Jan  7 20:00:06 2008
@@ -4,7 +4,7 @@
 retrieving revision 1.53
 diff -u -r1.53 interpr1.cxx
 --- sc/source/core/tool/interpr1.cxx	1 Nov 2007 16:23:17 -0000	1.53
-+++ sc/source/core/tool/interpr1.cxx	7 Jan 2008 18:39:18 -0000
++++ sc/source/core/tool/interpr1.cxx	7 Jan 2008 19:58:56 -0000
 @@ -4165,31 +4165,34 @@
          SCCOL nCol3 = 0;
          SCROW nRow3 = 0;
@@ -52,7 +52,7 @@
  		}
  		String rString;
          double fVal = 0.0;
-@@ -4273,21 +4276,33 @@
+@@ -4273,20 +4276,31 @@
  			SetIllegalParameter();
  			return;
  		}
@@ -65,15 +65,15 @@
 +
 +            SCCOL nColDelta = nCol2 - nCol1;
 +            SCROW nRowDelta = nRow2 - nRow1;
-+            if (nCol3 + nColDelta >= MAXCOLCOUNT)
++            if (nCol3 + nColDelta > MAXCOL)
 +            {
-+                SCCOL nNewDelta = MAXCOLCOUNT - 1 - nCol3;
++                SCCOL nNewDelta = MAXCOL - nCol3;
 +                nCol2 = nCol1 + nNewDelta;
 +            }
 +
-+            if (nRow3 + nRowDelta >= MAXROWCOUNT)
++            if (nRow3 + nRowDelta >= MAXROW)
 +            {
-+                SCROW nNewDelta = MAXROWCOUNT - 1 - nRow3;
++                SCROW nNewDelta = MAXROW - nRow3;
 +                nRow2 = nRow1 + nNewDelta;
 +            }
 +        }
@@ -92,7 +92,5 @@
 -			SetIllegalParameter();
 -			return;
  		}
-+
  		if (nGlobalError == 0)
  		{
- 			ScQueryParam rParam;