diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp index bced580c86c..e9cad4ddd31 100644 --- a/mozilla/content/base/src/nsDocumentViewer.cpp +++ b/mozilla/content/base/src/nsDocumentViewer.cpp @@ -151,11 +151,6 @@ static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID); #include "nsIScrollable.h" #include "nsIWebBrowserPrint.h" // needed for PrintPreview Navigation constants -// Print Progress -#include "nsPrintProgress.h" -#include "nsPrintProgressParams.h" - - // Print error dialog #include "nsIPrompt.h" #include "nsIWindowWatcher.h" diff --git a/mozilla/content/base/src/nsPrintProgress.cpp b/mozilla/content/base/src/nsPrintProgress.cpp deleted file mode 100644 index e85ca0b25eb..00000000000 --- a/mozilla/content/base/src/nsPrintProgress.cpp +++ /dev/null @@ -1,343 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Jean-Francois Ducarroz - * Rod Spears - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsPrintProgress.h" - -#include "nsIBaseWindow.h" -#include "nsISupportsArray.h" -#include "nsISupportsPrimitives.h" -#include "nsIComponentManager.h" - -NS_IMPL_THREADSAFE_ADDREF(nsPrintProgress); -NS_IMPL_THREADSAFE_RELEASE(nsPrintProgress); - -NS_INTERFACE_MAP_BEGIN(nsPrintProgress) - NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIPrintStatusFeedback) - NS_INTERFACE_MAP_ENTRY(nsIPrintProgress) - NS_INTERFACE_MAP_ENTRY(nsIPrintStatusFeedback) - NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener) -NS_INTERFACE_MAP_END_THREADSAFE - - -nsPrintProgress::nsPrintProgress() -{ - NS_INIT_ISUPPORTS(); - m_closeProgress = PR_FALSE; - m_processCanceled = PR_FALSE; - m_pendingStateFlags = -1; - m_pendingStateValue = 0; -} - -nsPrintProgress::~nsPrintProgress() -{ - (void)ReleaseListeners(); -} - -/* void openProgressDialog (in nsIDOMWindowInternal parent, in string dialogURL, in nsISupports parameters); */ -NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(nsIDOMWindowInternal *parent, - const char *dialogURL, - nsISupports *parameters, - nsIObserver *openDialogObserver, - PRBool *notifyOnOpen) -{ - *notifyOnOpen = PR_FALSE; - nsresult rv = NS_ERROR_FAILURE; - - if (m_dialog) - return NS_ERROR_ALREADY_INITIALIZED; - - if (!dialogURL || !*dialogURL) - return NS_ERROR_INVALID_ARG; - - if (parent) - { - // Set up window.arguments[0]... - nsCOMPtr array; - rv = NS_NewISupportsArray(getter_AddRefs(array)); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr ifptr = - do_CreateInstance(NS_SUPPORTS_INTERFACE_POINTER_CONTRACTID, &rv); - NS_ENSURE_SUCCESS(rv, rv); - - ifptr->SetData(NS_STATIC_CAST(nsIPrintProgress*, this)); - ifptr->SetDataIID(&NS_GET_IID(nsIPrintProgress)); - - array->AppendElement(ifptr); - - array->AppendElement(parameters); - - // Open the dialog. - nsCOMPtr newWindow; - rv = parent->OpenDialog(NS_ConvertASCIItoUCS2(dialogURL), - NS_LITERAL_STRING("_blank"), - NS_LITERAL_STRING("chrome,titlebar,dependent,centerscreen"), - array, getter_AddRefs(newWindow)); - } - - return rv; -} - -/* void closeProgressDialog (in boolean forceClose); */ -NS_IMETHODIMP nsPrintProgress::CloseProgressDialog(PRBool forceClose) -{ - m_closeProgress = PR_TRUE; - return OnStateChange(nsnull, nsnull, nsIWebProgressListener::STATE_STOP, forceClose); -} - -/* nsIPrompt GetPrompter (); */ -NS_IMETHODIMP nsPrintProgress::GetPrompter(nsIPrompt **_retval) -{ - NS_ENSURE_ARG_POINTER(_retval); - *_retval = nsnull; - - if (! m_closeProgress && m_dialog) - return m_dialog->GetPrompter(_retval); - - return NS_ERROR_FAILURE; -} - -/* attribute boolean processCanceledByUser; */ -NS_IMETHODIMP nsPrintProgress::GetProcessCanceledByUser(PRBool *aProcessCanceledByUser) -{ - NS_ENSURE_ARG_POINTER(aProcessCanceledByUser); - *aProcessCanceledByUser = m_processCanceled; - return NS_OK; -} -NS_IMETHODIMP nsPrintProgress::SetProcessCanceledByUser(PRBool aProcessCanceledByUser) -{ - m_processCanceled = aProcessCanceledByUser; - OnStateChange(nsnull, nsnull, nsIWebProgressListener::STATE_STOP, PR_FALSE); - return NS_OK; -} - -/* void RegisterListener (in nsIWebProgressListener listener); */ -NS_IMETHODIMP nsPrintProgress::RegisterListener(nsIWebProgressListener * listener) -{ - nsresult rv = NS_OK; - - if (!listener) //Nothing to do with a null listener! - return NS_OK; - - if (!m_listenerList) - rv = NS_NewISupportsArray(getter_AddRefs(m_listenerList)); - - if (NS_SUCCEEDED(rv) && m_listenerList) - { - m_listenerList->AppendElement(listener); - if (m_closeProgress || m_processCanceled) - listener->OnStateChange(nsnull, nsnull, nsIWebProgressListener::STATE_STOP, 0); - else - { - listener->OnStatusChange(nsnull, nsnull, 0, m_pendingStatus.get()); - if (m_pendingStateFlags != -1) - listener->OnStateChange(nsnull, nsnull, m_pendingStateFlags, m_pendingStateValue); - } - } - - return NS_OK; -} - -/* void UnregisterListener (in nsIWebProgressListener listener); */ -NS_IMETHODIMP nsPrintProgress::UnregisterListener(nsIWebProgressListener *listener) -{ - if (m_listenerList && listener) - m_listenerList->RemoveElement(listener); - - return NS_OK; -} - -/* void onStateChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aStateFlags, in unsigned long aStatus); */ -NS_IMETHODIMP nsPrintProgress::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRInt32 aStateFlags, PRUint32 aStatus) -{ - nsresult rv = NS_OK; - - m_pendingStateFlags = aStateFlags; - m_pendingStateValue = aStatus; - - if (m_listenerList) - { - PRUint32 count; - PRInt32 i; - - rv = m_listenerList->Count(&count); - NS_ASSERTION(NS_SUCCEEDED(rv), "m_listenerList->Count() failed"); - if (NS_FAILED(rv)) - return rv; - - nsCOMPtr aSupports; - nsCOMPtr aProgressListener; - for (i = count - 1; i >= 0; i --) - { - m_listenerList->GetElementAt(i, getter_AddRefs(aSupports)); - aProgressListener = do_QueryInterface(aSupports); - if (aProgressListener) - aProgressListener->OnStateChange(aWebProgress, aRequest, aStateFlags, aStatus); - } - } - - return rv; -} - -/* void onProgressChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long aCurSelfProgress, in long aMaxSelfProgress, in long aCurTotalProgress, in long aMaxTotalProgress); */ -NS_IMETHODIMP nsPrintProgress::OnProgressChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRInt32 aCurSelfProgress, PRInt32 aMaxSelfProgress, PRInt32 aCurTotalProgress, PRInt32 aMaxTotalProgress) -{ - nsresult rv = NS_OK; - - if (m_listenerList) - { - PRUint32 count; - PRInt32 i; - - rv = m_listenerList->Count(&count); - NS_ASSERTION(NS_SUCCEEDED(rv), "m_listenerList->Count() failed"); - if (NS_FAILED(rv)) - return rv; - - nsCOMPtr aSupports; - nsCOMPtr aProgressListener; - for (i = count - 1; i >= 0; i --) - { - m_listenerList->GetElementAt(i, getter_AddRefs(aSupports)); - aProgressListener = do_QueryInterface(aSupports); - if (aProgressListener) - aProgressListener->OnProgressChange(aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress); - } - } - - return rv; -} - -/* void onLocationChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsIURI location); */ -NS_IMETHODIMP nsPrintProgress::OnLocationChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsIURI *location) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -/* void onStatusChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in nsresult aStatus, in wstring aMessage); */ -NS_IMETHODIMP nsPrintProgress::OnStatusChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, nsresult aStatus, const PRUnichar *aMessage) -{ - nsresult rv = NS_OK; - - if (aMessage && *aMessage) - m_pendingStatus = aMessage; - if (m_listenerList) - { - PRUint32 count; - PRInt32 i; - - rv = m_listenerList->Count(&count); - NS_ASSERTION(NS_SUCCEEDED(rv), "m_listenerList->Count() failed"); - if (NS_FAILED(rv)) - return rv; - - nsCOMPtr aSupports; - nsCOMPtr aProgressListener; - for (i = count - 1; i >= 0; i --) - { - m_listenerList->GetElementAt(i, getter_AddRefs(aSupports)); - aProgressListener = do_QueryInterface(aSupports); - if (aProgressListener) - aProgressListener->OnStatusChange(aWebProgress, aRequest, aStatus, aMessage); - } - } - - return rv; -} - -/* void onSecurityChange (in nsIWebProgress aWebProgress, in nsIRequest aRequest, in long state); */ -NS_IMETHODIMP nsPrintProgress::OnSecurityChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRInt32 state) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -nsresult nsPrintProgress::ReleaseListeners() -{ - nsresult rv = NS_OK; - - if (m_listenerList) - { - PRUint32 count; - PRInt32 i; - - rv = m_listenerList->Count(&count); - NS_ASSERTION(NS_SUCCEEDED(rv), "m_listenerList->Count() failed"); - if (NS_SUCCEEDED(rv)) - for (i = count - 1; i >= 0; i --) - m_listenerList->RemoveElementAt(i); - } - - return rv; -} - -NS_IMETHODIMP nsPrintProgress::ShowStatusString(const PRUnichar *status) -{ - return OnStatusChange(nsnull, nsnull, NS_OK, status); -} - -/* void startMeteors (); */ -NS_IMETHODIMP nsPrintProgress::StartMeteors() -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -/* void stopMeteors (); */ -NS_IMETHODIMP nsPrintProgress::StopMeteors() -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -/* void showProgress (in long percent); */ -NS_IMETHODIMP nsPrintProgress::ShowProgress(PRInt32 percent) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -/* [noscript] void setDocShell (in nsIDocShell shell, in nsIDOMWindowInternal window); */ -NS_IMETHODIMP nsPrintProgress::SetDocShell(nsIDocShell *shell, nsIDOMWindowInternal *window) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -/* void closeWindow (); */ -NS_IMETHODIMP nsPrintProgress::CloseWindow() -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - diff --git a/mozilla/content/base/src/nsPrintProgress.h b/mozilla/content/base/src/nsPrintProgress.h deleted file mode 100644 index 62e1b5f5a63..00000000000 --- a/mozilla/content/base/src/nsPrintProgress.h +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Jean-Francois Ducarroz - * Rod Spears - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsIPrintProgress.h" - -#include "nsCOMPtr.h" -#include "nsISupportsArray.h" -#include "nsIDOMWindowInternal.h" -#include "nsIPrintStatusFeedback.h" -#include "nsString.h" - -class nsPrintProgress : public nsIPrintProgress, public nsIPrintStatusFeedback -{ -public: - NS_DECL_ISUPPORTS - NS_DECL_NSIPRINTPROGRESS - NS_DECL_NSIWEBPROGRESSLISTENER - NS_DECL_NSIPRINTSTATUSFEEDBACK - - nsPrintProgress(); - virtual ~nsPrintProgress(); - -private: - nsresult ReleaseListeners(void); - - PRBool m_closeProgress; - PRBool m_processCanceled; - nsString m_pendingStatus; - PRInt32 m_pendingStateFlags; - PRInt32 m_pendingStateValue; - nsCOMPtr m_dialog; - nsCOMPtr m_listenerList; -}; diff --git a/mozilla/content/base/src/nsPrintProgressParams.cpp b/mozilla/content/base/src/nsPrintProgressParams.cpp deleted file mode 100644 index 6c686884840..00000000000 --- a/mozilla/content/base/src/nsPrintProgressParams.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Rod Spears - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsPrintProgressParams.h" -#include "nsReadableUtils.h" - - -NS_IMPL_ISUPPORTS1(nsPrintProgressParams, nsIPrintProgressParams) - -nsPrintProgressParams::nsPrintProgressParams() -{ - NS_INIT_ISUPPORTS(); -} - -nsPrintProgressParams::~nsPrintProgressParams() -{ -} - -/* attribute wstring docTitle; */ -NS_IMETHODIMP nsPrintProgressParams::GetDocTitle(PRUnichar * *aDocTitle) -{ - NS_ENSURE_ARG(aDocTitle); - - *aDocTitle = ToNewUnicode(mDocTitle); - return NS_OK; -} - -NS_IMETHODIMP nsPrintProgressParams::SetDocTitle(const PRUnichar * aDocTitle) -{ - mDocTitle = aDocTitle; - return NS_OK; -} - -/* attribute wstring docURL; */ -NS_IMETHODIMP nsPrintProgressParams::GetDocURL(PRUnichar * *aDocURL) -{ - NS_ENSURE_ARG(aDocURL); - - *aDocURL = ToNewUnicode(mDocURL); - return NS_OK; -} - -NS_IMETHODIMP nsPrintProgressParams::SetDocURL(const PRUnichar * aDocURL) -{ - mDocURL = aDocURL; - return NS_OK; -} - diff --git a/mozilla/content/base/src/nsPrintProgressParams.h b/mozilla/content/base/src/nsPrintProgressParams.h deleted file mode 100644 index 61123a4f386..00000000000 --- a/mozilla/content/base/src/nsPrintProgressParams.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Rod Spears - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsIPrintProgressParams.h" -#include "nsString.h" - -class nsPrintProgressParams : public nsIPrintProgressParams -{ -public: - NS_DECL_ISUPPORTS - NS_DECL_NSIPRINTPROGRESSPARAMS - - nsPrintProgressParams(); - virtual ~nsPrintProgressParams(); - -private: - nsString mDocTitle; - nsString mDocURL; -}; diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index bced580c86c..e9cad4ddd31 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -151,11 +151,6 @@ static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID); #include "nsIScrollable.h" #include "nsIWebBrowserPrint.h" // needed for PrintPreview Navigation constants -// Print Progress -#include "nsPrintProgress.h" -#include "nsPrintProgressParams.h" - - // Print error dialog #include "nsIPrompt.h" #include "nsIWindowWatcher.h"