From 132a6cb39a6504046b6a578564f9f4e1f73555c8 Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Mon, 8 May 2000 21:39:29 +0000 Subject: [PATCH] this should bring down the leaks should have used XPCom git-svn-id: svn://10.0.0.236/trunk@68718 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/forms/nsComboboxControlFrame.cpp | 12 ++++-------- .../layout/html/forms/src/nsComboboxControlFrame.cpp | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index 2ab57d19faa..a7c05f6b012 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -316,15 +316,11 @@ nsComboboxControlFrame::Init(nsIPresContext* aPresContext, // Start - Temporary fix for Bug 36558 //------------------------------- mGoodToGo = PR_FALSE; - nsIDocument * document; - nsresult rv = aContent->GetDocument(document); + nsCOMPtr document; + nsresult rv = aContent->GetDocument(*getter_AddRefs(document)); if (NS_SUCCEEDED(rv) && document) { - nsIXULDocument * xulDoc; - if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIXULDocument), (void**)&xulDoc))) { - mGoodToGo = PR_FALSE; - } else { - mGoodToGo = PR_TRUE; - } + nsCOMPtr xulDoc(do_QueryInterface(document)); + mGoodToGo = xulDoc?PR_FALSE:PR_TRUE; } //------------------------------- // Done - Temporary fix for Bug 36558 diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp index 2ab57d19faa..a7c05f6b012 100644 --- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp @@ -316,15 +316,11 @@ nsComboboxControlFrame::Init(nsIPresContext* aPresContext, // Start - Temporary fix for Bug 36558 //------------------------------- mGoodToGo = PR_FALSE; - nsIDocument * document; - nsresult rv = aContent->GetDocument(document); + nsCOMPtr document; + nsresult rv = aContent->GetDocument(*getter_AddRefs(document)); if (NS_SUCCEEDED(rv) && document) { - nsIXULDocument * xulDoc; - if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIXULDocument), (void**)&xulDoc))) { - mGoodToGo = PR_FALSE; - } else { - mGoodToGo = PR_TRUE; - } + nsCOMPtr xulDoc(do_QueryInterface(document)); + mGoodToGo = xulDoc?PR_FALSE:PR_TRUE; } //------------------------------- // Done - Temporary fix for Bug 36558