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

Changed nsIFrame member functions to return a nsresult

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@346 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy
1998-04-17 01:41:24 +00:00
parent 318aac7f83
commit fd68898ebd
100 changed files with 4538 additions and 2991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/layout/html/table/src/nsCellLayoutData.cpp
View File

@@ -83,8 +83,11 @@ void nsCellLayoutData::SetMaxElementSize(nsSize * aMaxElementSize)
**/
nsStyleMolecule* nsCellLayoutData::GetStyleMolecule()
{
if (mCellFrame != nsnull)
return (nsStyleMolecule*)mCellFrame->GetStyleData(kStyleMoleculeSID);
if (mCellFrame != nsnull) {
nsStyleMolecule* styleMol;
mCellFrame->GetStyleData(kStyleMoleculeSID, (nsStyleStruct*&)styleMol);
return styleMol;
}
return nsnull;
}
@@ -398,8 +401,11 @@ nsStyleMolecule* nsCellLayoutData::FindOuterBorder( nsTableFrame* aTableFrame,
// for the parent frame is also zero
if (margin == 0)
{
nsIFrame* parentFrame = aFrame->GetGeometricParent();
nsStyleMolecule* parentStyle = (nsStyleMolecule*)aFrame->GetStyleData(kStyleMoleculeSID);
nsIFrame* parentFrame;
nsStyleMolecule* parentStyle;
aFrame->GetGeometricParent(parentFrame);
aFrame->GetStyleData(kStyleMoleculeSID, (nsStyleStruct*&)parentStyle);
// if the padding for the parent style is zero just
// recursively call this routine
@@ -547,7 +553,9 @@ void nsCellLayoutData::RecalcLayoutData(nsTableFrame* aTableFrame,
nsVoidArray* aBoundaryCells[4])
{
nsStyleMolecule* cellStyle = (nsStyleMolecule*)mCellFrame->GetStyleData(kStyleMoleculeSID);
nsStyleMolecule* cellStyle;
mCellFrame->GetStyleData(kStyleMoleculeSID, (nsStyleStruct*&)cellStyle);
CalculateBorders(aTableFrame,cellStyle,aBoundaryCells);
CalculateMargins(aTableFrame,cellStyle,aBoundaryCells);
@@ -558,7 +566,9 @@ void nsCellLayoutData::List(FILE* out, PRInt32 aIndent) const
{
PRInt32 indent;
nsTableCell* cell = (nsTableCell*)mCellFrame->GetContent();
nsTableCell* cell;
mCellFrame->GetContent((nsIContent*&)cell);
if (cell != nsnull)
{
for (indent = aIndent; --indent >= 0; ) fputs(" ", out);