From acbcec3004716b000e07188d54b4dd61549887af Mon Sep 17 00:00:00 2001
From: "buster%netscape.com"
 <buster%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 3 Sep 1998 06:15:18 +0000
Subject: [PATCH] fixed minColSpan to always be at least one.  This helps
 support empty rows, among other problems.

git-svn-id: svn://10.0.0.236/trunk@9206 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/html/table/src/nsCellMap.cpp    | 2 +-
 mozilla/layout/html/table/src/nsTableFrame.cpp | 2 +-
 mozilla/layout/tables/nsCellMap.cpp            | 2 +-
 mozilla/layout/tables/nsTableFrame.cpp         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mozilla/layout/html/table/src/nsCellMap.cpp b/mozilla/layout/html/table/src/nsCellMap.cpp
index 99a7b3ca372..f782abc281f 100644
--- a/mozilla/layout/html/table/src/nsCellMap.cpp
+++ b/mozilla/layout/html/table/src/nsCellMap.cpp
@@ -173,7 +173,7 @@ nsTableColFrame* nsCellMap::GetColumnFrame(PRInt32 aColIndex) const
 void nsCellMap::SetMinColSpan(PRInt32 aColIndex, PRBool aColSpan)
 {
   NS_ASSERTION(aColIndex<mColCount, "bad aColIndex");
-  NS_ASSERTION(aColSpan>=0, "bad aColSpan");
+  NS_ASSERTION(aColSpan>=1, "bad aColSpan");
 
   // initialize the data structure if not already done
   if (nsnull==mMinColSpans)
diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp
index 1088d407c70..79231610418 100644
--- a/mozilla/layout/html/table/src/nsTableFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableFrame.cpp
@@ -772,7 +772,7 @@ void nsTableFrame::SetMinColSpanForTable()
           minColSpan = PR_MIN(minColSpan, colSpan);
       }
     }
-    if (1!=minColSpan)
+    if (1<minColSpan)
       mCellMap->SetMinColSpan(colIndex, minColSpan);
   }
 }
diff --git a/mozilla/layout/tables/nsCellMap.cpp b/mozilla/layout/tables/nsCellMap.cpp
index 99a7b3ca372..f782abc281f 100644
--- a/mozilla/layout/tables/nsCellMap.cpp
+++ b/mozilla/layout/tables/nsCellMap.cpp
@@ -173,7 +173,7 @@ nsTableColFrame* nsCellMap::GetColumnFrame(PRInt32 aColIndex) const
 void nsCellMap::SetMinColSpan(PRInt32 aColIndex, PRBool aColSpan)
 {
   NS_ASSERTION(aColIndex<mColCount, "bad aColIndex");
-  NS_ASSERTION(aColSpan>=0, "bad aColSpan");
+  NS_ASSERTION(aColSpan>=1, "bad aColSpan");
 
   // initialize the data structure if not already done
   if (nsnull==mMinColSpans)
diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp
index 1088d407c70..79231610418 100644
--- a/mozilla/layout/tables/nsTableFrame.cpp
+++ b/mozilla/layout/tables/nsTableFrame.cpp
@@ -772,7 +772,7 @@ void nsTableFrame::SetMinColSpanForTable()
           minColSpan = PR_MIN(minColSpan, colSpan);
       }
     }
-    if (1!=minColSpan)
+    if (1<minColSpan)
       mCellMap->SetMinColSpan(colIndex, minColSpan);
   }
 }