mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Don't compare nsCOMPtrs against nsnull.

This commit is contained in:
rjc%netscape.com 1999-05-13 08:29:56 +00:00
Родитель 00a8fbfe13
Коммит 05ac669b96
2 изменённых файлов: 4 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
content/xul/templates/src/nsXULSortService.cpp
Просмотреть файл

@ -719,7 +719,7 @@ XULSortServiceImpl::GetNodeValue(nsIContent *node1, nsIRDFResource *sortProperty
nsCOMPtr<nsIRDFNode> target1; nsCOMPtr<nsIRDFNode> target1;
nsXPIDLCString sortPropertyURI; nsXPIDLCString sortPropertyURI;
sortInfo->sortProperty->GetValue( getter_Copies(sortPropertyURI) ); sortInfo->sortProperty->GetValue( getter_Copies(sortPropertyURI) );
if ((nsnull != sortPropertyURI) && (nsnull != res1)) if ((sortPropertyURI) && (res1))
{ {
// for any given property, first ask the graph for its value with "?collation=true" appended // for any given property, first ask the graph for its value with "?collation=true" appended
// to indicate that if there is a collation key available for this value, we want it // to indicate that if there is a collation key available for this value, we want it
@ -785,7 +785,7 @@ XULSortServiceImpl::GetNodeValue(nsIContent *node1, nsIRDFResource *sortProperty
if (cellVal1.Length() == 0) if (cellVal1.Length() == 0)
{ {
// if no collation key and no special sorting value, just get the property value // if no collation key and no special sorting value, just get the property value
if ((nsnull != res1) && (NS_SUCCEEDED(rv = (sortInfo->db)->GetTarget(res1, sortProperty, if ((res1) && (NS_SUCCEEDED(rv = (sortInfo->db)->GetTarget(res1, sortProperty,
PR_TRUE, getter_AddRefs(target1))) && (rv != NS_RDF_NO_VALUE))) PR_TRUE, getter_AddRefs(target1))) && (rv != NS_RDF_NO_VALUE)))
{ {
nsIRDFLiteral *literal1; nsIRDFLiteral *literal1;

4
rdf/content/src/nsXULSortService.cpp
Просмотреть файл

@ -719,7 +719,7 @@ XULSortServiceImpl::GetNodeValue(nsIContent *node1, nsIRDFResource *sortProperty
nsCOMPtr<nsIRDFNode> target1; nsCOMPtr<nsIRDFNode> target1;
nsXPIDLCString sortPropertyURI; nsXPIDLCString sortPropertyURI;
sortInfo->sortProperty->GetValue( getter_Copies(sortPropertyURI) ); sortInfo->sortProperty->GetValue( getter_Copies(sortPropertyURI) );
if ((nsnull != sortPropertyURI) && (nsnull != res1)) if ((sortPropertyURI) && (res1))
{ {
// for any given property, first ask the graph for its value with "?collation=true" appended // for any given property, first ask the graph for its value with "?collation=true" appended
// to indicate that if there is a collation key available for this value, we want it // to indicate that if there is a collation key available for this value, we want it
@ -785,7 +785,7 @@ XULSortServiceImpl::GetNodeValue(nsIContent *node1, nsIRDFResource *sortProperty
if (cellVal1.Length() == 0) if (cellVal1.Length() == 0)
{ {
// if no collation key and no special sorting value, just get the property value // if no collation key and no special sorting value, just get the property value
if ((nsnull != res1) && (NS_SUCCEEDED(rv = (sortInfo->db)->GetTarget(res1, sortProperty, if ((res1) && (NS_SUCCEEDED(rv = (sortInfo->db)->GetTarget(res1, sortProperty,
PR_TRUE, getter_AddRefs(target1))) && (rv != NS_RDF_NO_VALUE))) PR_TRUE, getter_AddRefs(target1))) && (rv != NS_RDF_NO_VALUE)))
{ {
nsIRDFLiteral *literal1; nsIRDFLiteral *literal1;