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

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@28824 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rjc%netscape.com
1999-04-23 08:32:42 +00:00
parent f0875fc0f3
commit 4cc70a8b0d
3 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/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
mozilla/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
mozilla/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;
}