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=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 (1SetMinColSpan(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=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 (1SetMinColSpan(colIndex, minColSpan);
}
}