Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 233481 - change nsAutoCompleteMdbResult to use nsCOMArray<nsIMdbRow> instead of nsVoidArray, patch by Patrick McCormick (patrick@meer.net), r=bryner, sr=blake

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@157122 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mconnor%myrealbox.com
2004-05-30 15:42:15 +00:00
parent 9595bc2d7e
commit 7297f133b2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/toolkit/components/autocomplete/src/nsAutoCompleteMdbResult.cpp
View File

@@ -103,7 +103,7 @@ nsAutoCompleteMdbResult::GetValueAt(PRInt32 aIndex, nsAString & _retval)
{
NS_ENSURE_TRUE(aIndex >= 0 && aIndex < mResults.Count(), NS_ERROR_ILLEGAL_VALUE);
nsIMdbRow *row = NS_STATIC_CAST(nsIMdbRow *, mResults.ElementAt(aIndex));
nsIMdbRow *row = mResults.ObjectAt(aIndex);
if (!row) return NS_OK;
if (mValueType == kUnicharType) {
@@ -130,7 +130,7 @@ nsAutoCompleteMdbResult::GetCommentAt(PRInt32 aIndex, nsAString & _retval)
{
NS_ENSURE_TRUE(aIndex >= 0 && aIndex < mResults.Count(), NS_ERROR_ILLEGAL_VALUE);
nsIMdbRow *row = NS_STATIC_CAST(nsIMdbRow *, mResults.ElementAt(aIndex));
nsIMdbRow *row = mResults.ObjectAt(aIndex);
if (!row) return NS_OK;
if (mCommentType == kUnicharType) {
@@ -205,17 +205,17 @@ nsAutoCompleteMdbResult::SetTokens(mdb_scope aValueToken, PRInt16 aValueType, md
NS_IMETHODIMP
nsAutoCompleteMdbResult::AddRow(nsIMdbRow *aRow)
{
mResults.AppendElement((void *)aRow);
mResults.AppendObject(aRow);
return NS_OK;
}
NS_IMETHODIMP
nsAutoCompleteMdbResult::RemoveRowAt(PRUint32 aRowIndex, PRBool aRemoveFromDb)
{
nsIMdbRow *row = (nsIMdbRow *)mResults.ElementAt(aRowIndex);
nsIMdbRow *row = mResults.ObjectAt(aRowIndex);
NS_ENSURE_TRUE(row, NS_ERROR_INVALID_ARG);
mResults.RemoveElementAt(aRowIndex);
mResults.RemoveObjectAt(aRowIndex);
if (aRemoveFromDb && mTable && mEnv) {
mdb_err err = mTable->CutRow(mEnv, row);
@@ -228,7 +228,7 @@ nsAutoCompleteMdbResult::RemoveRowAt(PRUint32 aRowIndex, PRBool aRemoveFromDb)
NS_IMETHODIMP
nsAutoCompleteMdbResult::GetRowAt(PRUint32 aRowIndex, nsIMdbRow **aRow)
{
*aRow = (nsIMdbRow *)mResults.ElementAt(aRowIndex);
*aRow = mResults.ObjectAt(aRowIndex);
return NS_OK;
}

4
mozilla/toolkit/components/autocomplete/src/nsAutoCompleteMdbResult.h
View File

@@ -41,7 +41,7 @@
#include "nsIAutoCompleteResult.h"
#include "nsIAutoCompleteResultTypes.h"
#include "nsString.h"
#include "nsVoidArray.h"
#include "nsArray.h"
#include "mdb.h"
class nsAutoCompleteMdbResult : public nsIAutoCompleteMdbResult
@@ -57,7 +57,7 @@ public:
NS_DECL_NSIAUTOCOMPLETEMDBRESULT
protected:
nsAutoVoidArray mResults;
nsCOMArray<nsIMdbRow> mResults;
nsAutoString mSearchString;
nsAutoString mErrorDescription;