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

bug 2479 - deleting cols and/or colgroups caused incorrect reseting of col group starting index.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@65138 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
karnaze%netscape.com
2000-04-04 04:28:18 +00:00
parent dc3792fdd2
commit 67b057b4e1
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/layout/html/table/src/nsTableColGroupFrame.cpp
View File

@@ -67,26 +67,29 @@ void nsTableColGroupFrame::ResetColIndices(nsIPresContext* aPresContext,
nsTableColGroupFrame* colGroupFrame = (nsTableColGroupFrame*)aFirstColGroup;
PRInt32 colIndex = aFirstColIndex;
while (colGroupFrame) {
nsIAtom* cgType;
colGroupFrame->GetFrameType(&cgType);
if (nsLayoutAtoms::tableColGroupFrame == cgType) {
colGroupFrame->SetStartColumnIndex(colIndex);
nsCOMPtr<nsIAtom> cgType;
colGroupFrame->GetFrameType(getter_AddRefs(cgType));
if (nsLayoutAtoms::tableColGroupFrame == cgType.get()) {
// reset the starting col index for the first cg only if
// aFirstColIndex is smaller than the existing starting col index
if ((colIndex != aFirstColIndex) ||
(colIndex < colGroupFrame->GetStartColumnIndex())) {
colGroupFrame->SetStartColumnIndex(colIndex);
}
nsIFrame* colFrame = aStartColFrame;
if (!colFrame || (colIndex != aFirstColIndex)) {
colGroupFrame->FirstChild(aPresContext, nsnull, &colFrame);
}
while (colFrame) {
nsIAtom* colType;
colFrame->GetFrameType(&colType);
if (nsLayoutAtoms::tableColFrame == colType) {
nsCOMPtr<nsIAtom> colType;
colFrame->GetFrameType(getter_AddRefs(colType));
if (nsLayoutAtoms::tableColFrame == colType.get()) {
((nsTableColFrame*)colFrame)->SetColIndex(colIndex);
colIndex++;
}
NS_IF_RELEASE(colType);
colFrame->GetNextSibling(&colFrame);
}
}
NS_IF_RELEASE(cgType);
colGroupFrame->GetNextSibling((nsIFrame**)&colGroupFrame);
}
}