From e6e0bfb280aaa595e10a533608e3c76be0b547ba Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Wed, 18 Nov 1998 04:06:19 +0000 Subject: [PATCH] Fixed a couple of cases where I missed calling the base class git-svn-id: svn://10.0.0.236/trunk@14856 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/base/src/nsBodyFrame.cpp | 11 ++++++----- mozilla/layout/html/base/src/nsBodyFrame.h | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mozilla/layout/html/base/src/nsBodyFrame.cpp b/mozilla/layout/html/base/src/nsBodyFrame.cpp index fcf325a800c..cceb5590b7d 100644 --- a/mozilla/layout/html/base/src/nsBodyFrame.cpp +++ b/mozilla/layout/html/base/src/nsBodyFrame.cpp @@ -73,7 +73,7 @@ nsBodyFrame::~nsBodyFrame() } ///////////////////////////////////////////////////////////////////////////// -// nsIUnknown +// nsISupports nsresult nsBodyFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) @@ -87,7 +87,7 @@ nsBodyFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr) *aInstancePtr = (void*) tmp; return NS_OK; } - return nsHTMLContainerFrame::QueryInterface(aIID, aInstancePtr); + return nsBlockFrame::QueryInterface(aIID, aInstancePtr); } ///////////////////////////////////////////////////////////////////////////// @@ -104,11 +104,12 @@ NS_IMETHODIMP nsBodyFrame::GetAdditionalChildListName(PRInt32 aIndex, nsIAtom*& aListName) const { - if (aIndex < 0) { - return NS_ERROR_INVALID_ARG; + if (aIndex < 2) { + return nsBlockFrame::GetAdditionalChildListName(aIndex, aListName); } + nsIAtom* atom = nsnull; - if (0 == aIndex) { + if (2 == aIndex) { atom = gAbsoluteAtom; NS_ADDREF(atom); } diff --git a/mozilla/layout/html/base/src/nsBodyFrame.h b/mozilla/layout/html/base/src/nsBodyFrame.h index 467063666c8..03a7d3a3843 100644 --- a/mozilla/layout/html/base/src/nsBodyFrame.h +++ b/mozilla/layout/html/base/src/nsBodyFrame.h @@ -35,8 +35,10 @@ public: friend nsresult NS_NewBodyFrame(nsIContent* aContent, nsIFrame* aParent, nsIFrame*& aResult, PRUint32 aFlags); + // nsISupports NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); + // nsIFrame NS_IMETHOD DeleteFrame(nsIPresContext& aPresContext); NS_IMETHOD GetAdditionalChildListName(PRInt32 aIndex,