From a3d406763f26f9657dd33c381751c72e6e8e4c1f Mon Sep 17 00:00:00 2001 From: "mjudge%netscape.com" Date: Fri, 11 Dec 1998 01:40:01 +0000 Subject: [PATCH] changing symantecs around and making the enumerator return the proper nsISupports git-svn-id: svn://10.0.0.236/trunk@16197 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/src/nsRangeList.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mozilla/layout/base/src/nsRangeList.cpp b/mozilla/layout/base/src/nsRangeList.cpp index a780330466f..bf37f4d03d4 100644 --- a/mozilla/layout/base/src/nsRangeList.cpp +++ b/mozilla/layout/base/src/nsRangeList.cpp @@ -4,7 +4,7 @@ #include "nsIDOMRange.h" #include "nsISelection.h" -static NS_DEFINE_IID(kIRangeListIterator, NS_IENUMERATOR_IID); +static NS_DEFINE_IID(kIEnumeratorIID, NS_IENUMERATOR_IID); static NS_DEFINE_IID(kICollectionIID, NS_ICOLLECTION_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kISelectionIID, NS_ISELECTION_IID); @@ -211,8 +211,8 @@ nsRangeListIterator::QueryInterface(REFNSIID aIID, void** aInstancePtr) return NS_ERROR_NULL_POINTER; } if (aIID.Equals(kISupportsIID)) { - *aInstancePtr = (void*)(nsISupports*)this; - NS_ADDREF_THIS(); + *aInstancePtr = (void*)(nsISupports*)mRangeList; + NS_ADDREF(mRangeList); return NS_OK; } if (aIID.Equals(kICollectionIID)) { @@ -220,7 +220,7 @@ nsRangeListIterator::QueryInterface(REFNSIID aIID, void** aInstancePtr) NS_ADDREF(mRangeList); return NS_OK; } - if (aIID.Equals(kIRangeListIterator)) { + if (aIID.Equals(kIEnumeratorIID)) { *aInstancePtr = (void*)(nsIEnumerator*)this; NS_ADDREF_THIS(); return NS_OK; @@ -310,9 +310,9 @@ nsRangeList::QueryInterface(REFNSIID aIID, void** aInstancePtr) NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(kIRangeListIterator)) { + if (aIID.Equals(kIEnumeratorIID)) { nsRangeListIterator *iterator = new nsRangeListIterator(this); - iterator->QueryInterface(kIRangeListIterator,aInstancePtr); + iterator->QueryInterface(kIEnumeratorIID,aInstancePtr); *aInstancePtr = (void*)(iterator); return NS_OK; }