diff --git a/webshell/embed/ActiveX/MozillaBrowser.cpp b/webshell/embed/ActiveX/MozillaBrowser.cpp index b1eff1c82739..5583b79f572a 100644 --- a/webshell/embed/ActiveX/MozillaBrowser.cpp +++ b/webshell/embed/ActiveX/MozillaBrowser.cpp @@ -182,7 +182,7 @@ LRESULT CMozillaBrowser::OnPrint(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& if (m_pIWebShell) { nsIContentViewer *pContentViewer = nsnull; - m_pIWebShell->GetContentViewer(pContentViewer); + m_pIWebShell->GetContentViewer(&pContentViewer); if (nsnull != pContentViewer) { pContentViewer->Print(); diff --git a/webshell/tests/viewer/nsBrowserWindow.cpp b/webshell/tests/viewer/nsBrowserWindow.cpp index 42af126e6ec5..0774cec044bd 100644 --- a/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/webshell/tests/viewer/nsBrowserWindow.cpp @@ -178,7 +178,7 @@ GetPresShellFor(nsIWebShell* aWebShell) nsIPresShell* shell = nsnull; if (nsnull != aWebShell) { nsIContentViewer* cv = nsnull; - aWebShell->GetContentViewer(cv); + aWebShell->GetContentViewer(&cv); if (nsnull != cv) { nsIDocumentViewer* docv = nsnull; cv->QueryInterface(kIDocumentViewerIID, (void**) &docv); @@ -2203,7 +2203,7 @@ nsBrowserWindow::ShowPrintPreview(PRInt32 aID) { nsIContentViewer* cv = nsnull; if (nsnull != mWebShell) { - if ((NS_OK == mWebShell->GetContentViewer(cv)) && (nsnull != cv)) { + if ((NS_OK == mWebShell->GetContentViewer(&cv)) && (nsnull != cv)) { nsIDocumentViewer* docv = nsnull; if (NS_OK == cv->QueryInterface(kIDocumentViewerIID, (void**)&docv)) { nsIPresContext* printContext; @@ -2240,7 +2240,7 @@ void nsBrowserWindow::DoPrint(void) { nsIContentViewer *viewer = nsnull; - mWebShell->GetContentViewer(viewer); + mWebShell->GetContentViewer(&viewer); if (nsnull != viewer) { @@ -2310,7 +2310,7 @@ nsIDOMDocument* nsBrowserWindow::GetDOMDocument(nsIWebShell *aWebShell) nsIDOMDocument* domDoc = nsnull; if (nsnull != aWebShell) { nsIContentViewer* mCViewer; - aWebShell->GetContentViewer(mCViewer); + aWebShell->GetContentViewer(&mCViewer); if (nsnull != mCViewer) { nsIDocumentViewer* mDViewer; if (NS_OK == mCViewer->QueryInterface(kIDocumentViewerIID, (void**) &mDViewer)) { @@ -2414,7 +2414,7 @@ nsBrowserWindow::DoEditorMode(nsIWebShell *aWebShell) PRInt32 i, n; if (nsnull != aWebShell) { nsIContentViewer* mCViewer; - aWebShell->GetContentViewer(mCViewer); + aWebShell->GetContentViewer(&mCViewer); if (nsnull != mCViewer) { nsIDocumentViewer* mDViewer; if (NS_OK == mCViewer->QueryInterface(kIDocumentViewerIID, (void**) &mDViewer)) { diff --git a/webshell/tests/viewer/nsWebCrawler.cpp b/webshell/tests/viewer/nsWebCrawler.cpp index b8a820b7c503..8efb3e8674bb 100644 --- a/webshell/tests/viewer/nsWebCrawler.cpp +++ b/webshell/tests/viewer/nsWebCrawler.cpp @@ -640,7 +640,7 @@ nsWebCrawler::FindMoreURLs() mBrowser->GetWebShell(shell); if (nsnull != shell) { nsIContentViewer* cv = nsnull; - shell->GetContentViewer(cv); + shell->GetContentViewer(&cv); if (nsnull != cv) { nsIDocumentViewer* docv = nsnull; cv->QueryInterface(kIDocumentViewerIID, (void**) &docv); @@ -739,7 +739,7 @@ nsWebCrawler::GetPresShell() nsIPresShell* shell = nsnull; if (nsnull != webShell) { nsIContentViewer* cv = nsnull; - webShell->GetContentViewer(cv); + webShell->GetContentViewer(&cv); if (nsnull != cv) { nsIDocumentViewer* docv = nsnull; cv->QueryInterface(kIDocumentViewerIID, (void**) &docv); diff --git a/webshell/tests/viewer/nsXPBaseWindow.cpp b/webshell/tests/viewer/nsXPBaseWindow.cpp index 9e3ffeef1c4d..692b26fa5ccf 100644 --- a/webshell/tests/viewer/nsXPBaseWindow.cpp +++ b/webshell/tests/viewer/nsXPBaseWindow.cpp @@ -689,7 +689,7 @@ NS_IMETHODIMP nsXPBaseWindow::GetPresShell(nsIPresShell*& aPresShell) nsIPresShell* shell = nsnull; if (nsnull != mWebShell) { nsIContentViewer* cv = nsnull; - mWebShell->GetContentViewer(cv); + mWebShell->GetContentViewer(&cv); if (nsnull != cv) { nsIDocumentViewer* docv = nsnull; cv->QueryInterface(kIDocumentViewerIID, (void**) &docv);