diff --git a/src/framework/XMLRecognizer.cpp b/src/framework/XMLRecognizer.cpp index 7de3bfa384424aa3cb9217e0decddc1dedcfd36d..cdebffe9c367dffbc6bfbd7ad04f707e6b315b2d 100644 --- a/src/framework/XMLRecognizer.cpp +++ b/src/framework/XMLRecognizer.cpp @@ -209,8 +209,7 @@ XMLRecognizer::encodingForName(const XMLCh* const encName) // that one ourselves. It is allowed to fall into 'other'. // if (!XMLString::compareIString(encName, XMLUni::fgUTF8EncodingString) - || !XMLString::compareIString(encName, XMLUni::fgUTF8EncodingString2) - || !XMLString::compareIString(encName, XMLUni::fgUTF8EncodingString3)) + || !XMLString::compareIString(encName, XMLUni::fgUTF8EncodingString2)) { return XMLRecognizer::UTF_8; } diff --git a/src/util/TransService.cpp b/src/util/TransService.cpp index b84104d82f3dfffd8fc37c577f3c296770aed4c3..1daf4f943e35511429c66303b6fc3ad1094d45a8 100644 --- a/src/util/TransService.cpp +++ b/src/util/TransService.cpp @@ -54,7 +54,9 @@ * <http://www.apache.org/>. */ - +/* + * $Id$ + */ // --------------------------------------------------------------------------- // Includes // --------------------------------------------------------------------------- @@ -289,7 +291,6 @@ void XMLTransService::initTransService() // gMappings->put(new ENameMapFor<XMLUTF8Transcoder>(XMLUni::fgUTF8EncodingString)); gMappings->put(new ENameMapFor<XMLUTF8Transcoder>(XMLUni::fgUTF8EncodingString2)); - gMappings->put(new ENameMapFor<XMLUTF8Transcoder>(XMLUni::fgUTF8EncodingString3)); // // Add in our mappings for Latin1 diff --git a/src/util/XMLUni.cpp b/src/util/XMLUni.cpp index e5b6c18bb30706621df623fc223f238e77774eb9..a512b41fabe4363af259e9bc86399bf1885a55ba 100644 --- a/src/util/XMLUni.cpp +++ b/src/util/XMLUni.cpp @@ -55,71 +55,7 @@ */ /* - * $Log$ - * Revision 1.18 2000/06/13 19:38:07 aruna1 - * Added functionality to recognize UTF_8 encodings in intrinsic trascoders - * - * Revision 1.17 2000/05/04 02:43:45 aruna1 - * solaris : instance=static related changes - * - * Revision 1.16 2000/04/19 18:06:20 aruna1 - * Changes for duplicate strings - * - * Revision 1.15 2000/04/19 02:26:41 aruna1 - * Full support for DOM_EntityReference, DOM_Entity and DOM_DocumentType introduced - * - * Revision 1.14 2000/03/02 19:54:49 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.13 2000/02/22 00:36:37 roddey - * Added a new 'native XMLCh' transcoder to correctly handle - * internal entities now that XMLCh isn't always UTF-16. - * - * Revision 1.12 2000/02/19 00:26:41 roddey - * Yet, yet, yet still another EBCDIC alias tweak. - * - * Revision 1.11 2000/02/18 22:24:18 roddey - * Ok... yet still one more tweak for EBCDIC aliases - * - * Revision 1.10 2000/02/18 22:03:31 roddey - * One more tweak for EBCDIC encoding aliases. - * - * Revision 1.9 2000/02/18 19:55:04 roddey - * Added Windows-1252 as an intrinsic encoding. - * - * Revision 1.8 2000/02/17 00:51:13 roddey - * Updates for EBCDIC code page issues. - * - * Revision 1.7 2000/02/08 00:59:19 roddey - * Support for new intrinsic encoder for IBM-1047 code page. - * - * Revision 1.6 2000/02/06 07:48:06 rahulj - * Year 2K copyright swat. - * - * Revision 1.5 2000/01/27 23:32:17 roddey - * There is now an official URL for the magic "xmlns" prefix. So I updated our code - * to use this new URL, instead of the proprietary one we used previously. - * - * Revision 1.4 2000/01/12 20:44:49 roddey - * Ooops, I checked in the URL.cpp file with a L"localhost" style string in it. This is not legal for - * some of our compilers, so a new string was added XMLUni and used in its place. - * - * Revision 1.3 1999/12/18 00:18:10 roddey - * More changes to support the new, completely orthagonal support for - * intrinsic encodings. - * - * Revision 1.2 1999/12/15 19:41:29 roddey - * Support for the new transcoder system, where even intrinsic encodings are - * done via the same transcoder abstraction as external ones. - * - * Revision 1.1.1.1 1999/11/09 01:05:54 twl - * Initial checkin - * - * Revision 1.5 1999/11/08 20:45:21 rahul - * Swat for adding in Product name and CVS comment log variable. - * + * $Id$ */ @@ -466,11 +402,6 @@ const XMLCh XMLUni::fgUTF8EncodingString2[] = chLatin_U, chLatin_T, chLatin_F, chDigit_8, chNull }; -const XMLCh XMLUni::fgUTF8EncodingString3[] = -{ - chLatin_U, chLatin_T, chLatin_F, chUnderscore , chDigit_8, chNull -}; - const XMLCh XMLUni::fgUTF16EncodingString[] = { chLatin_U, chLatin_T, chLatin_F, chDash, chDigit_1, chDigit_6, chNull diff --git a/src/util/XMLUni.hpp b/src/util/XMLUni.hpp index 470a82ebf264da003f92bf673ed6dc6d88451979..fd6e65edbcf309225e0a2527b2cb19384c5bbab8 100644 --- a/src/util/XMLUni.hpp +++ b/src/util/XMLUni.hpp @@ -260,7 +260,6 @@ public : static const XMLCh fgUSASCIIEncodingString4[]; static const XMLCh fgUTF8EncodingString[]; static const XMLCh fgUTF8EncodingString2[]; - static const XMLCh fgUTF8EncodingString3[]; static const XMLCh fgUTF16EncodingString[]; static const XMLCh fgUTF16EncodingString2[]; static const XMLCh fgUTF16EncodingString3[];