ooo-build r13753 - in branches/ooo-build-2-4-1: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Sep  2 02:20:51 2008
New Revision: 13753
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13753&view=rev

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

	* patches/dev300/sc-skip-overlapped-cells.diff: check the validity of 
	the row number before calling HasAttrib to check for an overlapped
	state of a cell.  Not doing so may cause Calc to hang.


Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/sc-skip-overlapped-cells.diff

Modified: branches/ooo-build-2-4-1/patches/src680/sc-skip-overlapped-cells.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/sc-skip-overlapped-cells.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/sc-skip-overlapped-cells.diff	Tue Sep  2 02:20:51 2008
@@ -17,8 +17,8 @@
  		BOOL bUp = ( nMovY < 0 );
  		nRow = rMark.GetNextMarked( nCol, nRow, bUp );
 -		while ( VALIDROW(nRow) && pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN) )
-+        while ( (VALIDROW(nRow) && pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
-+                pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED) )
++        while ( VALIDROW(nRow) && ((pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
++                pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
  		{
  			//	#53697# ausgeblendete ueberspringen (s.o.)
  			nRow += nMovY;
@@ -27,8 +27,8 @@
  				nRow = 0;
  			nRow = rMark.GetNextMarked( nCol, nRow, bUp );
 -			while ( VALIDROW(nRow) && pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN) )
-+            while ( (VALIDROW(nRow) && pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
-+                    pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED) )
++            while ( VALIDROW(nRow) && ((pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
++                    pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
  			{
  				//	#53697# ausgeblendete ueberspringen (s.o.)
  				nRow += nMovY;