diff --git a/src/xercesc/parsers/DOMLSParserImpl.cpp b/src/xercesc/parsers/DOMLSParserImpl.cpp index b6f70a4d63ef4e020a62d185a529e9ad717a901f..53e9709c8470de5165b7494ec0066c5255a94a37 100644 --- a/src/xercesc/parsers/DOMLSParserImpl.cpp +++ b/src/xercesc/parsers/DOMLSParserImpl.cpp @@ -76,8 +76,6 @@ DOMLSParserImpl::DOMLSParserImpl( XMLValidator* const valToAdopt , XMLGrammarPool* const gramPool) : AbstractDOMParser(valToAdopt, manager, gramPool) -, fAutoValidation(false) -, fValidation(false) , fEntityResolver(0) , fXMLEntityResolver(0) , fErrorHandler(0) @@ -257,9 +255,7 @@ void DOMLSParserImpl::setParameter(const XMLCh* name, bool state) } else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidate) == 0) { - fValidation = state; - - if (fValidation) { + if (state) { if (getValidationScheme() == AbstractDOMParser::Val_Never) setValidationScheme(AbstractDOMParser::Val_Always); } @@ -269,9 +265,7 @@ void DOMLSParserImpl::setParameter(const XMLCh* name, bool state) } else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidateIfSchema) == 0) { - fAutoValidation = state; - - if (fAutoValidation) { + if (state) { setValidationScheme(AbstractDOMParser::Val_Auto); } else { @@ -442,11 +436,11 @@ const void* DOMLSParserImpl::getParameter(const XMLCh* name) const } else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidate) == 0) { - return (void*)fValidation; + return (void*)(getValidationScheme() != AbstractDOMParser::Val_Never); } else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMValidateIfSchema) == 0) { - return (void*)fAutoValidation; + return (void*)(getValidationScheme() == AbstractDOMParser::Val_Auto); } else if (XMLString::compareIStringASCII(name, XMLUni::fgDOMWellFormed) == 0) { diff --git a/src/xercesc/parsers/DOMLSParserImpl.hpp b/src/xercesc/parsers/DOMLSParserImpl.hpp index 703b77c22bb82f542d0694fe8e60f6bfc46eddf2..23e867655f04c636f34cee216ea50fc8be613338 100644 --- a/src/xercesc/parsers/DOMLSParserImpl.hpp +++ b/src/xercesc/parsers/DOMLSParserImpl.hpp @@ -584,13 +584,6 @@ private : // ----------------------------------------------------------------------- // Private data members // - // fAutoValidation - // Whether validation will be enabled in case a schema reference is found - // - // fValidation - // Whether validation will be enabled (if fAutoValidation has been set, - // setting it is a no-op) - // // fEntityResolver // The installed DOM entity resolver, if any. Null if none. // @@ -615,8 +608,6 @@ private : // A list of the parameters that can be set, including the ones // specific of Xerces //----------------------------------------------------------------------- - bool fAutoValidation; - bool fValidation; DOMLSResourceResolver* fEntityResolver; XMLEntityResolver* fXMLEntityResolver; DOMErrorHandler* fErrorHandler;