From cba0baa8a448f4fa42346cfc3909ca5cc5f41b6a Mon Sep 17 00:00:00 2001 From: "buster%netscape.com" Date: Thu, 14 Sep 2000 05:50:56 +0000 Subject: [PATCH] just cleaning up a warning, found during fix for bug 52307 git-svn-id: svn://10.0.0.236/trunk@79082 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsLineLayout.cpp | 5 +++-- mozilla/layout/html/base/src/nsLineLayout.cpp | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mozilla/layout/generic/nsLineLayout.cpp b/mozilla/layout/generic/nsLineLayout.cpp index a6bcc32969d..97021b1dd3a 100644 --- a/mozilla/layout/generic/nsLineLayout.cpp +++ b/mozilla/layout/generic/nsLineLayout.cpp @@ -952,8 +952,9 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame, if (inTextControl) { nsLineBox *currentLine=nsnull; - nsresult rv = nsBlockFrame::GetCurrentLine(mBlockRS, ¤tLine); - if (NS_SUCCEEDED(rv) && currentLine) { + // use localResult because a failure here should not be propagated to my caller + nsresult localResult = nsBlockFrame::GetCurrentLine(mBlockRS, ¤tLine); + if (NS_SUCCEEDED(localResult) && currentLine) { currentLine->SetForceInvalidate(PR_TRUE); } } diff --git a/mozilla/layout/html/base/src/nsLineLayout.cpp b/mozilla/layout/html/base/src/nsLineLayout.cpp index a6bcc32969d..97021b1dd3a 100644 --- a/mozilla/layout/html/base/src/nsLineLayout.cpp +++ b/mozilla/layout/html/base/src/nsLineLayout.cpp @@ -952,8 +952,9 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame, if (inTextControl) { nsLineBox *currentLine=nsnull; - nsresult rv = nsBlockFrame::GetCurrentLine(mBlockRS, ¤tLine); - if (NS_SUCCEEDED(rv) && currentLine) { + // use localResult because a failure here should not be propagated to my caller + nsresult localResult = nsBlockFrame::GetCurrentLine(mBlockRS, ¤tLine); + if (NS_SUCCEEDED(localResult) && currentLine) { currentLine->SetForceInvalidate(PR_TRUE); } }