dbertoni 00/12/28 19:23:26
Modified: c/src/XalanSourceTree XalanSourceTreeContentHandler.cpp
XalanSourceTreeContentHandler.hpp
XalanSourceTreeDocument.cpp
XalanSourceTreeParserLiaison.cpp
Log:
Updates for latest Xerces code.
Revision Changes Path
1.3 +1 -5
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeContentHandler.cpp
Index: XalanSourceTreeContentHandler.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeContentHandler.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeContentHandler.cpp 2000/12/17 22:26:59 1.2
+++ XalanSourceTreeContentHandler.cpp 2000/12/29 03:23:26 1.3
@@ -421,11 +421,7 @@
const Attributes& attrs,
XalanSourceTreeElement* theOwnerElement)
{
-#if 1
- if (equals(uri, XALAN_STATIC_UCODE_STRING("EMPTY")) == false)
-#else
- if (uri != 0 && length(uri) != 0)
-#endif
+ if (length(uri) != 0)
{
return m_document->createElementNode(uri, localname, qname,
attrs, theOwnerElement);
}
1.3 +0 -12
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeContentHandler.hpp
Index: XalanSourceTreeContentHandler.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeContentHandler.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanSourceTreeContentHandler.hpp 2000/12/17 22:26:59 1.2
+++ XalanSourceTreeContentHandler.hpp 2000/12/29 03:23:26 1.3
@@ -70,19 +70,7 @@
#include <sax/DocumentHandler.hpp>
#include <sax/DTDHandler.hpp>
#include <sax2/ContentHandler.hpp>
-
-#if defined(XALAN_XERCES_HAS_LEXICAL_HANDLER)
#include <sax2/LexicalHandler.hpp>
-#else
-
-class XALAN_XALANSOURCETREE_EXPORT LexicalHandler
-{
-public:
-
- LexicalHandler() {}
-};
-
-#endif
1.4 +1 -5
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocument.cpp
Index: XalanSourceTreeDocument.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeDocument.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanSourceTreeDocument.cpp 2000/12/21 04:27:24 1.3
+++ XalanSourceTreeDocument.cpp 2000/12/29 03:23:26 1.4
@@ -910,11 +910,7 @@
const XalanDOMChar* const theURI =
theAttributes.getURI(i);
-#if 1
- if (equals(theURI, XALAN_STATIC_UCODE_STRING("EMPTY")) == true)
-#else
- if (theURI == 0 || length(theURI) == 0)
-#endif
+ if (length(theURI) == 0)
{
theAttributeVector[i] =
m_attributeAllocator.create(
1.4 +0 -2
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.cpp
Index: XalanSourceTreeParserLiaison.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeParserLiaison.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanSourceTreeParserLiaison.cpp 2000/12/17 22:52:23 1.3
+++ XalanSourceTreeParserLiaison.cpp 2000/12/29 03:23:26 1.4
@@ -159,9 +159,7 @@
theReader->setErrorHandler(&m_xercesParserLiaison);
-#if defined(XALAN_XERCES_HAS_LEXICAL_HANDLER)
theReader->setLexicalHandler(&theContentHandler);
-#endif
theReader->parse(inputSource);
