dbertoni 2002/10/10 19:00:34
Modified: c/src/XalanTransformer XalanDefaultParsedSource.cpp
XercesDOMParsedSource.cpp
Log:
Always pass up schema locations.
Revision Changes Path
1.15 +2 -10
xml-xalan/c/src/XalanTransformer/XalanDefaultParsedSource.cpp
Index: XalanDefaultParsedSource.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanDefaultParsedSource.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XalanDefaultParsedSource.cpp 15 Aug 2002 04:56:52 -0000 1.14
+++ XalanDefaultParsedSource.cpp 11 Oct 2002 02:00:34 -0000 1.15
@@ -184,16 +184,8 @@
m_parserLiaison.setUseValidation(fValidate);
m_parserLiaison.setEntityResolver(theEntityResolver);
m_parserLiaison.setErrorHandler(theErrorHandler);
-
- if (theExternalSchemaLocation != 0)
- {
-
m_parserLiaison.setExternalSchemaLocation(theExternalSchemaLocation);
- }
-
- if (theExternalNoNamespaceSchemaLocation != 0)
- {
-
m_parserLiaison.setExternalNoNamespaceSchemaLocation(theExternalNoNamespaceSchemaLocation);
- }
+ m_parserLiaison.setExternalSchemaLocation(theExternalSchemaLocation);
+
m_parserLiaison.setExternalNoNamespaceSchemaLocation(theExternalNoNamespaceSchemaLocation);
m_parsedSource =
m_parserLiaison.mapDocument(m_parserLiaison.parseXMLStream(theInputSource));
assert(m_parsedSource != 0);
1.13 +2 -10
xml-xalan/c/src/XalanTransformer/XercesDOMParsedSource.cpp
Index: XercesDOMParsedSource.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XercesDOMParsedSource.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XercesDOMParsedSource.cpp 15 Aug 2002 04:56:52 -0000 1.12
+++ XercesDOMParsedSource.cpp 11 Oct 2002 02:00:34 -0000 1.13
@@ -114,16 +114,8 @@
m_parserLiaison.setUseValidation(fValidate);
m_parserLiaison.setEntityResolver(theEntityResolver);
m_parserLiaison.setErrorHandler(theErrorHandler);
-
- if (theExternalSchemaLocation != 0)
- {
-
m_parserLiaison.setExternalSchemaLocation(theExternalSchemaLocation);
- }
-
- if (theExternalNoNamespaceSchemaLocation != 0)
- {
-
m_parserLiaison.setExternalNoNamespaceSchemaLocation(theExternalNoNamespaceSchemaLocation);
- }
+ m_parserLiaison.setExternalSchemaLocation(theExternalSchemaLocation);
+
m_parserLiaison.setExternalNoNamespaceSchemaLocation(theExternalNoNamespaceSchemaLocation);
m_parsedSource = m_parserLiaison.parseXMLStream(theInputSource);
assert(m_parsedSource != 0);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]