From 89b152a580a566c3107db5e1eb2108396a9e1408 Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Tue, 19 Nov 2002 05:06:36 +0000 Subject: [PATCH] Bug 52285 Kill compiler warnings in layout/xul patch by mozilla-bugs@nogin.org r=timeless sr=dbaron --- layout/xul/base/src/grid/nsGrid.cpp | 1 - layout/xul/base/src/grid/nsGridRowLeafFrame.cpp | 1 - layout/xul/base/src/nsBox.cpp | 3 +-- layout/xul/base/src/nsBoxToBlockAdaptor.cpp | 2 +- layout/xul/base/src/nsImageBoxFrame.cpp | 3 +-- layout/xul/base/src/nsMenuPopupFrame.cpp | 2 +- layout/xul/base/src/nsScrollBoxFrame.cpp | 3 +-- layout/xul/base/src/nsSplitterFrame.cpp | 1 - layout/xul/base/src/nsStackLayout.cpp | 2 -- layout/xul/base/src/nsXULTooltipListener.cpp | 2 -- 10 files changed, 5 insertions(+), 15 deletions(-) diff --git a/layout/xul/base/src/grid/nsGrid.cpp b/layout/xul/base/src/grid/nsGrid.cpp index 651f21f257a8..e93e6aafbd72 100644 --- a/layout/xul/base/src/grid/nsGrid.cpp +++ b/layout/xul/base/src/grid/nsGrid.cpp @@ -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. diff --git a/layout/xul/base/src/grid/nsGridRowLeafFrame.cpp b/layout/xul/base/src/grid/nsGridRowLeafFrame.cpp index eede15c1b8b7..0a005e3ba8d0 100644 --- a/layout/xul/base/src/grid/nsGridRowLeafFrame.cpp +++ b/layout/xul/base/src/grid/nsGridRowLeafFrame.cpp @@ -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 layout; diff --git a/layout/xul/base/src/nsBox.cpp b/layout/xul/base/src/nsBox.cpp index af614160584e..a12871622892 100644 --- a/layout/xul/base/src/nsBox.cpp +++ b/layout/xul/base/src/nsBox.cpp @@ -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 content; frame->GetContent(getter_AddRefs(content)); if (content) { diff --git a/layout/xul/base/src/nsBoxToBlockAdaptor.cpp b/layout/xul/base/src/nsBoxToBlockAdaptor.cpp index c82da1fba3ab..49655358881e 100644 --- a/layout/xul/base/src/nsBoxToBlockAdaptor.cpp +++ b/layout/xul/base/src/nsBoxToBlockAdaptor.cpp @@ -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) { diff --git a/layout/xul/base/src/nsImageBoxFrame.cpp b/layout/xul/base/src/nsImageBoxFrame.cpp index 355984e5cd22..37536dbb0d85 100644 --- a/layout/xul/base/src/nsImageBoxFrame.cpp +++ b/layout/xul/base/src/nsImageBoxFrame.cpp @@ -282,8 +282,7 @@ nsImageBoxFrame::AttributeChanged(nsIPresContext* aPresContext, Redraw(state); } - - return NS_OK; + return rv; } nsImageBoxFrame::nsImageBoxFrame(nsIPresShell* aShell):nsLeafBoxFrame(aShell), mIntrinsicSize(0,0), diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp index 0d25776cf465..48bda15ec525 100644 --- a/layout/xul/base/src/nsMenuPopupFrame.cpp +++ b/layout/xul/base/src/nsMenuPopupFrame.cpp @@ -2140,7 +2140,7 @@ nsMenuPopupFrame::AttributeChanged(nsIPresContext* aPresContext, if (aAttribute == nsXULAtoms::left || aAttribute == nsXULAtoms::top) MoveToAttributePosition(); - return NS_OK; + return rv; } void diff --git a/layout/xul/base/src/nsScrollBoxFrame.cpp b/layout/xul/base/src/nsScrollBoxFrame.cpp index 3c4d0b8c1841..5e5f0f76141f 100644 --- a/layout/xul/base/src/nsScrollBoxFrame.cpp +++ b/layout/xul/base/src/nsScrollBoxFrame.cpp @@ -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); diff --git a/layout/xul/base/src/nsSplitterFrame.cpp b/layout/xul/base/src/nsSplitterFrame.cpp index 7e67e9673186..fb2a0c80019c 100644 --- a/layout/xul/base/src/nsSplitterFrame.cpp +++ b/layout/xul/base/src/nsSplitterFrame.cpp @@ -817,7 +817,6 @@ nsSplitterFrameInner::MouseDown(nsIDOMEvent* aMouseEvent) nsIBox* childBox = nsnull; mParentBox->GetChildBox(&childBox); - PRBool skip = PR_FALSE; while (nsnull != childBox) { nsIFrame* childFrame = nsnull; diff --git a/layout/xul/base/src/nsStackLayout.cpp b/layout/xul/base/src/nsStackLayout.cpp index 82371382c8d2..06c6a8095a18 100644 --- a/layout/xul/base/src/nsStackLayout.cpp +++ b/layout/xul/base/src/nsStackLayout.cpp @@ -264,8 +264,6 @@ nsStackLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState) nsRect clientRect; aBox->GetClientRect(clientRect); - nsRect childRect; - PRBool grow; do { diff --git a/layout/xul/base/src/nsXULTooltipListener.cpp b/layout/xul/base/src/nsXULTooltipListener.cpp index db6e90a7d59e..067e73317ceb 100644 --- a/layout/xul/base/src/nsXULTooltipListener.cpp +++ b/layout/xul/base/src/nsXULTooltipListener.cpp @@ -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;