From e3fc2058ffebb140ccaa3446b3cec496e36754b4 Mon Sep 17 00:00:00 2001
From: Khaled Noaman <knoaman@apache.org>
Date: Wed, 17 Dec 2003 21:39:57 +0000
Subject: [PATCH] PSVI: Use complex type info if present, otherwise use
datatype validator
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@175600 13f79535-47bb-0310-9956-ffa450edef68
---
src/xercesc/internal/IGXMLScanner.cpp | 10 +++++-----
src/xercesc/internal/SGXMLScanner.cpp | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/xercesc/internal/IGXMLScanner.cpp b/src/xercesc/internal/IGXMLScanner.cpp
index 440fb4e2b..05f382c47 100644
--- a/src/xercesc/internal/IGXMLScanner.cpp
+++ b/src/xercesc/internal/IGXMLScanner.cpp
@@ -3476,11 +3476,11 @@ void IGXMLScanner::endElementPSVI(SchemaElementDecl* const elemDecl,
? PSVIElement::VALIDITY_INVALID : PSVIElement::VALIDITY_VALID;
}
- XSTypeDefinition* typeDef = (fPSVIElemContext.fCurrentDV)
- ? (XSTypeDefinition*) fModel->getXSObject(fPSVIElemContext.fCurrentDV)
- : (fPSVIElemContext.fCurrentTypeInfo)
- ? (XSTypeDefinition*) fModel->getXSObject(fPSVIElemContext.fCurrentTypeInfo)
- : 0;
+ XSTypeDefinition* typeDef = 0;
+ if (fPSVIElemContext.fCurrentTypeInfo)
+ typeDef = (XSTypeDefinition*) fModel->getXSObject(fPSVIElemContext.fCurrentTypeInfo);
+ else if (fPSVIElemContext.fCurrentDV)
+ typeDef = (XSTypeDefinition*) fModel->getXSObject(fPSVIElemContext.fCurrentDV);
XMLCh* canonicalValue = 0;
if (fPSVIElemContext.fNormalizedValue )
diff --git a/src/xercesc/internal/SGXMLScanner.cpp b/src/xercesc/internal/SGXMLScanner.cpp
index e5fe63604..dea53b163 100644
--- a/src/xercesc/internal/SGXMLScanner.cpp
+++ b/src/xercesc/internal/SGXMLScanner.cpp
@@ -4886,11 +4886,11 @@ void SGXMLScanner::endElementPSVI(SchemaElementDecl* const elemDecl,
? PSVIElement::VALIDITY_INVALID : PSVIElement::VALIDITY_VALID;
}
- XSTypeDefinition* typeDef = (fPSVIElemContext.fCurrentDV)
- ? (XSTypeDefinition*) fModel->getXSObject(fPSVIElemContext.fCurrentDV)
- : (fPSVIElemContext.fCurrentTypeInfo)
- ? (XSTypeDefinition*) fModel->getXSObject(fPSVIElemContext.fCurrentTypeInfo)
- : 0;
+ XSTypeDefinition* typeDef = 0;
+ if (fPSVIElemContext.fCurrentTypeInfo)
+ typeDef = (XSTypeDefinition*) fModel->getXSObject(fPSVIElemContext.fCurrentTypeInfo);
+ else if (fPSVIElemContext.fCurrentDV)
+ typeDef = (XSTypeDefinition*) fModel->getXSObject(fPSVIElemContext.fCurrentDV);
XMLCh* canonicalValue = 0;
if (fPSVIElemContext.fNormalizedValue)
--
GitLab