From b79fe3c6df9a87fa9fc38a4e7c681a2cdd7f2db6 Mon Sep 17 00:00:00 2001 From: "aaronr%us.ibm.com" Date: Mon, 11 Dec 2006 22:14:11 +0000 Subject: [PATCH] [XForms] incorrect dup schema error message using inline schemas. Bug 350067, patch by msterlin, r=olli+aaronr git-svn-id: svn://10.0.0.236/trunk@216861 18797224-902f-48f8-a5cc-f745e15eee43 --- .../extensions/xforms/nsXFormsModelElement.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/mozilla/extensions/xforms/nsXFormsModelElement.cpp b/mozilla/extensions/xforms/nsXFormsModelElement.cpp index 6774167ef76..2e2cab152db 100644 --- a/mozilla/extensions/xforms/nsXFormsModelElement.cpp +++ b/mozilla/extensions/xforms/nsXFormsModelElement.cpp @@ -842,15 +842,12 @@ nsXFormsModelElement::InitializeInstances() // document has finished loading. mPendingInlineSchemas.AppendString(id); } else { - if (!IsDuplicateSchema(el)) { - nsCOMPtr schema; - // no need to observe errors via the callback. instead, rely on - // this method returning a failure code when it encounters errors. - rv = mSchemas->ProcessSchemaElement(el, nsnull, - getter_AddRefs(schema)); - if (NS_SUCCEEDED(rv)) - mSchemaCount++; - } + // We have an inline schema in the model element that was + // referenced by the schema attribute. It will be processed + // in FinishConstruction so we skip it now to avoid processing + // it twice and giving invalid 'duplicate schema' errors. + mSchemaTotal--; + i--; } } else { nsCAutoString uriSpec;