From 9845cab80373a95906c5b96ed3195d26a1f2baf4 Mon Sep 17 00:00:00 2001
From: "bmlk%gmx.de" <bmlk%gmx.de>
Date: Sun, 18 Feb 2007 18:50:39 +0000
Subject: [PATCH] fix oversight with zero rowspan handling bug 370808 
 r/sr=bzbarsky

---
 layout/tables/nsCellMap.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/layout/tables/nsCellMap.cpp b/layout/tables/nsCellMap.cpp
index 06efe8d24fab..cc3a6eafa366 100644
--- a/layout/tables/nsCellMap.cpp
+++ b/layout/tables/nsCellMap.cpp
@@ -2807,7 +2807,13 @@ nsCellMapColumnIterator::GetNextFrame(PRInt32* aRow, PRInt32* aColSpan)
       PRInt32 rowspanOffset = cellData->GetRowSpanOffset();
       nsTableCellFrame* cellFrame = mCurMap->GetCellFrame(mCurMapRow, mCol, *cellData, PR_FALSE); 
       NS_ASSERTION(cellFrame,"Must have usable originating data here");  
-      IncrementRow(cellFrame->GetRowSpan() - rowspanOffset);
+      PRInt32 rowSpan = cellFrame->GetRowSpan();
+      if (rowSpan == 0) {
+        AdvanceRowGroup();
+      }
+      else {
+        IncrementRow(rowSpan - rowspanOffset);
+      }
       continue;
     }