Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 14:52:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 25148, AppendCell grows its rows before figuring the starting col index, r=attinasi

Browse Source
This commit is contained in:
karnaze%netscape.com 2000-02-02 01:56:46 +00:00
parent 49dee0901a
commit 077215e7b4
2 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
layout/html/table/src/nsCellMap.cpp
View File

@ -687,23 +687,24 @@ nsCellMap::AppendCell(nsTableCellMap& aMap,
{
PRInt32 origNumMapRows = mRows.Count();
PRInt32 origNumCols = aMap.GetColCount();
PRBool zeroRowSpan;
PRInt32 rowSpan = GetRowSpanForNewCell(aCellFrame, aRowIndex, zeroRowSpan);
// add new rows if necessary
PRInt32 endRowIndex = aRowIndex + rowSpan - 1;
if (endRowIndex >= origNumMapRows) {
Grow(aMap, 1 + endRowIndex - origNumMapRows);
}
// get the first null CellData in the desired row. It may be 1 past the end if there are none
PRInt32 startColIndex;
if (aRowIndex < origNumMapRows) {
for (startColIndex = 0; startColIndex < origNumCols; startColIndex++) {
CellData* data = GetMapCellAt(aMap, aRowIndex, startColIndex, PR_TRUE);
if (!data) {
break; // we found the col
}
}
}
else {
startColIndex = 0;
}
PRBool zeroRowSpan, zeroColSpan;
PRInt32 rowSpan = GetRowSpanForNewCell(aCellFrame, aRowIndex, zeroRowSpan);
PRBool zeroColSpan;
PRInt32 colSpan = GetColSpanForNewCell(aCellFrame, startColIndex, origNumCols, zeroColSpan);
// if the new cell could potentially span into other rows and collide with
@ -717,11 +718,6 @@ nsCellMap::AppendCell(nsTableCellMap& aMap,
mRowCount = PR_MAX(mRowCount, aRowIndex + 1);
// add new rows if necessary
PRInt32 endRowIndex = aRowIndex + rowSpan - 1;
if (endRowIndex >= origNumMapRows) {
Grow(aMap, 1 + endRowIndex - origNumMapRows);
}
// add new cols to the table map if necessary
PRInt32 endColIndex = startColIndex + colSpan - 1;
if (endColIndex >= origNumCols) {

20
layout/tables/nsCellMap.cpp
View File

@ -687,23 +687,24 @@ nsCellMap::AppendCell(nsTableCellMap& aMap,
{
PRInt32 origNumMapRows = mRows.Count();
PRInt32 origNumCols = aMap.GetColCount();
PRBool zeroRowSpan;
PRInt32 rowSpan = GetRowSpanForNewCell(aCellFrame, aRowIndex, zeroRowSpan);
// add new rows if necessary
PRInt32 endRowIndex = aRowIndex + rowSpan - 1;
if (endRowIndex >= origNumMapRows) {
Grow(aMap, 1 + endRowIndex - origNumMapRows);
}
// get the first null CellData in the desired row. It may be 1 past the end if there are none
PRInt32 startColIndex;
if (aRowIndex < origNumMapRows) {
for (startColIndex = 0; startColIndex < origNumCols; startColIndex++) {
CellData* data = GetMapCellAt(aMap, aRowIndex, startColIndex, PR_TRUE);
if (!data) {
break; // we found the col
}
}
}
else {
startColIndex = 0;
}
PRBool zeroRowSpan, zeroColSpan;
PRInt32 rowSpan = GetRowSpanForNewCell(aCellFrame, aRowIndex, zeroRowSpan);
PRBool zeroColSpan;
PRInt32 colSpan = GetColSpanForNewCell(aCellFrame, startColIndex, origNumCols, zeroColSpan);
// if the new cell could potentially span into other rows and collide with
@ -717,11 +718,6 @@ nsCellMap::AppendCell(nsTableCellMap& aMap,
mRowCount = PR_MAX(mRowCount, aRowIndex + 1);
// add new rows if necessary
PRInt32 endRowIndex = aRowIndex + rowSpan - 1;
if (endRowIndex >= origNumMapRows) {
Grow(aMap, 1 + endRowIndex - origNumMapRows);
}
// add new cols to the table map if necessary
PRInt32 endColIndex = startColIndex + colSpan - 1;
if (endColIndex >= origNumCols) {