From ea71168fd7e7c5a07c7c35f52461043eb3d3680a Mon Sep 17 00:00:00 2001 From: "karnaze%netscape.com" Date: Thu, 16 Dec 1999 06:29:50 +0000 Subject: [PATCH] bug 21143/21765, collapsed rows/cols not displayng when expanded. git-svn-id: svn://10.0.0.236/trunk@56084 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/table/src/nsTableFrame.cpp | 3 +++ mozilla/layout/tables/nsTableFrame.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp index df140c11dae..8fbe06bf88c 100644 --- a/mozilla/layout/html/table/src/nsTableFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableFrame.cpp @@ -2027,6 +2027,9 @@ NS_METHOD nsTableFrame::AdjustForCollapsingCols(nsIPresContext* aPresContext, if (cellData) { cellFrame = cellData->mOrigCell; if (cellFrame) { // the cell originates at (rowX, colX) + // reset the collapse offsets since they may have been collapsed previously + cellFrame->SetCollapseOffsetX(aPresContext, 0); + cellFrame->SetCollapseOffsetY(aPresContext, 0); cellFrame->GetRect(cellRect); if (collapseGroup || collapseCol) { if (lastCell != cellFrame) { // do it only once if there is a row span diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp index df140c11dae..8fbe06bf88c 100644 --- a/mozilla/layout/tables/nsTableFrame.cpp +++ b/mozilla/layout/tables/nsTableFrame.cpp @@ -2027,6 +2027,9 @@ NS_METHOD nsTableFrame::AdjustForCollapsingCols(nsIPresContext* aPresContext, if (cellData) { cellFrame = cellData->mOrigCell; if (cellFrame) { // the cell originates at (rowX, colX) + // reset the collapse offsets since they may have been collapsed previously + cellFrame->SetCollapseOffsetX(aPresContext, 0); + cellFrame->SetCollapseOffsetY(aPresContext, 0); cellFrame->GetRect(cellRect); if (collapseGroup || collapseCol) { if (lastCell != cellFrame) { // do it only once if there is a row span