Author: amassari
Date: Tue May 30 02:04:37 2006
New Revision: 410225
URL: http://svn.apache.org/viewvc?rev=410225&view=rev
Log:
DGXMLScanner was treating predefined entities inside attribute values as if
they were in the element content (jira#1597)
Modified:
xerces/c/trunk/src/xercesc/internal/DGXMLScanner.cpp
Modified: xerces/c/trunk/src/xercesc/internal/DGXMLScanner.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/DGXMLScanner.cpp?rev=410225&r1=410224&r2=410225&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/DGXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/DGXMLScanner.cpp Tue May 30 02:04:37
2006
@@ -2534,11 +2534,6 @@
gotLeadingSurrogate = false;
continue;
}
- else
- {
- if (escaped && !fElemStack.isEmpty())
- fElemStack.setReferenceEscaped();
- }
}
else if ((nextCh >= 0xD800) && (nextCh <= 0xDBFF))
{
@@ -2904,6 +2899,11 @@
{
gotLeadingSurrogate = false;
continue;
+ }
+ else
+ {
+ if (escaped && !fElemStack.isEmpty())
+ fElemStack.setReferenceEscaped();
}
}
else if ((nextCh >= 0xD800) && (nextCh <= 0xDBFF))
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
