diff --git a/layout/html/table/src/nsCellMap.cpp b/layout/html/table/src/nsCellMap.cpp index 99a7b3ca372c..f782abc281f3 100644 --- a/layout/html/table/src/nsCellMap.cpp +++ b/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/layout/html/table/src/nsTableFrame.cpp b/layout/html/table/src/nsTableFrame.cpp index 1088d407c70b..79231610418f 100644 --- a/layout/html/table/src/nsTableFrame.cpp +++ b/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/layout/tables/nsCellMap.cpp b/layout/tables/nsCellMap.cpp index 99a7b3ca372c..f782abc281f3 100644 --- a/layout/tables/nsCellMap.cpp +++ b/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/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp index 1088d407c70b..79231610418f 100644 --- a/layout/tables/nsTableFrame.cpp +++ b/layout/tables/nsTableFrame.cpp @@ -772,7 +772,7 @@ void nsTableFrame::SetMinColSpanForTable() minColSpan = PR_MIN(minColSpan, colSpan); } } - if (1!=minColSpan) + if (1SetMinColSpan(colIndex, minColSpan); } }