From fe3df1c0f5ca10e8aaebef13efc7f79e321c31b8 Mon Sep 17 00:00:00 2001
From: "cmanske%netscape.com"
 <cmanske%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 22 Aug 2007 04:52:55 +0000
Subject: [PATCH] Table editing (bug 20973): added support for
 rowspan/colspan=0, Rewrote Spelling Dictionary dialog (bug 24264), removed
 beep from forceInteger filter, r=akkana

git-svn-id: svn://10.0.0.236/trunk@232499 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../debugQA/content/debugQAEditorOverlay.js   | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/mozilla/suite/debugQA/content/debugQAEditorOverlay.js b/mozilla/suite/debugQA/content/debugQAEditorOverlay.js
index 8616e7d14bd..fd34ee41f6c 100644
--- a/mozilla/suite/debugQA/content/debugQAEditorOverlay.js
+++ b/mozilla/suite/debugQA/content/debugQAEditorOverlay.js
@@ -118,11 +118,15 @@ function EditorTestTableLayout()
   var startColIndexObj = new Object();
   var rowSpanObj = new Object();
   var colSpanObj = new Object();
+  var actualRowSpanObj = new Object();
+  var actualColSpanObj = new Object();
   var isSelectedObj = new Object();
   var startRowIndex = 0;
   var startColIndex = 0;
   var rowSpan;
   var colSpan;
+  var actualRowSpan;
+  var actualColSpan;
   var isSelected;
   var col = 0;
   var row = 0;
@@ -138,19 +142,24 @@ function EditorTestTableLayout()
 
   while (!doneWithRow)  // Iterate through rows
   {  
+    dump("* Data for ROW="+row+":\n");
     while(!doneWithCol)  // Iterate through cells in the row
     {
       try {
         cell = editorShell.GetCellDataAt(table, row, col, startRowIndexObj, startColIndexObj,
-                                         rowSpanObj, colSpanObj, isSelectedObj);
+                                         rowSpanObj, colSpanObj, actualRowSpanObj, actualColSpanObj, 
+                                         isSelectedObj);
 
         if (cell)
         {
           rowSpan = rowSpanObj.value;
           colSpan = colSpanObj.value;
+          actualRowSpan = actualRowSpanObj.value;
+          actualColSpan = actualColSpanObj.value;
           isSelected = isSelectedObj.value;
           
-          dump("Row,Col: "+row+","+col+" StartRow,StartCol: "+startRowIndexObj.value+","+startColIndexObj.value+" RowSpan="+rowSpan+" ColSpan="+colSpan);
+          dump(" Row="+row+", Col="+col+"  StartRow="+startRowIndexObj.value+", StartCol="+startColIndexObj.value+"\n");
+          dump("  RowSpan="+rowSpan+", ColSpan="+colSpan+"  ActualRowSpan="+actualRowSpan+", ActualColSpan="+actualColSpan);
           if (isSelected)
             dump("  Cell is selected\n");
           else
@@ -172,12 +181,12 @@ function EditorTestTableLayout()
           // Get maximum number of cells in any row
           if (col > maxColCount)
             maxColCount = col;
-          dump(" End of row found\n\n");
+          dump("  End of row found\n\n");
         }
       }
       catch (e) {
-        dump("  *** GetCellDataAt barfed at Row,Col:"+row+","+col+" ***\n\n");
-        col++;
+        dump("  *** GetCellDataAt failed at Row="+row+, Col="+col+" ***\n\n");
+        return;
       }
     }
     if (col == 0) {
@@ -191,7 +200,6 @@ function EditorTestTableLayout()
       col = 0;
       row++;
       doneWithCol = false;
-      dump("Setup for next row\n");
     }      
   }
   dump("Counted during scan: Number of rows="+rowCount+" Number of Columns="+maxColCount+"\n");