Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Checking in Scott Putterman's changes to use nsISupportsArray instead of a void array.

Browse Source
This commit is contained in:
rjc%netscape.com 1999-04-23 08:32:42 +00:00
parent 480f5a3db6
commit 857cea3cdf
3 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
content/xul/templates/src/nsXULTemplateBuilder.cpp
View File

@ -484,8 +484,9 @@ RDFGenericBuilderImpl::CreateContents(nsIContent* aElement)
return rv;
// rjc - sort
nsVoidArray *tempArray;
if ((tempArray = new nsVoidArray()) == nsnull) return (NS_ERROR_OUT_OF_MEMORY);
nsISupportsArray *tempArray;
if (NS_FAILED(rv = NS_NewISupportsArray(&tempArray)))
return(rv);
while (1) {
rv = properties->Advance();
@ -573,10 +574,19 @@ RDFGenericBuilderImpl::CreateContents(nsIContent* aElement)
NS_ERROR("unable to create widget item");
}
}
for (int i = numElements - 1; i >=0; i--)
{
NS_IF_RELEASE(flatArray[i]);
}
delete [] flatArray;
}
}
delete tempArray;
for (int i = numElements - 1; i >= 0; i--)
{
tempArray->RemoveElementAt(i);
}
NS_IF_RELEASE(tempArray);
return NS_OK;
}

16
rdf/content/src/nsRDFGenericBuilder.cpp
View File

@ -484,8 +484,9 @@ RDFGenericBuilderImpl::CreateContents(nsIContent* aElement)
return rv;
// rjc - sort
nsVoidArray *tempArray;
if ((tempArray = new nsVoidArray()) == nsnull) return (NS_ERROR_OUT_OF_MEMORY);
nsISupportsArray *tempArray;
if (NS_FAILED(rv = NS_NewISupportsArray(&tempArray)))
return(rv);
while (1) {
rv = properties->Advance();
@ -573,10 +574,19 @@ RDFGenericBuilderImpl::CreateContents(nsIContent* aElement)
NS_ERROR("unable to create widget item");
}
}
for (int i = numElements - 1; i >=0; i--)
{
NS_IF_RELEASE(flatArray[i]);
}
delete [] flatArray;
}
}
delete tempArray;
for (int i = numElements - 1; i >= 0; i--)
{
tempArray->RemoveElementAt(i);
}
NS_IF_RELEASE(tempArray);
return NS_OK;
}

16
rdf/content/src/nsXULTemplateBuilder.cpp
View File

@ -484,8 +484,9 @@ RDFGenericBuilderImpl::CreateContents(nsIContent* aElement)
return rv;
// rjc - sort
nsVoidArray *tempArray;
if ((tempArray = new nsVoidArray()) == nsnull) return (NS_ERROR_OUT_OF_MEMORY);
nsISupportsArray *tempArray;
if (NS_FAILED(rv = NS_NewISupportsArray(&tempArray)))
return(rv);
while (1) {
rv = properties->Advance();
@ -573,10 +574,19 @@ RDFGenericBuilderImpl::CreateContents(nsIContent* aElement)
NS_ERROR("unable to create widget item");
}
}
for (int i = numElements - 1; i >=0; i--)
{
NS_IF_RELEASE(flatArray[i]);
}
delete [] flatArray;
}
}
delete tempArray;
for (int i = numElements - 1; i >= 0; i--)
{
tempArray->RemoveElementAt(i);
}
NS_IF_RELEASE(tempArray);
return NS_OK;
}