Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix mac breakage, hopefully

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@41460 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
karnaze%netscape.com
1999-07-28 09:13:44 +00:00
parent d9f0756d1e
commit 53bf90aac1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp
View File

@@ -585,7 +585,7 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths(nscoord aMaxWidth
spanTotal -= spanCellSpacing;
nscoord cellWidth = cellWidths[widthX] - spanCellSpacing;
if ((cellWidth > 0) && !((widthX == MIN_CON) && (cellWidth <= spanTotal))) {
for (spanX = 0; spanX < colSpan; spanX++) {
for (PRInt32 spanX = 0; spanX < colSpan; spanX++) {
nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX + spanX);
nscoord colWidth = colFrame->GetWidth(widthX);
nscoord minWidth = colFrame->GetMinWidth();
@@ -859,7 +859,7 @@ nscoord BasicTableLayoutStrategy::AssignPercentageColumnWidths(nscoord aBasisIn,
}
if (colPctWidthTotal < cellPctWidth) {
// record the percent contributions for the spanned cols
for (spanX = 0; spanX < colSpan; spanX++) {
for (PRInt32 spanX = 0; spanX < colSpan; spanX++) {
nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX + spanX);
if (colFrame->GetWidth(PCT) > 0) { // skip pct cols
continue;

4
mozilla/layout/tables/BasicTableLayoutStrategy.cpp
View File

@@ -585,7 +585,7 @@ PRBool BasicTableLayoutStrategy::AssignPreliminaryColumnWidths(nscoord aMaxWidth
spanTotal -= spanCellSpacing;
nscoord cellWidth = cellWidths[widthX] - spanCellSpacing;
if ((cellWidth > 0) && !((widthX == MIN_CON) && (cellWidth <= spanTotal))) {
for (spanX = 0; spanX < colSpan; spanX++) {
for (PRInt32 spanX = 0; spanX < colSpan; spanX++) {
nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX + spanX);
nscoord colWidth = colFrame->GetWidth(widthX);
nscoord minWidth = colFrame->GetMinWidth();
@@ -859,7 +859,7 @@ nscoord BasicTableLayoutStrategy::AssignPercentageColumnWidths(nscoord aBasisIn,
}
if (colPctWidthTotal < cellPctWidth) {
// record the percent contributions for the spanned cols
for (spanX = 0; spanX < colSpan; spanX++) {
for (PRInt32 spanX = 0; spanX < colSpan; spanX++) {
nsTableColFrame* colFrame = mTableFrame->GetColFrame(colX + spanX);
if (colFrame->GetWidth(PCT) > 0) { // skip pct cols
continue;