diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
index 6ae8dbeec83418401ac669ee9ba5cde7e78ff32a..732aba683ab65a0067f577f035387c4d17266bd3 100644
--- a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
+++ b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
@@ -317,14 +317,6 @@ SOURCE=..\..\..\..\..\src\util\StringPool.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\util\TextOutputStream.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\src\util\TextOutputStream.hpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\..\..\..\src\util\TranscodingException.hpp
# End Source File
# Begin Source File
diff --git a/src/util/TextOutputStream.cpp b/src/util/TextOutputStream.cpp
deleted file mode 100644
index ffff23f2af6c88c3e68c037945b72fd77280f52a..0000000000000000000000000000000000000000
--- a/src/util/TextOutputStream.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xerces" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache\@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation, and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.ibm.com . For more information
- * on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-/*
- * $Log$
- * Revision 1.3 2000/03/02 19:54:46 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.2 2000/02/06 07:48:04 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:05:13 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:45:15 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
- */
-
-
-// ---------------------------------------------------------------------------
-// Includes
-// ---------------------------------------------------------------------------
-#include <util/Janitor.hpp>
-#include <util/TextOutputStream.hpp>
-#include <util/XMLString.hpp>
-#include <util/XMLUni.hpp>
-
-#include <math.h>
-#include <stdlib.h>
-
-
-// ---------------------------------------------------------------------------
-// StreamJanitor: Constructors and Destructor
-// ---------------------------------------------------------------------------
-StreamJanitor::StreamJanitor(TextOutputStream* const toSanitize) :
-
- fRadix(toSanitize->fRadix)
- , fStream(toSanitize)
-{
-}
-
-StreamJanitor::~StreamJanitor()
-{
- if (fStream)
- {
- fStream->fRadix = fRadix;
- }
-}
-
-
-// ---------------------------------------------------------------------------
-// TextOutputStream: Virtual destructor
-// ---------------------------------------------------------------------------
-TextOutputStream::~TextOutputStream()
-{
-}
-
-
-// ---------------------------------------------------------------------------
-// TextOutputStream: Formatting operators
-// ---------------------------------------------------------------------------
-TextOutputStream& TextOutputStream::operator<<(const XMLCh* const toWrite)
-{
- write(toWrite);
- return *this;
-}
-
-TextOutputStream& TextOutputStream::operator<<(const XMLCh toWrite)
-{
- XMLCh szTmp[2];
- szTmp[0] = toWrite;
- szTmp[1] = 0;
-
- write(szTmp);
- return *this;
-}
-
-TextOutputStream& TextOutputStream::operator<<(const char* const toWrite)
-{
- write(toWrite);
- return *this;
-}
-
-TextOutputStream& TextOutputStream::operator<<(const char toWrite)
-{
- char szTmp[2];
- szTmp[0] = toWrite;
- szTmp[1] = 0;
- write(szTmp);
- return *this;
-}
-
-TextOutputStream& TextOutputStream::operator<<(const unsigned int toWrite)
-{
- XMLCh szTmp[128];
- XMLString::binToText(toWrite, szTmp, 127, fRadix);
-
- write(szTmp);
- return *this;
-}
-
-TextOutputStream& TextOutputStream::operator<<(const long toWrite)
-{
- XMLCh szTmp[128];
- XMLString::binToText(toWrite, szTmp, 127, fRadix);
-
- write(szTmp);
- return *this;
-}
-
-TextOutputStream& TextOutputStream::operator<<(const unsigned long toWrite)
-{
- XMLCh szTmp[128];
- XMLString::binToText(toWrite, szTmp, 127, fRadix);
-
- write(szTmp);
- return *this;
-}
-
-TextOutputStream& TextOutputStream::operator<<(const double& toWrite)
-{
- // To avoid portability issues, split into two parts
- double fracPart;
- double intPart;
- intPart = modf(toWrite, &fracPart);
-
- if (fracPart < 0)
- fracPart *= (double)-1.0;
-
- XMLCh szTmp[128];
- XMLString::binToText((long)intPart, szTmp, 127, fRadix);
- write(szTmp);
-
- szTmp[0] = '.';
- szTmp[1] = 0;
- write(szTmp);
-
- XMLString::binToText((long)fracPart, szTmp, 127, fRadix);
- write(szTmp);
- return *this;
-}
-
-TextOutputStream&
-TextOutputStream::operator<<(const TextOutputStream::Radices newRadix)
-{
- fRadix = newRadix;
- return *this;
-}
-
-TextOutputStream&
-TextOutputStream::operator<<(const TextOutputStream::SpecialValues newValue)
-{
- static const XMLCh newLine[] = { chLF, chNull };
-
- if (newValue == EndLine)
- {
- write(newLine);
- flush();
- }
- return *this;
-}
-
-
-
-// ---------------------------------------------------------------------------
-// TextOutputStream: Hidden Constructors and Destructor
-// ---------------------------------------------------------------------------
-TextOutputStream::TextOutputStream() :
-
- fRadix(TextOutputStream::decimal)
-{
-}
diff --git a/src/util/TextOutputStream.hpp b/src/util/TextOutputStream.hpp
deleted file mode 100644
index dc59596a30aefb7c63c4412c14dfc4601dc73dd5..0000000000000000000000000000000000000000
--- a/src/util/TextOutputStream.hpp
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xerces" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache\@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation, and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.ibm.com . For more information
- * on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-/*
- * $Log$
- * Revision 1.4 2000/03/02 19:54:46 roddey
- * This checkin includes many changes done while waiting for the
- * 1.1.0 code to be finished. I can't list them all here, but a list is
- * available elsewhere.
- *
- * Revision 1.3 2000/02/24 20:05:25 abagchi
- * Swat for removing Log from API docs
- *
- * Revision 1.2 2000/02/06 07:48:04 rahulj
- * Year 2K copyright swat.
- *
- * Revision 1.1.1.1 1999/11/09 01:05:14 twl
- * Initial checkin
- *
- * Revision 1.2 1999/11/08 20:45:15 rahul
- * Swat for adding in Product name and CVS comment log variable.
- *
- */
-
-#if !defined(OUTPUTSTREAM_HPP)
-#define OUTPUTSTREAM_HPP
-
-#include <util/XercesDefs.hpp>
-
-class StreamJanitor;
-
-class XMLUTIL_EXPORT TextOutputStream
-{
-public :
- // -----------------------------------------------------------------------
- // Public types
- // -----------------------------------------------------------------------
- enum Radices
- {
- bin = 2
- , decimal = 10
- , hex = 16
- };
-
- enum SpecialValues
- {
- EndLine
- };
-
-
- // -----------------------------------------------------------------------
- // Public virtual destructor
- // -----------------------------------------------------------------------
- virtual ~TextOutputStream();
-
-
- // -----------------------------------------------------------------------
- // Formatting operators
- // -----------------------------------------------------------------------
- TextOutputStream& operator<<
- (
- const XMLCh* const toWrite
- );
-
- TextOutputStream& operator<<
- (
- const XMLCh toWrite
- );
-
- TextOutputStream& operator<<
- (
- const char* const toWrite
- );
-
- TextOutputStream& operator<<
- (
- const char toWrite
- );
-
- TextOutputStream& operator<<
- (
- const unsigned int toWrite
- );
-
- TextOutputStream& operator<<
- (
- const long toWrite
- );
-
- TextOutputStream& operator<<
- (
- const unsigned long toWrite
- );
-
- TextOutputStream& operator<<
- (
- const double& toWrite
- );
-
- TextOutputStream& operator<<
- (
- const Radices newRadix
- );
-
- TextOutputStream& operator<<
- (
- const SpecialValues specialVal
- );
-
-
- // -----------------------------------------------------------------------
- // Virtual interface to be provided by the derived class
- // -----------------------------------------------------------------------
- virtual void flush() = 0;
- virtual void write(const XMLCh* const toWrite) = 0;
- virtual void write(const char* const toWrite) = 0;
-
-
- // -----------------------------------------------------------------------
- // Getter methods
- // -----------------------------------------------------------------------
- Radices getRadix() const
- {
- return fRadix;
- }
-
-
-protected :
- // -----------------------------------------------------------------------
- // Declare our friends
- // -----------------------------------------------------------------------
- friend class StreamJanitor;
-
-
- // -----------------------------------------------------------------------
- // Hidden Constructors for derived classes only
- // -----------------------------------------------------------------------
- TextOutputStream();
-
-
-private :
- // -----------------------------------------------------------------------
- // Unimplemented constructors and operators
- // -----------------------------------------------------------------------
- TextOutputStream(const TextOutputStream&);
- void operator=(const TextOutputStream&);
-
-
- // -----------------------------------------------------------------------
- // Private data members
- //
- // fRadix
- // The current radix to use when formatting values.
- // -----------------------------------------------------------------------
- Radices fRadix;
-};
-
-
-class XMLUTIL_EXPORT StreamJanitor
-{
-public :
- // -----------------------------------------------------------------------
- // Constructors and Destructor
- // -----------------------------------------------------------------------
- StreamJanitor(TextOutputStream* const toSanitize);
- ~StreamJanitor();
-
-private :
- // -----------------------------------------------------------------------
- // Unimplemented constructors and operators
- // -----------------------------------------------------------------------
- StreamJanitor(const StreamJanitor&);
- void operator=(const StreamJanitor&);
-
-
- // -----------------------------------------------------------------------
- // Private data members
- //
- // fRadix
- // The saved radix that will be replaced.
- //
- // fStream
- // This is the stream that we are sanitizing.
- // -----------------------------------------------------------------------
- TextOutputStream::Radices fRadix;
- TextOutputStream* fStream;
-};
-
-
-// ---------------------------------------------------------------------------
-// Convenenience defines for some of the special characters
-// ---------------------------------------------------------------------------
-#define EndLn TextOutputStream::EndLine
-#define BinRadix TextOutputStream::bin
-#define DecimalRadix TextOutputStream::decimal
-#define HexRadix TextOutputStream::hex
-
-#endif