Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-15 21:36:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 52285 Kill compiler warnings in layout/xul

Browse Source 
patch by mozilla-bugs@nogin.org r=timeless sr=dbaron
This commit is contained in:
timeless%mozdev.org 2002-11-19 05:06:36 +00:00
parent b6b14bf40e
commit 89b152a580
10 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
layout/xul/base/src/grid/nsGrid.cpp
View File

@ -363,7 +363,6 @@ nsGrid::BuildRows(nsIBox* aBox, PRBool aRowCount, nsGridRow** aRows, PRBool aIsH
}
// create the array
PRInt32 count = 0;
nsGridRow* row;
// only create new rows if we have to. Reuse old rows.

1
layout/xul/base/src/grid/nsGridRowLeafFrame.cpp
View File

@ -78,7 +78,6 @@ NS_IMETHODIMP
nsGridRowLeafFrame::GetBorderAndPadding(nsMargin& aBorderAndPadding)
{
// if our columns have made our padding larger add it in.
nsMargin borderPadding(0,0,0,0);
nsresult rv = nsBoxFrame::GetBorderAndPadding(aBorderAndPadding);
nsCOMPtr<nsIBoxLayout> layout;

3
layout/xul/base/src/nsBox.cpp
View File

@ -99,7 +99,7 @@ nsBox::ListBox(nsAutoString& aResult)
GetBoxName(name);
char addr[100];
sprintf(addr, "[@%p] ", frame);
sprintf(addr, "[@%p] ", NS_STATIC_CAST(void*, frame));
aResult.AppendWithConversion(addr);
aResult.Append(name);
@ -664,7 +664,6 @@ nsBox::GetBorder(nsMargin& aMargin)
(const nsStyleStruct*&) disp);
if (disp->mAppearance && gTheme) {
// Go to the theme for the border.
nsSize size;
nsCOMPtr<nsIContent> content;
frame->GetContent(getter_AddRefs(content));
if (content) {

2
layout/xul/base/src/nsBoxToBlockAdaptor.cpp
View File

@ -645,7 +645,7 @@ nsBoxToBlockAdaptor::DoLayout(nsBoxLayoutState& aState)
nsIPresContext* presContext = aState.GetPresContext();
nsReflowStatus status = NS_FRAME_COMPLETE;
nsHTMLReflowMetrics desiredSize(nsnull);
nsresult rv;
nsresult rv = NS_OK;
if (reflowState) {

3
layout/xul/base/src/nsImageBoxFrame.cpp
View File

@ -282,8 +282,7 @@ nsImageBoxFrame::AttributeChanged(nsIPresContext* aPresContext,
Redraw(state);
}
return NS_OK;
return rv;
}
nsImageBoxFrame::nsImageBoxFrame(nsIPresShell* aShell):nsLeafBoxFrame(aShell), mIntrinsicSize(0,0),

2
layout/xul/base/src/nsMenuPopupFrame.cpp
View File

@ -2140,7 +2140,7 @@ nsMenuPopupFrame::AttributeChanged(nsIPresContext* aPresContext,
if (aAttribute == nsXULAtoms::left || aAttribute == nsXULAtoms::top)
MoveToAttributePosition();
return NS_OK;
return rv;
}
void

3
layout/xul/base/src/nsScrollBoxFrame.cpp
View File

@ -628,8 +628,7 @@ nsScrollBoxFrame::Paint(nsIPresContext* aPresContext,
}
// Paint our children
nsresult rv = nsBoxFrame::Paint(aPresContext, aRenderingContext, aDirtyRect,
aWhichLayer);
nsBoxFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);
// Call nsFrame::Paint to draw selection border when appropriate
return nsFrame::Paint(aPresContext, aRenderingContext, aDirtyRect, aWhichLayer);

1
layout/xul/base/src/nsSplitterFrame.cpp
View File

@ -817,7 +817,6 @@ nsSplitterFrameInner::MouseDown(nsIDOMEvent* aMouseEvent)
nsIBox* childBox = nsnull;
mParentBox->GetChildBox(&childBox);
PRBool skip = PR_FALSE;
while (nsnull != childBox)
{
nsIFrame* childFrame = nsnull;

2
layout/xul/base/src/nsStackLayout.cpp
View File

@ -264,8 +264,6 @@ nsStackLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
nsRect clientRect;
aBox->GetClientRect(clientRect);
nsRect childRect;
PRBool grow;
do {

2
layout/xul/base/src/nsXULTooltipListener.cpp
View File

@ -437,8 +437,6 @@ SetTitletipLabel(nsITreeBoxObject* aTreeBox, nsIContent* aTooltip,
nsresult
nsXULTooltipListener::LaunchTooltip(nsIContent* aTarget, PRInt32 aX, PRInt32 aY)
{
nsresult rv = NS_OK;
if (!mCurrentTooltip)
return NS_OK;