mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 21:05:36 +00:00
fixed minColSpan to always be at least one. This helps support empty rows,
among other problems.
This commit is contained in:
parent
4c27334e38
commit
5be0373ab2
@ -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)
|
||||
|
@ -772,7 +772,7 @@ void nsTableFrame::SetMinColSpanForTable()
|
||||
minColSpan = PR_MIN(minColSpan, colSpan);
|
||||
}
|
||||
}
|
||||
if (1!=minColSpan)
|
||||
if (1<minColSpan)
|
||||
mCellMap->SetMinColSpan(colIndex, minColSpan);
|
||||
}
|
||||
}
|
||||
|
@ -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)
|
||||
|
@ -772,7 +772,7 @@ void nsTableFrame::SetMinColSpanForTable()
|
||||
minColSpan = PR_MIN(minColSpan, colSpan);
|
||||
}
|
||||
}
|
||||
if (1!=minColSpan)
|
||||
if (1<minColSpan)
|
||||
mCellMap->SetMinColSpan(colIndex, minColSpan);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user