From 3c2fed7e4ae3561069e74c628693f4b1c04b2781 Mon Sep 17 00:00:00 2001 From: "brade%netscape.com" Date: Fri, 27 Jun 2003 14:19:40 +0000 Subject: [PATCH] NS_IMPL macro cleanup; r=timeless; sr=kin; bug=209548 git-svn-id: svn://10.0.0.236/trunk@144215 18797224-902f-48f8-a5cc-f745e15eee43 --- .../editor/composer/src/nsEditorService.cpp | 4 +- mozilla/editor/libeditor/base/EditTxn.cpp | 38 +---- mozilla/editor/libeditor/base/nsEditor.cpp | 11 +- mozilla/editor/libeditor/html/TypeInState.cpp | 22 +-- .../editor/libeditor/html/nsEditorTxnLog.cpp | 20 +-- .../libeditor/html/nsHTMLObjectResizer.cpp | 26 +-- mozilla/editor/libeditor/text/nsAOLCiter.cpp | 24 +-- .../libeditor/text/nsEditorEventListeners.cpp | 153 +----------------- .../editor/libeditor/text/nsInternetCiter.cpp | 24 +-- .../editor/libeditor/text/nsTextEditRules.cpp | 4 +- mozilla/editor/txtsvc/src/nsTSDNotifier.cpp | 20 +-- .../txtsvc/src/nsTextServicesDocument.cpp | 24 +-- 12 files changed, 25 insertions(+), 345 deletions(-) diff --git a/mozilla/editor/composer/src/nsEditorService.cpp b/mozilla/editor/composer/src/nsEditorService.cpp index 3a5f9c39b6d..a1c77fea745 100644 --- a/mozilla/editor/composer/src/nsEditorService.cpp +++ b/mozilla/editor/composer/src/nsEditorService.cpp @@ -49,8 +49,6 @@ nsEditorService::~nsEditorService() { } -NS_IMPL_ADDREF(nsEditorService); -NS_IMPL_RELEASE(nsEditorService); -NS_IMPL_QUERY_INTERFACE1(nsEditorService, nsICmdLineHandler) +NS_IMPL_ISUPPORTS1(nsEditorService, nsICmdLineHandler) CMDLINEHANDLER_IMPL(nsEditorService,"-edit","general.startup.editor","chrome://editor/content/editor.xul","Start with editor.","@mozilla.org/commandlinehandler/general-startup;1?type=editor","Editor Startup Handler", PR_TRUE,"about:blank", PR_TRUE) diff --git a/mozilla/editor/libeditor/base/EditTxn.cpp b/mozilla/editor/libeditor/base/EditTxn.cpp index 3cee4c80d70..258c11bf0ac 100644 --- a/mozilla/editor/libeditor/base/EditTxn.cpp +++ b/mozilla/editor/libeditor/base/EditTxn.cpp @@ -42,13 +42,8 @@ #include "nsIDOMNode.h" #include "nsIDOMNodeList.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kITransactionIID, NS_ITRANSACTION_IID); +NS_IMPL_ISUPPORTS2(EditTxn, nsITransaction, nsPIEditorTransaction) -NS_IMPL_ADDREF(EditTxn) -NS_IMPL_RELEASE(EditTxn) - -// note that aEditor is not refcounted EditTxn::EditTxn() { } @@ -90,34 +85,3 @@ NS_IMETHODIMP EditTxn::GetTxnDescription(nsAString& aString) return NS_OK; } -NS_IMETHODIMP -EditTxn::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (NULL == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - if (aIID.Equals(kISupportsIID)) { - nsITransaction *tmp = this; - nsISupports *tmp2 = tmp; - *aInstancePtr = (void*)(nsISupports*)tmp2; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kITransactionIID)) { - *aInstancePtr = (void*)(nsITransaction*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsPIEditorTransaction))) { - *aInstancePtr = (void*)(nsPIEditorTransaction*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - - - *aInstancePtr = 0; - return NS_NOINTERFACE; -} - - - diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp index 923ef64a40a..a56b4d948e8 100644 --- a/mozilla/editor/libeditor/base/nsEditor.cpp +++ b/mozilla/editor/libeditor/base/nsEditor.cpp @@ -247,11 +247,7 @@ nsEditor::~nsEditor() } -// BEGIN nsEditor core implementation - -NS_IMPL_ADDREF(nsEditor) -NS_IMPL_RELEASE(nsEditor) -NS_IMPL_QUERY_INTERFACE4(nsEditor, nsIEditor, nsIEditorIMESupport, nsISupportsWeakReference, nsIPhonetic) +NS_IMPL_ISUPPORTS4(nsEditor, nsIEditor, nsIEditorIMESupport, nsISupportsWeakReference, nsIPhonetic) #ifdef XP_MAC #pragma mark - @@ -303,12 +299,17 @@ nsEditor::Init(nsIDOMDocument *aDoc, nsIPresShell* aPresShell, nsIContent *aRoot aSelCon->SetSelectionFlags(nsISelectionDisplay::DISPLAY_ALL);//we want to see all the selection reflected to user +#if 1 + // THIS BLOCK CAUSES ASSERTIONS because sometimes we don't yet have + // a moz-br but we do have a presshell. + // Set the selection to the beginning: //hack to get around this for now. nsCOMPtr shell = do_QueryReferent(mSelConWeak); if (shell) BeginningOfDocument(); +#endif NS_POSTCONDITION(mDocWeak && mPresShellWeak, "bad state"); diff --git a/mozilla/editor/libeditor/html/TypeInState.cpp b/mozilla/editor/libeditor/html/TypeInState.cpp index d08a6977c6d..b97c6f4bf3b 100644 --- a/mozilla/editor/libeditor/html/TypeInState.cpp +++ b/mozilla/editor/libeditor/html/TypeInState.cpp @@ -45,27 +45,7 @@ * XPCOM cruft *******************************************************************/ -NS_IMPL_ADDREF(TypeInState) -NS_IMPL_RELEASE(TypeInState) - -NS_IMETHODIMP -TypeInState::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (nsnull == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - if (aIID.Equals(NS_GET_IID(nsISupports))) { - *aInstancePtr = (void*)(nsISupports*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsISelectionListener))) { - *aInstancePtr = (void*)(nsISelectionListener*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - return NS_NOINTERFACE; -} +NS_IMPL_ISUPPORTS1(TypeInState, nsISelectionListener) /******************************************************************** * public methods diff --git a/mozilla/editor/libeditor/html/nsEditorTxnLog.cpp b/mozilla/editor/libeditor/html/nsEditorTxnLog.cpp index a45df01bb20..9e3229b588e 100644 --- a/mozilla/editor/libeditor/html/nsEditorTxnLog.cpp +++ b/mozilla/editor/libeditor/html/nsEditorTxnLog.cpp @@ -85,25 +85,7 @@ NS_IMPL_RELEASE(nsEditorTxnLog) #endif -NS_IMETHODIMP -nsEditorTxnLog::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (nsnull == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - if (aIID.Equals(kISupportsIID)) { - *aInstancePtr = (void*)(nsISupports*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsITransactionListener))) { - *aInstancePtr = (void*)(nsITransactionListener*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - *aInstancePtr = 0; - return NS_NOINTERFACE; -} +NS_IMPL_QUERY_INTERFACE1(nsEditorTxnLog, nsITransactionListener) NS_IMETHODIMP nsEditorTxnLog::WillDo(nsITransactionManager *aTxMgr, nsITransaction *aTransaction, PRBool *aInterrupt) diff --git a/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp b/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp index c7b4518484c..98f2e6b5829 100644 --- a/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp @@ -72,13 +72,7 @@ class nsHTMLEditUtils; // ================================================================== // DocumentResizeEventListener // ================================================================== -NS_IMPL_ADDREF(DocumentResizeEventListener) -NS_IMPL_RELEASE(DocumentResizeEventListener) - -NS_INTERFACE_MAP_BEGIN(DocumentResizeEventListener) - NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener) -NS_INTERFACE_MAP_END +NS_IMPL_ISUPPORTS1(DocumentResizeEventListener, nsIDOMEventListener) DocumentResizeEventListener::DocumentResizeEventListener(nsIHTMLEditor * aEditor) : mEditor(aEditor) @@ -100,13 +94,7 @@ DocumentResizeEventListener::HandleEvent(nsIDOMEvent* aMouseEvent) // ResizerSelectionListener // ================================================================== -NS_IMPL_ADDREF(ResizerSelectionListener) -NS_IMPL_RELEASE(ResizerSelectionListener) - -NS_INTERFACE_MAP_BEGIN(ResizerSelectionListener) - NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY(nsISelectionListener) -NS_INTERFACE_MAP_END +NS_IMPL_ISUPPORTS1(ResizerSelectionListener, nsISelectionListener) ResizerSelectionListener::ResizerSelectionListener(nsIHTMLEditor * aEditor) : mEditor(aEditor) @@ -135,9 +123,7 @@ ResizerSelectionListener::NotifySelectionChanged(nsIDOMDocument *, nsISelection // ResizerMouseMotionListener // ================================================================== -NS_IMPL_ADDREF(ResizerMouseMotionListener) - -NS_IMPL_RELEASE(ResizerMouseMotionListener) +NS_IMPL_ISUPPORTS2(ResizerMouseMotionListener, nsIDOMEventListener, nsIDOMMouseMotionListener) ResizerMouseMotionListener::ResizerMouseMotionListener(nsIHTMLEditor * aEditor): mEditor(aEditor) @@ -183,12 +169,6 @@ ResizerMouseMotionListener::DragMove(nsIDOMEvent* aMouseEvent) return NS_OK; } -NS_INTERFACE_MAP_BEGIN(ResizerMouseMotionListener) - NS_INTERFACE_MAP_ENTRY(nsISupports) - NS_INTERFACE_MAP_ENTRY(nsIDOMEventListener) - NS_INTERFACE_MAP_ENTRY(nsIDOMMouseMotionListener) -NS_INTERFACE_MAP_END - // ================================================================== // nsHTMLEditor // ================================================================== diff --git a/mozilla/editor/libeditor/text/nsAOLCiter.cpp b/mozilla/editor/libeditor/text/nsAOLCiter.cpp index bc0f45fd4a6..d8a0111f48a 100644 --- a/mozilla/editor/libeditor/text/nsAOLCiter.cpp +++ b/mozilla/editor/libeditor/text/nsAOLCiter.cpp @@ -54,29 +54,7 @@ nsAOLCiter::~nsAOLCiter() { } -NS_IMPL_ADDREF(nsAOLCiter) - -NS_IMPL_RELEASE(nsAOLCiter) - -NS_IMETHODIMP -nsAOLCiter::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (nsnull == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - if (aIID.Equals(NS_GET_IID(nsISupports))) - { - *aInstancePtr = (void*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsICiter))) { - *aInstancePtr = (void*)(nsICiter*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - return NS_NOINTERFACE; -} +NS_IMPL_ISUPPORTS1(nsAOLCiter, nsICiter) NS_IMETHODIMP nsAOLCiter::GetCiteString(const nsAString& aInString, nsAString& aOutString) diff --git a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp index 78f6d1de9b1..612ae674b9f 100644 --- a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp +++ b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp @@ -98,9 +98,7 @@ static NS_DEFINE_CID(kCaretCID, NS_CARET_CID); * nsTextEditorKeyListener implementation */ -NS_IMPL_ADDREF(nsTextEditorKeyListener) - -NS_IMPL_RELEASE(nsTextEditorKeyListener) +NS_IMPL_ISUPPORTS2(nsTextEditorKeyListener, nsIDOMEventListener, nsIDOMKeyListener) nsTextEditorKeyListener::nsTextEditorKeyListener() @@ -114,33 +112,6 @@ nsTextEditorKeyListener::~nsTextEditorKeyListener() } - -nsresult -nsTextEditorKeyListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (nsnull == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - if (aIID.Equals(NS_GET_IID(nsISupports))) { - *aInstancePtr = (void*)(nsISupports*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsIDOMEventListener))) { - *aInstancePtr = (void*)(nsIDOMEventListener*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsIDOMKeyListener))) { - *aInstancePtr = (void*)(nsIDOMKeyListener*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - return NS_NOINTERFACE; -} - - - nsresult nsTextEditorKeyListener::HandleEvent(nsIDOMEvent* aEvent) { @@ -311,9 +282,7 @@ nsTextEditorKeyListener::ProcessShortCutKeys(nsIDOMEvent* aKeyEvent, PRBool& aPr * nsTextEditorMouseListener implementation */ -NS_IMPL_ADDREF(nsTextEditorMouseListener) - -NS_IMPL_RELEASE(nsTextEditorMouseListener) +NS_IMPL_ISUPPORTS2(nsTextEditorMouseListener, nsIDOMEventListener, nsIDOMMouseListener) nsTextEditorMouseListener::nsTextEditorMouseListener() @@ -327,34 +296,6 @@ nsTextEditorMouseListener::~nsTextEditorMouseListener() } - -nsresult -nsTextEditorMouseListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (nsnull == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - if (aIID.Equals(NS_GET_IID(nsISupports))) { - *aInstancePtr = (void*)(nsISupports*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsIDOMEventListener))) { - *aInstancePtr = (void*)(nsIDOMEventListener*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsIDOMMouseListener))) { - *aInstancePtr = (void*)(nsIDOMMouseListener*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - return NS_NOINTERFACE; -} - - - nsresult nsTextEditorMouseListener::HandleEvent(nsIDOMEvent* aEvent) { @@ -494,9 +435,7 @@ nsTextEditorMouseListener::MouseOut(nsIDOMEvent* aMouseEvent) * nsTextEditorTextListener implementation */ -NS_IMPL_ADDREF(nsTextEditorTextListener) - -NS_IMPL_RELEASE(nsTextEditorTextListener) +NS_IMPL_ISUPPORTS2(nsTextEditorTextListener, nsIDOMEventListener, nsIDOMTextListener) nsTextEditorTextListener::nsTextEditorTextListener() @@ -506,36 +445,10 @@ nsTextEditorTextListener::nsTextEditorTextListener() } - nsTextEditorTextListener::~nsTextEditorTextListener() { } -nsresult -nsTextEditorTextListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (nsnull == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - - if (aIID.Equals(NS_GET_IID(nsISupports))) { - *aInstancePtr = (void*)(nsISupports*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsIDOMEventListener))) { - *aInstancePtr = (void*)(nsIDOMEventListener*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsIDOMTextListener))) { - *aInstancePtr = (void*)(nsIDOMTextListener*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - return NS_NOINTERFACE; -} - nsresult nsTextEditorTextListener::HandleEvent(nsIDOMEvent* aEvent) { @@ -881,34 +794,7 @@ nsTextEditorCompositionListener::~nsTextEditorCompositionListener() { } - -nsresult -nsTextEditorCompositionListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (nsnull == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - if (aIID.Equals(NS_GET_IID(nsISupports))) { - *aInstancePtr = (void*)(nsISupports*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsIDOMEventListener))) { - *aInstancePtr = (void*)(nsIDOMEventListener*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsIDOMCompositionListener))) { - *aInstancePtr = (void*)(nsIDOMCompositionListener*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - return NS_NOINTERFACE; -} - -NS_IMPL_ADDREF(nsTextEditorCompositionListener) - -NS_IMPL_RELEASE(nsTextEditorCompositionListener) +NS_IMPL_ISUPPORTS2(nsTextEditorCompositionListener, nsIDOMEventListener, nsIDOMCompositionListener) nsresult nsTextEditorCompositionListener::HandleEvent(nsIDOMEvent* aEvent) @@ -1086,9 +972,7 @@ NS_NewEditorFocusListener(nsIDOMEventListener ** aInstancePtrResult, * nsTextEditorFocusListener implementation */ -NS_IMPL_ADDREF(nsTextEditorFocusListener) - -NS_IMPL_RELEASE(nsTextEditorFocusListener) +NS_IMPL_ISUPPORTS2(nsTextEditorFocusListener, nsIDOMEventListener, nsIDOMFocusListener) nsTextEditorFocusListener::nsTextEditorFocusListener() @@ -1099,33 +983,6 @@ nsTextEditorFocusListener::~nsTextEditorFocusListener() { } -nsresult -nsTextEditorFocusListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (nsnull == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - static NS_DEFINE_IID(kIDOMFocusListenerIID, NS_IDOMFOCUSLISTENER_IID); - static NS_DEFINE_IID(kIDOMEventListenerIID, NS_IDOMEVENTLISTENER_IID); - static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - if (aIID.Equals(kISupportsIID)) { - *aInstancePtr = (void*)(nsISupports*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kIDOMEventListenerIID)) { - *aInstancePtr = (void*)(nsIDOMEventListener*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kIDOMFocusListenerIID)) { - *aInstancePtr = (void*)(nsIDOMFocusListener*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - return NS_NOINTERFACE; -} - nsresult nsTextEditorFocusListener::HandleEvent(nsIDOMEvent* aEvent) { diff --git a/mozilla/editor/libeditor/text/nsInternetCiter.cpp b/mozilla/editor/libeditor/text/nsInternetCiter.cpp index 67fc41e56ac..c4e1a0fbbd1 100644 --- a/mozilla/editor/libeditor/text/nsInternetCiter.cpp +++ b/mozilla/editor/libeditor/text/nsInternetCiter.cpp @@ -69,29 +69,7 @@ nsInternetCiter::~nsInternetCiter() { } -NS_IMPL_ADDREF(nsInternetCiter) - -NS_IMPL_RELEASE(nsInternetCiter) - -NS_IMETHODIMP -nsInternetCiter::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (nsnull == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - if (aIID.Equals(NS_GET_IID(nsISupports))) - { - *aInstancePtr = (void*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(NS_GET_IID(nsICiter))) { - *aInstancePtr = (void*)(nsICiter*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - return NS_NOINTERFACE; -} +NS_IMPL_ISUPPORTS1(nsInternetCiter, nsICiter) NS_IMETHODIMP nsInternetCiter::GetCiteString(const nsAString& aInString, nsAString& aOutString) diff --git a/mozilla/editor/libeditor/text/nsTextEditRules.cpp b/mozilla/editor/libeditor/text/nsTextEditRules.cpp index a8a24edde68..aa7767a51a2 100644 --- a/mozilla/editor/libeditor/text/nsTextEditRules.cpp +++ b/mozilla/editor/libeditor/text/nsTextEditRules.cpp @@ -116,9 +116,7 @@ nsTextEditRules::~nsTextEditRules() * XPCOM Cruft ********************************************************/ -NS_IMPL_ADDREF(nsTextEditRules) -NS_IMPL_RELEASE(nsTextEditRules) -NS_IMPL_QUERY_INTERFACE1(nsTextEditRules, nsIEditRules) +NS_IMPL_ISUPPORTS1(nsTextEditRules, nsIEditRules) /******************************************************** diff --git a/mozilla/editor/txtsvc/src/nsTSDNotifier.cpp b/mozilla/editor/txtsvc/src/nsTSDNotifier.cpp index 28e4a9e97b6..126ea1a6cd4 100644 --- a/mozilla/editor/txtsvc/src/nsTSDNotifier.cpp +++ b/mozilla/editor/txtsvc/src/nsTSDNotifier.cpp @@ -78,25 +78,7 @@ NS_IMPL_RELEASE(nsTSDNotifier) #endif -NS_IMETHODIMP -nsTSDNotifier::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (nsnull == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - if (aIID.Equals(kISupportsIID)) { - *aInstancePtr = (void*)(nsISupports*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kIEditActionListenerIID)) { - *aInstancePtr = (void*)(nsIEditActionListener*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - *aInstancePtr = 0; - return NS_NOINTERFACE; -} +NS_IMPL_QUERY_INTERFACE1(nsTSDNotifier, nsIEditActionListener) NS_IMETHODIMP nsTSDNotifier::WillInsertNode(nsIDOMNode *aNode, diff --git a/mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp b/mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp index a20bdd82da8..310c6f462d7 100644 --- a/mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp +++ b/mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp @@ -166,25 +166,7 @@ NS_IMPL_RELEASE(nsTextServicesDocument) #endif -NS_IMETHODIMP -nsTextServicesDocument::QueryInterface(REFNSIID aIID, void** aInstancePtr) -{ - if (nsnull == aInstancePtr) { - return NS_ERROR_NULL_POINTER; - } - if (aIID.Equals(kISupportsIID)) { - *aInstancePtr = (void*)(nsISupports*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - if (aIID.Equals(kITextServicesDocumentIID)) { - *aInstancePtr = (void*)(nsITextServicesDocument*)this; - NS_ADDREF_THIS(); - return NS_OK; - } - *aInstancePtr = 0; - return NS_NOINTERFACE; -} +NS_IMPL_QUERY_INTERFACE1(nsTextServicesDocument, nsITextServicesDocument) NS_IMETHODIMP nsTextServicesDocument::InitWithDocument(nsIDOMDocument *aDOMDocument, nsIPresShell *aPresShell) @@ -605,7 +587,7 @@ nsTextServicesDocument::GetCurrentTextBlock(nsString *aStr) if (!aStr) return NS_ERROR_NULL_POINTER; - aStr->SetLength(0); + aStr->Truncate(); if (!mIterator) return NS_ERROR_FAILURE; @@ -4617,7 +4599,7 @@ nsTextServicesDocument::CreateOffsetTable(nsVoidArray *aOffsetTable, ClearOffsetTable(aOffsetTable); if (aStr) - aStr->SetLength(0); + aStr->Truncate(); if (*aIteratorStatus == nsTextServicesDocument::eIsDone) return NS_OK;