You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2006/05/30 11:29:55 UTC
svn commit: r410231 -
/xerces/c/branches/xerces-2.7/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
Author: amassari
Date: Tue May 30 02:29:54 2006
New Revision: 410231
URL: http://svn.apache.org/viewvc?rev=410231&view=rev
Log:
SAX2XMLReader should use the prefix reported by the reader, not the one stored in the elment declaration (jira#1598)
Modified:
xerces/c/branches/xerces-2.7/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
Modified: xerces/c/branches/xerces-2.7/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/parsers/SAX2XMLReaderImpl.cpp?rev=410231&r1=410230&r2=410231&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/parsers/SAX2XMLReaderImpl.cpp (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/parsers/SAX2XMLReaderImpl.cpp Tue May 30 02:29:54 2006
@@ -694,8 +694,8 @@
if (fDocHandler)
{
- const XMLCh* const elemQName =
- elemDecl.getFullName();
+ QName element(elemPrefix, elemDecl.getBaseName(), elemURLId, fMemoryManager);
+ const XMLCh* const elemQName = element.getRawName();
if (getDoNamespaces())
{
@@ -814,6 +814,9 @@
, const bool isRoot
, const XMLCh* const elemPrefix)
{
+ QName element(elemPrefix, elemDecl.getBaseName(), uriId, fMemoryManager);
+ const XMLCh* const elemQName = element.getRawName();
+
// Just map to the SAX document handler
if (fDocHandler)
{
@@ -825,7 +828,7 @@
(
fScanner->getURIText(uriId)
, elemDecl.getBaseName()
- , elemDecl.getFullName()
+ , elemQName
);
unsigned int numPrefix = fPrefixCounts->pop();
@@ -837,9 +840,12 @@
}
else
{
- fDocHandler->endElement(XMLUni::fgZeroLenString,
- elemDecl.getBaseName(),
- elemDecl.getFullName() );
+ fDocHandler->endElement
+ (
+ XMLUni::fgZeroLenString,
+ elemDecl.getBaseName(),
+ elemQName
+ );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org