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

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Feb 20 21:01:33 2009
New Revision: 15391
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15391&view=rev

Log:
2009-02-20  Patrick Luby  <pluby newoffice org>

	* patches/dev300/sc-copy-on-merged-cells.diff: fixed an incorrect data 
	type to prevent infinite loop. (n#478309)


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/sc-copy-on-merged-cells.diff

Modified: trunk/patches/dev300/sc-copy-on-merged-cells.diff
==============================================================================
--- trunk/patches/dev300/sc-copy-on-merged-cells.diff	(original)
+++ trunk/patches/dev300/sc-copy-on-merged-cells.diff	Fri Feb 20 21:01:33 2009
@@ -25,7 +25,7 @@
 +			ScRange destRange( nStartCol, nStartRow, nStartTab, nUndoEndCol, nUndoEndRow, nEndTab );
 +		    rDocFunc.UnmergeCells(destRange, bRecord, TRUE);
 +			for (SCCOL i = nStartCol; i <= nUndoEndCol; i++)
-+				for (SCCOL j = nStartRow; j <= nUndoEndRow; j++) 
++				for (SCROW j = nStartRow; j <= nUndoEndRow; j++) 
 +					{
 +						ScRange rrRange (i, j, nEndTab);
 +						pDoc->ExtendOverlapped(rrRange);