diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.cpp b/mozilla/layout/html/table/src/nsTableCellFrame.cpp
index 8972716c2aa..1afef9e0cbd 100644
--- a/mozilla/layout/html/table/src/nsTableCellFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableCellFrame.cpp
@@ -1031,7 +1031,7 @@ void nsTableCellFrame::RecalcLayoutData(nsTableFrame* aTableFrame,
 }
 
 #if 0       //QQQ
-void nsTableCellFrame::List(FILE* out, PRInt32 aIndent) const
+void nsTableCellFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
 {
   PRInt32 indent;
 
diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.cpp b/mozilla/layout/html/table/src/nsTableRowFrame.cpp
index 7ba1f2d7680..6df4f2c956b 100644
--- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableRowFrame.cpp
@@ -516,6 +516,11 @@ nsTableRowFrame::InitialReflow(nsIPresContext&  aPresContext,
   PRBool    isFirst=PR_TRUE;
 
   for (;;) {
+    // what row am I?
+    // to handle rows with no cells, this block must be done before the "Get the next content object" block
+    if (PR_TRUE==isFirst)
+      SetRowIndex(aState.tableFrame->GetNextAvailRowIndex());
+
     // Get the next content object
     nsIContent* cell;
     mContent->ChildAt(kidIndex, cell);
@@ -523,10 +528,6 @@ nsTableRowFrame::InitialReflow(nsIPresContext&  aPresContext,
       break;  // no more content
     }
 
-    // what row am I?
-    if (PR_TRUE==isFirst)
-      SetRowIndex(aState.tableFrame->GetNextAvailRowIndex());
-
     // what column does this cell belong to?
     colIndex = aState.tableFrame->GetNextAvailColIndex(mRowIndex, colIndex);
     if (gsDebug) printf("%p : next col index = %d\n", this, colIndex);
diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp
index 8972716c2aa..1afef9e0cbd 100644
--- a/mozilla/layout/tables/nsTableCellFrame.cpp
+++ b/mozilla/layout/tables/nsTableCellFrame.cpp
@@ -1031,7 +1031,7 @@ void nsTableCellFrame::RecalcLayoutData(nsTableFrame* aTableFrame,
 }
 
 #if 0       //QQQ
-void nsTableCellFrame::List(FILE* out, PRInt32 aIndent) const
+void nsTableCellFrame::List(FILE* out, PRInt32 aIndent, nsIListFilter *aFilter) const
 {
   PRInt32 indent;
 
diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp
index 7ba1f2d7680..6df4f2c956b 100644
--- a/mozilla/layout/tables/nsTableRowFrame.cpp
+++ b/mozilla/layout/tables/nsTableRowFrame.cpp
@@ -516,6 +516,11 @@ nsTableRowFrame::InitialReflow(nsIPresContext&  aPresContext,
   PRBool    isFirst=PR_TRUE;
 
   for (;;) {
+    // what row am I?
+    // to handle rows with no cells, this block must be done before the "Get the next content object" block
+    if (PR_TRUE==isFirst)
+      SetRowIndex(aState.tableFrame->GetNextAvailRowIndex());
+
     // Get the next content object
     nsIContent* cell;
     mContent->ChildAt(kidIndex, cell);
@@ -523,10 +528,6 @@ nsTableRowFrame::InitialReflow(nsIPresContext&  aPresContext,
       break;  // no more content
     }
 
-    // what row am I?
-    if (PR_TRUE==isFirst)
-      SetRowIndex(aState.tableFrame->GetNextAvailRowIndex());
-
     // what column does this cell belong to?
     colIndex = aState.tableFrame->GetNextAvailColIndex(mRowIndex, colIndex);
     if (gsDebug) printf("%p : next col index = %d\n", this, colIndex);