From a6ad86bdb2f65207289a3c195498d24cd93a38b8 Mon Sep 17 00:00:00 2001
From: "scc%netscape.com"
 <scc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 2 Mar 1999 22:44:55 +0000
Subject: [PATCH] fix for nsCOMPtr: no construction/assignment from raw COM
 interface pointers

git-svn-id: svn://10.0.0.236/trunk@22615 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/appshell/src/nsWebShellWindow.cpp | 2 +-
 mozilla/xpfe/appshell/src/nsXULCommand.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
index 6a30d50173d..f23dd9a1fc9 100644
--- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -851,7 +851,7 @@ void nsWebShellWindow::ExecuteJavaScriptString(nsString& aJavaScript)
   }
   
   // Get nsIScriptContextOwner
-  nsCOMPtr<nsIScriptContextOwner> scriptContextOwner ( mWebShell );
+  nsCOMPtr<nsIScriptContextOwner> scriptContextOwner ( do_QueryInterface(mWebShell) );
   if ( scriptContextOwner ) {
     const char* url = "";
       // Get nsIScriptContext
diff --git a/mozilla/xpfe/appshell/src/nsXULCommand.cpp b/mozilla/xpfe/appshell/src/nsXULCommand.cpp
index 4e4ab3fb558..542be87bb09 100644
--- a/mozilla/xpfe/appshell/src/nsXULCommand.cpp
+++ b/mozilla/xpfe/appshell/src/nsXULCommand.cpp
@@ -158,7 +158,7 @@ NS_IMETHODIMP nsXULCommand::ExecuteJavaScriptString(nsIWebShell* aWebShell, nsSt
   NS_ASSERTION(nsnull != aWebShell, "null webshell passed to EvaluateJavaScriptString");
 
   // Get nsIScriptContextOwner
-  nsCOMPtr<nsIScriptContextOwner> scriptContextOwner ( aWebShell );
+  nsCOMPtr<nsIScriptContextOwner> scriptContextOwner ( do_QueryInterface(aWebShell) );
   if ( scriptContextOwner ) {
     const char* url = "";
       // Get nsIScriptContext