dbertoni 02/04/04 19:46:33
Modified: c/src/XalanTransformer XalanDefaultParsedSource.cpp
XalanDefaultParsedSource.hpp
XercesDOMParsedSource.cpp XercesDOMParsedSource.hpp
Log:
Changed constructor to accept InputSource instead of XSLTInputSource.
Revision Changes Path
1.9 +9 -5
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XalanDefaultParsedSource.cpp 2 Mar 2002 07:15:24 -0000 1.8
+++ XalanDefaultParsedSource.cpp 5 Apr 2002 03:46:33 -0000 1.9
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,6 +58,10 @@
+#include <xercesc/sax/InputSource.hpp>
+
+
+
#include <XalanDOM/XalanDocument.hpp>
@@ -172,10 +176,10 @@
XalanDefaultParsedSource::XalanDefaultParsedSource(
- const XSLTInputSource& theInputSource,
- bool fValidate,
- ErrorHandler* theErrorHandler,
- EntityResolver* theEntityResolver) :
+ const InputSource& theInputSource,
+ bool fValidate,
+ ErrorHandler* theErrorHandler,
+ EntityResolver* theEntityResolver) :
XalanParsedSource(),
m_domSupport(),
m_parserLiaison(m_domSupport),
1.10 +6 -9
xml-xalan/c/src/XalanTransformer/XalanDefaultParsedSource.hpp
Index: XalanDefaultParsedSource.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanDefaultParsedSource.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XalanDefaultParsedSource.hpp 4 Jan 2002 00:59:51 -0000 1.9
+++ XalanDefaultParsedSource.hpp 5 Apr 2002 03:46:33 -0000 1.10
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,16 +69,13 @@
-#include <XSLT/XSLTInputSource.hpp>
-
-
-
#include <XalanTransformer/XalanParsedSource.hpp>
class EntityResolver;
class ErrorHandler;
+class XSLTInputSource;
class XalanSourceTreeDocument;
@@ -159,10 +156,10 @@
public:
XalanDefaultParsedSource(
- const XSLTInputSource& theInputSource,
- bool fValidate =
false,
- ErrorHandler* theErrorHandler = 0,
- EntityResolver* theEntityResolver = 0);
+ const InputSource& theInputSource,
+ bool fValidate = false,
+ ErrorHandler* theErrorHandler = 0,
+ EntityResolver* theEntityResolver = 0);
virtual
~XalanDefaultParsedSource();
1.8 +8 -4
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesDOMParsedSource.cpp 14 Dec 2001 20:02:29 -0000 1.7
+++ XercesDOMParsedSource.cpp 5 Apr 2002 03:46:33 -0000 1.8
@@ -58,6 +58,10 @@
+#include <xercesc/sax/InputSource.hpp>
+
+
+
#include <XalanDOM/XalanDocument.hpp>
@@ -98,10 +102,10 @@
XercesDOMParsedSource::XercesDOMParsedSource(
- const XSLTInputSource& theInputSource,
- bool fValidate,
- ErrorHandler* theErrorHandler,
- EntityResolver* theEntityResolver):
+ const InputSource& theInputSource,
+ bool fValidate,
+ ErrorHandler* theErrorHandler,
+ EntityResolver* theEntityResolver):
XalanParsedSource(),
m_parserLiaison(),
m_parsedSource(0)
1.7 +5 -8
xml-xalan/c/src/XalanTransformer/XercesDOMParsedSource.hpp
Index: XercesDOMParsedSource.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XercesDOMParsedSource.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesDOMParsedSource.hpp 7 Nov 2001 04:04:27 -0000 1.6
+++ XercesDOMParsedSource.hpp 5 Apr 2002 03:46:33 -0000 1.7
@@ -69,16 +69,13 @@
-#include <XSLT/XSLTInputSource.hpp>
-
-
-
#include <XalanTransformer/XalanParsedSource.hpp>
class EntityResolver;
class ErrorHandler;
+class InputSource;
@@ -91,10 +88,10 @@
public:
XercesDOMParsedSource(
- const XSLTInputSource& theInputSource,
- bool fValidate =
false,
- ErrorHandler* theErrorHandler = 0,
- EntityResolver* theEntityResolver = 0);
+ const InputSource& theInputSource,
+ bool fValidate = false,
+ ErrorHandler* theErrorHandler = 0,
+ EntityResolver* theEntityResolver = 0);
virtual
~XercesDOMParsedSource();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
