From 1c6c74da4a804276a379e0e15b17f90266203745 Mon Sep 17 00:00:00 2001
From: "bmlk%gmx.de" <bmlk%gmx.de>
Date: Sat, 4 Mar 2006 05:32:38 +0000
Subject: [PATCH] Don't create dead cells if the position is outside  the
 cellmap boundaries. bug 328339 r/sr=bz

---
 layout/tables/nsCellMap.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/layout/tables/nsCellMap.cpp b/layout/tables/nsCellMap.cpp
index 3b74b16767bd..95d8d8bb3f92 100644
--- a/layout/tables/nsCellMap.cpp
+++ b/layout/tables/nsCellMap.cpp
@@ -2351,12 +2351,13 @@ nsCellMap::GetDataAt(nsTableCellMap& aMap,
           break;
         }
       }
-    }
-    if (!didZeroExpand) {
-      // mark this point dead
-      CellData* cellData = AllocCellData(nsnull);
-      if (cellData)
-        SetDataAt(aMap, *cellData, aMapRowIndex, aColIndex, PR_FALSE);
+    
+      if (!didZeroExpand) {
+        // mark this point dead as we checked rowspans above
+        CellData* cellData = AllocCellData(nsnull);
+        if (cellData)
+          SetDataAt(aMap, *cellData, aMapRowIndex, aColIndex, PR_FALSE);
+      }
     }
     // if zero span adjustments were made the data may be available now
     if (!data && didZeroExpand) {