From d95498c492c38986a4a43658a0c55d8c3368c506 Mon Sep 17 00:00:00 2001 From: "rjc%netscape.com" Date: Thu, 9 Sep 1999 00:58:08 +0000 Subject: [PATCH] Add check for NS_RDF_NO_VALUE. --- content/xul/templates/src/nsXULTemplateBuilder.cpp | 2 +- rdf/content/src/nsRDFGenericBuilder.cpp | 2 +- rdf/content/src/nsXULTemplateBuilder.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/xul/templates/src/nsXULTemplateBuilder.cpp b/content/xul/templates/src/nsXULTemplateBuilder.cpp index b5aaaad7f80..5fe11b03fc9 100644 --- a/content/xul/templates/src/nsXULTemplateBuilder.cpp +++ b/content/xul/templates/src/nsXULTemplateBuilder.cpp @@ -1563,7 +1563,7 @@ RDFGenericBuilderImpl::GetSubstitutionText(nsIRDFResource* aResource, rv = mDB->GetTarget(aResource, property, PR_TRUE, getter_AddRefs(valueNode)); if (NS_FAILED(rv)) return rv; - if (valueNode) { + if ((rv != NS_RDF_NO_VALUE) && (valueNode)) { rv = gXULUtils->GetTextForNode(valueNode, aResult); if (NS_FAILED(rv)) return rv; } diff --git a/rdf/content/src/nsRDFGenericBuilder.cpp b/rdf/content/src/nsRDFGenericBuilder.cpp index b5aaaad7f80..5fe11b03fc9 100644 --- a/rdf/content/src/nsRDFGenericBuilder.cpp +++ b/rdf/content/src/nsRDFGenericBuilder.cpp @@ -1563,7 +1563,7 @@ RDFGenericBuilderImpl::GetSubstitutionText(nsIRDFResource* aResource, rv = mDB->GetTarget(aResource, property, PR_TRUE, getter_AddRefs(valueNode)); if (NS_FAILED(rv)) return rv; - if (valueNode) { + if ((rv != NS_RDF_NO_VALUE) && (valueNode)) { rv = gXULUtils->GetTextForNode(valueNode, aResult); if (NS_FAILED(rv)) return rv; } diff --git a/rdf/content/src/nsXULTemplateBuilder.cpp b/rdf/content/src/nsXULTemplateBuilder.cpp index b5aaaad7f80..5fe11b03fc9 100644 --- a/rdf/content/src/nsXULTemplateBuilder.cpp +++ b/rdf/content/src/nsXULTemplateBuilder.cpp @@ -1563,7 +1563,7 @@ RDFGenericBuilderImpl::GetSubstitutionText(nsIRDFResource* aResource, rv = mDB->GetTarget(aResource, property, PR_TRUE, getter_AddRefs(valueNode)); if (NS_FAILED(rv)) return rv; - if (valueNode) { + if ((rv != NS_RDF_NO_VALUE) && (valueNode)) { rv = gXULUtils->GetTextForNode(valueNode, aResult); if (NS_FAILED(rv)) return rv; }