From b428562cf922a06bb8b7720dee364cccbaefb2c2 Mon Sep 17 00:00:00 2001 From: "doronr%us.ibm.com" Date: Tue, 1 Mar 2005 16:15:34 +0000 Subject: [PATCH] XForms bug 284169 - get rid of WARNING's in console generated by GetTypeForControl. Patch by aaronr@us.ibm.com, r=beaufour,allan git-svn-id: svn://10.0.0.236/trunk@170043 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/xforms/nsXFormsModelElement.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mozilla/extensions/xforms/nsXFormsModelElement.cpp b/mozilla/extensions/xforms/nsXFormsModelElement.cpp index 02475c70639..907e48aadcb 100644 --- a/mozilla/extensions/xforms/nsXFormsModelElement.cpp +++ b/mozilla/extensions/xforms/nsXFormsModelElement.cpp @@ -773,7 +773,12 @@ nsXFormsModelElement::GetTypeForControl(nsIXFormsControl *aControl, nsCOMPtr boundNode; aControl->GetBoundNode(getter_AddRefs(boundNode)); - NS_ENSURE_TRUE(boundNode, NS_ERROR_FAILURE); + if (!boundNode) { + // if the control isn't bound to instance data, it doesn't make sense to + // return a type. It is perfectly valid for there to be no bound node, + // so no need to use an NS_ENSURE_xxx macro, either. + return NS_ERROR_FAILURE; + } nsAutoString schemaTypeName, schemaTypeNamespace; nsresult rv = GetTypeAndNSFromNode(boundNode, schemaTypeName,