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

Fixed bug 5255 and removed some compiler warnings

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@29988 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com 1999-05-03 20:55:12 +00:00
parent ccceae02c3
commit 78b5db7c44
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/layout/generic/nsTextFrame.cpp
View File

@ -261,7 +261,7 @@ public:
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
NS_IMETHOD AdjustFrameSize(nscoord aExtraSpace, nscoord& aUsedSpace);
NS_IMETHOD TrimTrailingWhiteSpace(nsIPresContext& aPresContext,
NS_IMETHOD TrimTrailingWhiteSpace(nsIPresContext* aPresContext,
nsIRenderingContext& aRC,
nscoord& aDeltaWidth);
@ -2339,9 +2339,9 @@ nsTextFrame::Reflow(nsIPresContext& aPresContext,
}
else {
aReflowState.rendContext->GetWidth(bp, wordLen, width);
}
if (ts.mLetterSpacing) {
width += ts.mLetterSpacing * wordLen;
if (ts.mLetterSpacing) {
width += ts.mLetterSpacing * wordLen;
}
}
skipWhitespace = PR_FALSE;
lastWordWidth = width;
@ -2564,7 +2564,7 @@ nsTextFrame::AdjustFrameSize(nscoord aExtraSpace, nscoord& aUsedSpace)
}
NS_IMETHODIMP
nsTextFrame::TrimTrailingWhiteSpace(nsIPresContext& aPresContext,
nsTextFrame::TrimTrailingWhiteSpace(nsIPresContext* aPresContext,
nsIRenderingContext& aRC,
nscoord& aDeltaWidth)
{

10
mozilla/layout/html/base/src/nsTextFrame.cpp
View File

@ -261,7 +261,7 @@ public:
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus);
NS_IMETHOD AdjustFrameSize(nscoord aExtraSpace, nscoord& aUsedSpace);
NS_IMETHOD TrimTrailingWhiteSpace(nsIPresContext& aPresContext,
NS_IMETHOD TrimTrailingWhiteSpace(nsIPresContext* aPresContext,
nsIRenderingContext& aRC,
nscoord& aDeltaWidth);
@ -2339,9 +2339,9 @@ nsTextFrame::Reflow(nsIPresContext& aPresContext,
}
else {
aReflowState.rendContext->GetWidth(bp, wordLen, width);
}
if (ts.mLetterSpacing) {
width += ts.mLetterSpacing * wordLen;
if (ts.mLetterSpacing) {
width += ts.mLetterSpacing * wordLen;
}
}
skipWhitespace = PR_FALSE;
lastWordWidth = width;
@ -2564,7 +2564,7 @@ nsTextFrame::AdjustFrameSize(nscoord aExtraSpace, nscoord& aUsedSpace)
}
NS_IMETHODIMP
nsTextFrame::TrimTrailingWhiteSpace(nsIPresContext& aPresContext,
nsTextFrame::TrimTrailingWhiteSpace(nsIPresContext* aPresContext,
nsIRenderingContext& aRC,
nscoord& aDeltaWidth)
{