From 82f8744fa39c0af79863353f5c4c845f7c7a9e6d Mon Sep 17 00:00:00 2001 From: "rbs%maths.uq.edu.au" Date: Thu, 11 May 2000 23:03:19 +0000 Subject: [PATCH] [not part of default build] Remove usage of nsAreaFrame since it will be going away git-svn-id: svn://10.0.0.236/trunk@69286 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/mathml/base/src/nsMathMLmtableFrame.cpp | 8 +------- mozilla/layout/mathml/base/src/nsMathMLmtableFrame.h | 4 +++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/mozilla/layout/mathml/base/src/nsMathMLmtableFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmtableFrame.cpp index 6da99a191de..b72a748a5f9 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmtableFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmtableFrame.cpp @@ -174,8 +174,6 @@ NS_NewMathMLmtdFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame) if (nsnull == it) { return NS_ERROR_OUT_OF_MEMORY; } -// XXX RBS - what about mFlags ? -// it->SetFlags(NS_AREA_WRAP_SIZE); ? *aNewFrame = it; return NS_OK; } @@ -193,15 +191,11 @@ nsMathMLmtdFrame::Reflow(nsIPresContext* aPresContext, nsHTMLReflowMetrics& aDesiredSize, const nsHTMLReflowState& aReflowState, nsReflowStatus& aStatus) - { - nsresult rv = NS_OK; - // Let the base class do the reflow - rv = nsAreaFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus); + nsresult rv = nsBlockFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus); // more about and later // ... - return rv; } diff --git a/mozilla/layout/mathml/base/src/nsMathMLmtableFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmtableFrame.h index db9191f8541..9e8d1a4a37c 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmtableFrame.h +++ b/mozilla/layout/mathml/base/src/nsMathMLmtableFrame.h @@ -138,6 +138,8 @@ public: return NS_OK; } + // overloaded nsTableOuterFrame methods + NS_IMETHOD Init(nsIPresContext* aPresContext, nsIContent* aContent, @@ -171,7 +173,7 @@ protected: // -------------- -class nsMathMLmtdFrame : public nsAreaFrame { +class nsMathMLmtdFrame : public nsBlockFrame { public: friend nsresult NS_NewMathMLmtdFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame);