dbertoni 00/03/20 19:22:51
Modified: c/Projects/Win32/VC6/XSLT XSLT.dsp
c/src/DOMSupport UnimplementedElement.cpp
UnimplementedElement.hpp
c/src/PlatformSupport PrintWriter.hpp Writer.hpp
c/src/XMLSupport FormatterListener.hpp FormatterToDOM.cpp
FormatterToDOM.hpp FormatterToText.cpp
FormatterToText.hpp FormatterToXML.cpp
FormatterToXML.hpp
c/src/XSLT StylesheetHandler.cpp StylesheetHandler.hpp
XSLTEngineImpl.cpp XSLTEngineImpl.hpp
Log:
Various fixes for Xerces interface changes.
Revision Changes Path
1.5 +1 -1 xml-xalan/c/Projects/Win32/VC6/XSLT/XSLT.dsp
Index: XSLT.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC6/XSLT/XSLT.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSLT.dsp 2000/02/17 20:24:07 1.4
+++ XSLT.dsp 2000/03/21 03:22:40 1.5
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32
..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug\xerces-c_1.lib
..\..\..\..\Build\Win32\VC6\Debug\PlatformSupport.lib
..\..\..\..\Build\Win32\VC6\Debug\XercesPlatformSupport.lib
..\..\..\..\Build\Win32\VC6\Debug\XPath.lib
..\..\..\..\Build\Win32\VC6\Debug\XMLSupport.lib
..\..\..\..\Build\Win32\VC6\Debug\DOMSupport.lib
..\..\..\..\Build\Win32\VC6\Debug\XercesParserLiaison.lib /nologo /dll /debug
/machine:I386 /pdbtype:sept
+# ADD LINK32
..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug\xerces-c_1.lib
..\..\..\..\Build\Win32\VC6\Debug\PlatformSupport.lib
..\..\..\..\Build\Win32\VC6\Debug\XercesPlatformSupport.lib
..\..\..\..\Build\Win32\VC6\Debug\XPath.lib
..\..\..\..\Build\Win32\VC6\Debug\XMLSupport.lib
..\..\..\..\Build\Win32\VC6\Debug\DOMSupport.lib /nologo /dll /debug
/machine:I386 /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF
1.5 +3 -1 xml-xalan/c/src/DOMSupport/UnimplementedElement.cpp
Index: UnimplementedElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/UnimplementedElement.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UnimplementedElement.cpp 2000/02/17 20:26:38 1.4
+++ UnimplementedElement.cpp 2000/03/21 03:22:42 1.5
@@ -410,12 +410,14 @@
-void
+AttrImpl*
UnimplementedElement::setAttribute(
const DOMString& /* name */,
const DOMString& /* value */)
{
assert(false);
+
+ return 0;
}
1.6 +1 -1 xml-xalan/c/src/DOMSupport/UnimplementedElement.hpp
Index: UnimplementedElement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/UnimplementedElement.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UnimplementedElement.hpp 2000/02/23 20:23:10 1.5
+++ UnimplementedElement.hpp 2000/03/21 03:22:42 1.6
@@ -209,7 +209,7 @@
virtual AttrImpl*
removeAttributeNode(AttrImpl* oldAttr);
- virtual void
+ virtual AttrImpl*
setAttribute(
const DOMString& name,
const DOMString& value);
1.6 +1 -1 xml-xalan/c/src/PlatformSupport/PrintWriter.hpp
Index: PrintWriter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/PrintWriter.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PrintWriter.hpp 2000/03/10 15:18:48 1.5
+++ PrintWriter.hpp 2000/03/21 03:22:43 1.6
@@ -69,7 +69,7 @@
-#include <util/XML4CDefs.hpp>
+#include <util/XercesDefs.hpp>
1.7 +1 -1 xml-xalan/c/src/PlatformSupport/Writer.hpp
Index: Writer.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/PlatformSupport/Writer.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Writer.hpp 2000/03/10 15:18:48 1.6
+++ Writer.hpp 2000/03/21 03:22:43 1.7
@@ -68,7 +68,7 @@
-#include <util/XML4CDefs.hpp>
+#include <util/XercesDefs.hpp>
1.5 +2 -2 xml-xalan/c/src/XMLSupport/FormatterListener.hpp
Index: FormatterListener.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterListener.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FormatterListener.hpp 2000/03/10 15:18:48 1.4
+++ FormatterListener.hpp 2000/03/21 03:22:44 1.5
@@ -58,7 +58,7 @@
#define FORMATTERLISTENER_HEADER_GUARD_1357924680
/**
- * $Id: FormatterListener.hpp,v 1.4 2000/03/10 15:18:48 jdonohue Exp $
+ * $Id: FormatterListener.hpp,v 1.5 2000/03/21 03:22:44 dbertoni Exp $
*
* $State: Exp $
*
@@ -179,7 +179,7 @@
resetDocument() = 0;
virtual void
- setDocumentLocator(Locator* const locator) = 0;
+ setDocumentLocator(const Locator* const locator) = 0;
virtual void
startDocument() = 0;
1.5 +1 -1 xml-xalan/c/src/XMLSupport/FormatterToDOM.cpp
Index: FormatterToDOM.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToDOM.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FormatterToDOM.cpp 2000/03/10 15:18:48 1.4
+++ FormatterToDOM.cpp 2000/03/21 03:22:45 1.5
@@ -98,7 +98,7 @@
void
-FormatterToDOM::setDocumentLocator(Locator* const /* locator */)
+FormatterToDOM::setDocumentLocator(const Locator* const /*
locator */)
{
// No action for the moment.
}
1.5 +1 -1 xml-xalan/c/src/XMLSupport/FormatterToDOM.hpp
Index: FormatterToDOM.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToDOM.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FormatterToDOM.hpp 2000/03/10 15:18:48 1.4
+++ FormatterToDOM.hpp 2000/03/21 03:22:45 1.5
@@ -134,7 +134,7 @@
entityReference(const XMLCh* const name);
virtual void
- setDocumentLocator(Locator* const locator);
+ setDocumentLocator(const Locator* const locator);
virtual void
startDocument();
1.5 +1 -1 xml-xalan/c/src/XMLSupport/FormatterToText.cpp
Index: FormatterToText.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToText.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FormatterToText.cpp 2000/03/10 15:18:48 1.4
+++ FormatterToText.cpp 2000/03/21 03:22:45 1.5
@@ -82,7 +82,7 @@
void
-FormatterToText::setDocumentLocator(Locator* const /* locator */)
+FormatterToText::setDocumentLocator(const Locator* const /* locator */)
{
// No action for the moment.
}
1.5 +1 -1 xml-xalan/c/src/XMLSupport/FormatterToText.hpp
Index: FormatterToText.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToText.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FormatterToText.hpp 2000/03/10 15:18:48 1.4
+++ FormatterToText.hpp 2000/03/21 03:22:45 1.5
@@ -96,7 +96,7 @@
// These methods are inherited from FormatterListener ...
virtual void
- setDocumentLocator(Locator* const locator);
+ setDocumentLocator(const Locator* const locator);
virtual void
startDocument();
1.12 +1 -1 xml-xalan/c/src/XMLSupport/FormatterToXML.cpp
Index: FormatterToXML.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToXML.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FormatterToXML.cpp 2000/03/17 22:19:09 1.11
+++ FormatterToXML.cpp 2000/03/21 03:22:45 1.12
@@ -165,7 +165,7 @@
void
-FormatterToXML::setDocumentLocator(Locator* const /* locator */)
+FormatterToXML::setDocumentLocator(const Locator* const /* locator */)
{
// I don't do anything with this yet.
}
1.6 +1 -1 xml-xalan/c/src/XMLSupport/FormatterToXML.hpp
Index: FormatterToXML.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToXML.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FormatterToXML.hpp 2000/03/10 15:18:48 1.5
+++ FormatterToXML.hpp 2000/03/21 03:22:46 1.6
@@ -190,7 +190,7 @@
// These methods are inherited from FormatterListener ...
virtual void
- setDocumentLocator(Locator* const locator);
+ setDocumentLocator(const Locator* const locator);
virtual void
startDocument();
1.14 +1 -1 xml-xalan/c/src/XSLT/StylesheetHandler.cpp
Index: StylesheetHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetHandler.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StylesheetHandler.cpp 2000/03/14 19:33:37 1.13
+++ StylesheetHandler.cpp 2000/03/21 03:22:48 1.14
@@ -147,7 +147,7 @@
}
-void StylesheetHandler::setDocumentLocator(Locator* const locator)
+void StylesheetHandler::setDocumentLocator(const Locator* const
locator)
{
m_processor.pushLocatorOnStack(locator);
}
1.8 +1 -1 xml-xalan/c/src/XSLT/StylesheetHandler.hpp
Index: StylesheetHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetHandler.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StylesheetHandler.hpp 2000/03/10 15:18:49 1.7
+++ StylesheetHandler.hpp 2000/03/21 03:22:48 1.8
@@ -267,7 +267,7 @@
* any SAX document event.
* @see org.xml.sax.Locator
*/
- virtual void setDocumentLocator(Locator* const locator);
+ virtual void setDocumentLocator(const Locator* const locator);
/**
* Receive notification of the beginning of a document.
1.17 +2 -2 xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp
Index: XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XSLTEngineImpl.cpp 2000/03/10 15:18:49 1.16
+++ XSLTEngineImpl.cpp 2000/03/21 03:22:48 1.17
@@ -55,7 +55,7 @@
* <http://www.apache.org/>.
*/
/**
- * $Id: XSLTEngineImpl.cpp,v 1.16 2000/03/10 15:18:49 jdonohue Exp $
+ * $Id: XSLTEngineImpl.cpp,v 1.17 2000/03/21 03:22:48 dbertoni Exp $
*
* $State: Exp $
*
@@ -1572,7 +1572,7 @@
void
-XSLTEngineImpl::setDocumentLocator(Locator* const /* locator */)
+XSLTEngineImpl::setDocumentLocator(const Locator* const /*
locator */)
{
// Do nothing for now
}
1.20 +2 -2 xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp
Index: XSLTEngineImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XSLTEngineImpl.hpp 2000/03/20 17:34:54 1.19
+++ XSLTEngineImpl.hpp 2000/03/21 03:22:50 1.20
@@ -59,7 +59,7 @@
/**
*
- * $Id: XSLTEngineImpl.hpp,v 1.19 2000/03/20 17:34:54 jdonohue Exp $
+ * $Id: XSLTEngineImpl.hpp,v 1.20 2000/03/21 03:22:50 dbertoni Exp $
*
* $State: Exp $
*
@@ -1890,7 +1890,7 @@
// These methods are inherited from DocumentHandler ...
- virtual void setDocumentLocator(Locator* const locator);
+ virtual void setDocumentLocator(const Locator* const locator);
virtual void
startDocument();
