From 835fe9ea719534c7e9431e34ce0fe1f32a294c0d Mon Sep 17 00:00:00 2001 From: "yokoyama%netscape.com" Date: Wed, 7 Feb 2001 01:21:55 +0000 Subject: [PATCH] Fix for 65685; /r=valeski, /sr=ftang --- intl/uconv/src/Makefile.in | 12 ++- intl/uconv/src/makefile.win | 28 ++++- intl/uconv/src/nsUConvDll.h | 32 ++++++ intl/uconv/src/nsUConvModule.cpp | 124 +++++++++++++++++++++-- intl/uconv/src/nsUTF8ToUnicode.h | 2 +- intl/uconv/ucvlatin/Makefile.in | 8 -- intl/uconv/ucvlatin/makefile.win | 16 --- intl/uconv/ucvlatin/nsUCvLatinCID.h | 55 ---------- intl/uconv/ucvlatin/nsUCvLatinModule.cpp | 82 +-------------- 9 files changed, 187 insertions(+), 172 deletions(-) diff --git a/intl/uconv/src/Makefile.in b/intl/uconv/src/Makefile.in index 649a94916087..44ab8871476d 100644 --- a/intl/uconv/src/Makefile.in +++ b/intl/uconv/src/Makefile.in @@ -49,6 +49,15 @@ CPPSRCS = \ nsMappingCache.cpp \ nsCharsetMenu.cpp \ nsUConvModule.cpp \ + nsISO88591ToUnicode.cpp \ + nsCP1252ToUnicode.cpp \ + nsMacRomanToUnicode.cpp \ + nsUTF8ToUnicode.cpp \ + nsUnicodeToISO88591.cpp \ + nsUnicodeToCP1252.cpp \ + nsUnicodeToMacRoman.cpp \ + nsUnicodeToUTF8.cpp \ + nsUCvMinSupport.cpp \ $(NULL) EXPORT_RESOURCE = \ @@ -77,7 +86,8 @@ OS_LIBS += -llibuni endif endif -LOCAL_INCLUDES = -I$(srcdir)/../ucvlatin -I$(srcdir)/../ucvja +#LOCAL_INCLUDES = -I$(srcdir)/../ucvlatin -I$(srcdir)/../ucvja +LOCAL_INCLUDES = include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/src/makefile.win b/intl/uconv/src/makefile.win index e1f69111351f..325fb9b0fc40 100644 --- a/intl/uconv/src/makefile.win +++ b/intl/uconv/src/makefile.win @@ -41,6 +41,15 @@ CPPSRCS = \ nsMappingCache.cpp \ nsURLProperties.cpp \ nsCharsetMenu.cpp \ + nsISO88591ToUnicode.cpp \ + nsCP1252ToUnicode.cpp \ + nsMacRomanToUnicode.cpp \ + nsUTF8ToUnicode.cpp \ + nsUnicodeToISO88591.cpp \ + nsUnicodeToCP1252.cpp \ + nsUnicodeToMacRoman.cpp \ + nsUnicodeToUTF8.cpp \ + nsUCvMinSupport.cpp \ $(NULL) CPP_OBJS= \ @@ -54,6 +63,15 @@ CPP_OBJS= \ .\$(OBJDIR)\nsMappingCache.obj \ .\$(OBJDIR)\nsURLProperties.obj \ .\$(OBJDIR)\nsCharsetMenu.obj \ + .\$(OBJDIR)\nsISO88591ToUnicode.obj \ + .\$(OBJDIR)\nsCP1252ToUnicode.obj \ + .\$(OBJDIR)\nsMacRomanToUnicode.obj \ + .\$(OBJDIR)\nsUTF8ToUnicode.obj \ + .\$(OBJDIR)\nsUnicodeToISO88591.obj \ + .\$(OBJDIR)\nsUnicodeToCP1252.obj \ + .\$(OBJDIR)\nsUnicodeToMacRoman.obj \ + .\$(OBJDIR)\nsUnicodeToUTF8.obj \ + .\$(OBJDIR)\nsUCvMinSupport.obj \ $(NULL) CSRCS = \ @@ -71,12 +89,18 @@ OBJS = \ EXPORTS= \ $(NULL) +#LINCS= \ +# -I$(PUBLIC)\raptor \ +# -I$(PUBLIC)\xpcom \ +# -I$(PUBLIC)\uconv \ +# -I..\ucvja \ +# -I..\ucvlatin \ +# $(NULL) + LINCS= \ -I$(PUBLIC)\raptor \ -I$(PUBLIC)\xpcom \ -I$(PUBLIC)\uconv \ - -I..\ucvja \ - -I..\ucvlatin \ $(NULL) LLIBS= \ diff --git a/intl/uconv/src/nsUConvDll.h b/intl/uconv/src/nsUConvDll.h index ded115065b1c..cb344799af8f 100644 --- a/intl/uconv/src/nsUConvDll.h +++ b/intl/uconv/src/nsUConvDll.h @@ -61,4 +61,36 @@ NS_NewTextToSubURI(nsISupports* aOuter, const nsIID& aIID, NS_IMETHODIMP NS_RegisterConverterManagerData(); +NS_IMETHODIMP +NS_NewISO88591ToUnicode(nsISupports* aOuter, const nsIID& aIID, + void** aResult); + +NS_IMETHODIMP +NS_NewCP1252ToUnicode(nsISupports* aOuter, const nsIID& aIID, + void** aResult); + +NS_IMETHODIMP +NS_NewMacRomanToUnicode(nsISupports* aOuter, const nsIID& aIID, + void** aResult); + +NS_IMETHODIMP +NS_NewUTF8ToUnicode(nsISupports* aOuter, const nsIID& aIID, + void** aResult); + +NS_IMETHODIMP +NS_NewUnicodeToISO88591(nsISupports* aOuter, const nsIID& aIID, + void** aResult); + +NS_IMETHODIMP +NS_NewUnicodeToCP1252(nsISupports* aOuter, const nsIID& aIID, + void** aResult); + +NS_IMETHODIMP +NS_NewUnicodeToMacRoman(nsISupports* aOuter, const nsIID& aIID, + void** aResult); + +NS_IMETHODIMP +NS_NewUnicodeToUTF8(nsISupports* aOuter, const nsIID& aIID, + void** aResult); + #endif /* nsUConvDll_h___ */ diff --git a/intl/uconv/src/nsUConvModule.cpp b/intl/uconv/src/nsUConvModule.cpp index 5853087bcae7..ccdc30854c0b 100644 --- a/intl/uconv/src/nsUConvModule.cpp +++ b/intl/uconv/src/nsUConvModule.cpp @@ -21,6 +21,7 @@ * Pierre Phaneuf */ #include "nsCOMPtr.h" +#include "nsIRegistry.h" #include "nsIModule.h" #include "nsIGenericFactory.h" #include "nsIComponentManager.h" @@ -36,6 +37,17 @@ #include "nsUConvDll.h" #include "nsFileSpec.h" #include "nsIFile.h" + +#include "nsUCvMinSupport.h" +#include "nsISO88591ToUnicode.h" +#include "nsCP1252ToUnicode.h" +#include "nsMacRomanToUnicode.h" +#include "nsUTF8ToUnicode.h" +#include "nsUnicodeToISO88591.h" +#include "nsUnicodeToCP1252.h" +#include "nsUnicodeToMacRoman.h" +#include "nsUnicodeToUTF8.h" + //---------------------------------------------------------------------- // Global functions and data [declaration] @@ -45,11 +57,19 @@ static NS_DEFINE_CID(kCharsetMenuCID, NS_CHARSETMENU_CID); static NS_DEFINE_CID(kTextToSubURICID, NS_TEXTTOSUBURI_CID); static NS_DEFINE_CID(kPlatformCharsetCID, NS_PLATFORMCHARSET_CID); +// converters +NS_DEFINE_CID(kISO88591ToUnicodeCID, NS_ISO88591TOUNICODE_CID); +NS_DEFINE_CID(kCP1252ToUnicodeCID, NS_CP1252TOUNICODE_CID); +NS_DEFINE_CID(kMacRomanToUnicodeCID, NS_MACROMANTOUNICODE_CID); +NS_DEFINE_CID(kUTF8ToUnicodeCID, NS_UTF8TOUNICODE_CID); +NS_DEFINE_CID(kUnicodeToISO88591CID, NS_UNICODETOISO88591_CID); +NS_DEFINE_CID(kUnicodeToCP1252CID, NS_UNICODETOCP1252_CID); +NS_DEFINE_CID(kUnicodeToMacRomanCID, NS_UNICODETOMACROMAN_CID); +NS_DEFINE_CID(kUnicodeToUTF8CID, NS_UNICODETOUTF8_CID); + PRInt32 g_InstanceCount = 0; PRInt32 g_LockCount = 0; -//---------------------------------------------------------------------- - class nsUConvModule : public nsIModule { public: nsUConvModule(); @@ -138,6 +158,30 @@ nsUConvModule::GetClassObject(nsIComponentManager *aCompMgr, else if (aClass.Equals(kTextToSubURICID)) { rv = NS_NewGenericFactory(getter_AddRefs(fact), NS_NewTextToSubURI); } + else if (aClass.Equals(kISO88591ToUnicodeCID)) { + rv = NS_NewGenericFactory(getter_AddRefs(fact), NS_NewISO88591ToUnicode); + } + else if (aClass.Equals(kCP1252ToUnicodeCID)) { + rv = NS_NewGenericFactory(getter_AddRefs(fact), NS_NewCP1252ToUnicode); + } + else if (aClass.Equals(kMacRomanToUnicodeCID)) { + rv = NS_NewGenericFactory(getter_AddRefs(fact), NS_NewMacRomanToUnicode); + } + else if (aClass.Equals(kUTF8ToUnicodeCID)) { + rv = NS_NewGenericFactory(getter_AddRefs(fact), NS_NewUTF8ToUnicode); + } + else if (aClass.Equals(kUnicodeToISO88591CID)) { + rv = NS_NewGenericFactory(getter_AddRefs(fact), NS_NewUnicodeToISO88591); + } + else if (aClass.Equals(kUnicodeToCP1252CID)) { + rv = NS_NewGenericFactory(getter_AddRefs(fact), NS_NewUnicodeToCP1252); + } + else if (aClass.Equals(kUnicodeToMacRomanCID)) { + rv = NS_NewGenericFactory(getter_AddRefs(fact), NS_NewUnicodeToMacRoman); + } + else if (aClass.Equals(kUnicodeToUTF8CID)) { + rv = NS_NewGenericFactory(getter_AddRefs(fact), NS_NewUnicodeToUTF8); + } else { return NS_ERROR_FACTORY_NOT_REGISTERED; } @@ -155,24 +199,42 @@ struct Components { const char* mDescription; const nsID* mCID; const char* mContractID; + const char* mCharsetSrc; + const char* mCharsetDest; }; // The list of components we register static Components gComponents[] = { { "Charset Conversion Manager", &kCharsetConverterManagerCID, - NS_CHARSETCONVERTERMANAGER_CONTRACTID, }, + NS_CHARSETCONVERTERMANAGER_CONTRACTID, NULL, NULL, }, { "Unicode Decode Helper", &kUnicodeDecodeHelperCID, - NS_UNICODEDECODEHELPER_CONTRACTID, }, + NS_UNICODEDECODEHELPER_CONTRACTID, NULL, NULL, }, { "Unicode Encode Helper", &kUnicodeEncodeHelperCID, - NS_UNICODEENCODEHELPER_CONTRACTID, }, + NS_UNICODEENCODEHELPER_CONTRACTID, NULL, NULL, }, { "Platform Charset Information", &kPlatformCharsetCID, - NS_PLATFORMCHARSET_CONTRACTID, }, + NS_PLATFORMCHARSET_CONTRACTID, NULL, NULL, }, { "Charset Alias Information", &kCharsetAliasCID, - NS_CHARSETALIAS_CONTRACTID, }, + NS_CHARSETALIAS_CONTRACTID, NULL, NULL, }, { NS_CHARSETMENU_PID, &kCharsetMenuCID, - NS_RDF_DATASOURCE_CONTRACTID_PREFIX NS_CHARSETMENU_PID, }, + NS_RDF_DATASOURCE_CONTRACTID_PREFIX NS_CHARSETMENU_PID, NULL, NULL, }, { "Text To Sub URI Helper", &kTextToSubURICID, - NS_ITEXTTOSUBURI_CONTRACTID, }, + NS_ITEXTTOSUBURI_CONTRACTID, NULL, NULL, }, + { "ISO-8859-1 To Unicode Converter", &kISO88591ToUnicodeCID, + NS_ISO88591TOUNICODE_CONTRACTID, "ISO-8859-1", "Unicode", }, + { "windows-1252 To Unicode Converter", &kCP1252ToUnicodeCID, + NS_CP1252TOUNICODE_CONTRACTID, "windows-1252", "Unicode", }, + { "x-mac-roman To Unicode Converter", &kMacRomanToUnicodeCID, + NS_MACROMANTOUNICODE_CONTRACTID, "x-mac-roman", "Unicode", }, + { "UTF-8 To Unicode Converter", &kUTF8ToUnicodeCID, + NS_UTF8TOUNICODE_CONTRACTID, "UTF-8", "Unicode", }, + { "Unicode To ISO-8859-1 Converter", &kUnicodeToISO88591CID, + NS_UNICODETOISO88591_CONTRACTID, "Unicode", "ISO-8859-1", }, + { "Unicode To windows-1252 Converter", &kUnicodeToCP1252CID, + NS_UNICODETOCP1252_CONTRACTID, "Unicode", "windows-1252", }, + { "Unicode To x-mac-roman Converter", &kUnicodeToMacRomanCID, + NS_UNICODETOMACROMAN_CONTRACTID, "Unicode", "x-mac-roman", }, + { "Unicode To UTF-8 Converter", &kUnicodeToUTF8CID, + NS_UNICODETOUTF8_CONTRACTID, "Unicode", "UTF-8", }, }; #define NUM_COMPONENTS (sizeof(gComponents) / sizeof(gComponents[0])) @@ -183,10 +245,25 @@ nsUConvModule::RegisterSelf(nsIComponentManager *aCompMgr, const char* componentType) { nsresult rv = NS_OK; + char * cid_string; + char buff[1024]; + nsIRegistry * registry = NULL; + nsRegistryKey key; #ifdef DEBUG printf("*** Registering uconv components\n"); #endif + + // get the registry + rv = nsServiceManager::GetService(NS_REGISTRY_CONTRACTID, + NS_GET_IID(nsIRegistry), (nsISupports**)®istry); + if (NS_FAILED(rv)) + return rv; + + // open the registry + rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry); + if (NS_FAILED(rv)) + return rv; Components* cp = gComponents; Components* end = cp + NUM_COMPONENTS; @@ -201,9 +278,38 @@ nsUConvModule::RegisterSelf(nsIComponentManager *aCompMgr, #endif break; } + + // register Unicode converter component info here. + if (NULL != cp->mCharsetSrc) { + cid_string = cp->mCID->ToString(); + sprintf(buff, "%s/%s", "software/netscape/intl/uconv", cid_string); + nsCRT::free(cid_string); + + rv = registry -> AddSubtree(nsIRegistry::Common, buff, &key); + if (NS_FAILED(rv)) + break; + + rv = registry -> SetStringUTF8(key, "source", cp->mCharsetSrc); + if (NS_FAILED(rv)) + break; + + rv = registry -> SetStringUTF8(key, "destination", cp->mCharsetDest); + if (NS_FAILED(rv)) + break; + } cp++; } + if (registry != NULL) { + nsServiceManager::ReleaseService(NS_REGISTRY_CONTRACTID, registry); + } + else { +#ifdef DEBUG + printf("nsUConvModule: unable to register %s component => %x\n", + cp->mDescription, rv); +#endif + } + // XXX also unregister this stuff when time comes rv = NS_RegisterConverterManagerData(); diff --git a/intl/uconv/src/nsUTF8ToUnicode.h b/intl/uconv/src/nsUTF8ToUnicode.h index c050ecafc6c5..b1263fffb08f 100644 --- a/intl/uconv/src/nsUTF8ToUnicode.h +++ b/intl/uconv/src/nsUTF8ToUnicode.h @@ -30,7 +30,7 @@ NS_DECLARE_ID(kUTF8ToUnicodeCID, #define NS_UTF8TOUNICODE_CID \ { 0x5534ddc0, 0xdd96, 0x11d2, {0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}} -#define NS_UTF8TOUNICODE_CONTRACTID "@mozilla.org/intl/unicode/decoder;1?charset=UTF8" +#define NS_UTF8TOUNICODE_CONTRACTID "@mozilla.org/intl/unicode/decoder;1?charset=UTF-8" //#define NS_ERROR_UCONV_NOUTF8TOUNICODE \ // NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_UCONV, 0x31) diff --git a/intl/uconv/ucvlatin/Makefile.in b/intl/uconv/ucvlatin/Makefile.in index 1ff42b34a96d..10a2e9bff2dd 100644 --- a/intl/uconv/ucvlatin/Makefile.in +++ b/intl/uconv/ucvlatin/Makefile.in @@ -34,7 +34,6 @@ REQUIRES = xpcom uconv CPPSRCS = \ nsUEscapeToUnicode.cpp \ nsAsciiToUnicode.cpp \ - nsISO88591ToUnicode.cpp \ nsISO88592ToUnicode.cpp \ nsISO88593ToUnicode.cpp \ nsISO88594ToUnicode.cpp \ @@ -54,7 +53,6 @@ CPPSRCS = \ nsISOIR111ToUnicode.cpp \ nsCP1250ToUnicode.cpp \ nsCP1251ToUnicode.cpp \ - nsCP1252ToUnicode.cpp \ nsCP1253ToUnicode.cpp \ nsCP1254ToUnicode.cpp \ nsCP1255ToUnicode.cpp \ @@ -65,7 +63,6 @@ CPPSRCS = \ nsCP874ToUnicode.cpp \ nsKOI8UToUnicode.cpp \ nsKOI8RToUnicode.cpp \ - nsMacRomanToUnicode.cpp \ nsMacCEToUnicode.cpp \ nsMacGreekToUnicode.cpp \ nsMacTurkishToUnicode.cpp \ @@ -80,7 +77,6 @@ CPPSRCS = \ nsVPSToUnicode.cpp \ nsVIQRToUnicode.cpp \ nsVNIToUnicode.cpp \ - nsUTF8ToUnicode.cpp \ nsUTF7ToUnicode.cpp \ nsMUTF7ToUnicode.cpp \ nsUCS2BEToUnicode.cpp \ @@ -91,7 +87,6 @@ CPPSRCS = \ nsUserDefinedToUnicode.cpp \ nsUnicodeToUEscape.cpp \ nsUnicodeToAscii.cpp \ - nsUnicodeToISO88591.cpp \ nsUnicodeToISO88592.cpp \ nsUnicodeToISO88593.cpp \ nsUnicodeToISO88594.cpp \ @@ -111,7 +106,6 @@ CPPSRCS = \ nsUnicodeToISOIR111.cpp \ nsUnicodeToCP1250.cpp \ nsUnicodeToCP1251.cpp \ - nsUnicodeToCP1252.cpp \ nsUnicodeToCP1253.cpp \ nsUnicodeToCP1254.cpp \ nsUnicodeToCP1255.cpp \ @@ -122,7 +116,6 @@ CPPSRCS = \ nsUnicodeToCP866.cpp \ nsUnicodeToKOI8R.cpp \ nsUnicodeToKOI8U.cpp \ - nsUnicodeToMacRoman.cpp \ nsUnicodeToMacCE.cpp \ nsUnicodeToMacGreek.cpp \ nsUnicodeToMacTurkish.cpp \ @@ -137,7 +130,6 @@ CPPSRCS = \ nsUnicodeToVPS.cpp \ nsUnicodeToVIQR.cpp \ nsUnicodeToVNI.cpp \ - nsUnicodeToUTF8.cpp \ nsUnicodeToUTF7.cpp \ nsUnicodeToMUTF7.cpp \ nsUnicodeToUCS2BE.cpp \ diff --git a/intl/uconv/ucvlatin/makefile.win b/intl/uconv/ucvlatin/makefile.win index ad02430e7816..fc176b337974 100644 --- a/intl/uconv/ucvlatin/makefile.win +++ b/intl/uconv/ucvlatin/makefile.win @@ -32,7 +32,6 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll CPPSRCS = \ nsUEscapeToUnicode.cpp \ nsAsciiToUnicode.cpp \ - nsISO88591ToUnicode.cpp \ nsISO88592ToUnicode.cpp \ nsISO88593ToUnicode.cpp \ nsISO88594ToUnicode.cpp \ @@ -52,7 +51,6 @@ CPPSRCS = \ nsISOIR111ToUnicode.cpp \ nsCP1250ToUnicode.cpp \ nsCP1251ToUnicode.cpp \ - nsCP1252ToUnicode.cpp \ nsCP1253ToUnicode.cpp \ nsCP1254ToUnicode.cpp \ nsCP1255ToUnicode.cpp \ @@ -63,7 +61,6 @@ CPPSRCS = \ nsCP866ToUnicode.cpp \ nsKOI8UToUnicode.cpp \ nsKOI8RToUnicode.cpp \ - nsMacRomanToUnicode.cpp \ nsMacCEToUnicode.cpp \ nsMacGreekToUnicode.cpp \ nsMacTurkishToUnicode.cpp \ @@ -78,7 +75,6 @@ CPPSRCS = \ nsVPSToUnicode.cpp \ nsVIQRToUnicode.cpp \ nsVNIToUnicode.cpp \ - nsUTF8ToUnicode.cpp \ nsUTF7ToUnicode.cpp \ nsMUTF7ToUnicode.cpp \ nsUCS2BEToUnicode.cpp \ @@ -89,7 +85,6 @@ CPPSRCS = \ nsUserDefinedToUnicode.cpp \ nsUnicodeToUEscape.cpp \ nsUnicodeToAscii.cpp \ - nsUnicodeToISO88591.cpp \ nsUnicodeToISO88592.cpp \ nsUnicodeToISO88593.cpp \ nsUnicodeToISO88594.cpp \ @@ -109,7 +104,6 @@ CPPSRCS = \ nsUnicodeToISOIR111.cpp \ nsUnicodeToCP1250.cpp \ nsUnicodeToCP1251.cpp \ - nsUnicodeToCP1252.cpp \ nsUnicodeToCP1253.cpp \ nsUnicodeToCP1254.cpp \ nsUnicodeToCP1255.cpp \ @@ -120,7 +114,6 @@ CPPSRCS = \ nsUnicodeToCP866.cpp \ nsUnicodeToKOI8R.cpp \ nsUnicodeToKOI8U.cpp \ - nsUnicodeToMacRoman.cpp \ nsUnicodeToMacCE.cpp \ nsUnicodeToMacGreek.cpp \ nsUnicodeToMacTurkish.cpp \ @@ -129,7 +122,6 @@ CPPSRCS = \ nsUnicodeToMacCyrillic.cpp \ nsUnicodeToMacUkrainian.cpp \ nsUnicodeToMacIcelandic.cpp \ - nsUnicodeToUTF8.cpp \ nsUnicodeToUTF7.cpp \ nsUnicodeToMUTF7.cpp \ nsUnicodeToUCS2BE.cpp \ @@ -153,7 +145,6 @@ CPPSRCS = \ CPP_OBJS= \ .\$(OBJDIR)\nsUEscapeToUnicode.obj \ .\$(OBJDIR)\nsAsciiToUnicode.obj \ - .\$(OBJDIR)\nsISO88591ToUnicode.obj \ .\$(OBJDIR)\nsISO88592ToUnicode.obj \ .\$(OBJDIR)\nsISO88593ToUnicode.obj \ .\$(OBJDIR)\nsISO88594ToUnicode.obj \ @@ -173,7 +164,6 @@ CPP_OBJS= \ .\$(OBJDIR)\nsISOIR111ToUnicode.obj \ .\$(OBJDIR)\nsCP1250ToUnicode.obj \ .\$(OBJDIR)\nsCP1251ToUnicode.obj \ - .\$(OBJDIR)\nsCP1252ToUnicode.obj \ .\$(OBJDIR)\nsCP1253ToUnicode.obj \ .\$(OBJDIR)\nsCP1254ToUnicode.obj \ .\$(OBJDIR)\nsCP1255ToUnicode.obj \ @@ -184,11 +174,9 @@ CPP_OBJS= \ .\$(OBJDIR)\nsCP866ToUnicode.obj \ .\$(OBJDIR)\nsKOI8RToUnicode.obj \ .\$(OBJDIR)\nsKOI8UToUnicode.obj \ - .\$(OBJDIR)\nsMacRomanToUnicode.obj \ .\$(OBJDIR)\nsMacCEToUnicode.obj \ .\$(OBJDIR)\nsMacGreekToUnicode.obj \ .\$(OBJDIR)\nsMacTurkishToUnicode.obj \ - .\$(OBJDIR)\nsUTF8ToUnicode.obj \ .\$(OBJDIR)\nsUTF7ToUnicode.obj \ .\$(OBJDIR)\nsMUTF7ToUnicode.obj \ .\$(OBJDIR)\nsUCS2BEToUnicode.obj \ @@ -210,7 +198,6 @@ CPP_OBJS= \ .\$(OBJDIR)\nsUserDefinedToUnicode.obj \ .\$(OBJDIR)\nsUnicodeToUEscape.obj \ .\$(OBJDIR)\nsUnicodeToAscii.obj \ - .\$(OBJDIR)\nsUnicodeToISO88591.obj \ .\$(OBJDIR)\nsUnicodeToISO88592.obj \ .\$(OBJDIR)\nsUnicodeToISO88593.obj \ .\$(OBJDIR)\nsUnicodeToISO88594.obj \ @@ -230,7 +217,6 @@ CPP_OBJS= \ .\$(OBJDIR)\nsUnicodeToISOIR111.obj \ .\$(OBJDIR)\nsUnicodeToCP1250.obj \ .\$(OBJDIR)\nsUnicodeToCP1251.obj \ - .\$(OBJDIR)\nsUnicodeToCP1252.obj \ .\$(OBJDIR)\nsUnicodeToCP1253.obj \ .\$(OBJDIR)\nsUnicodeToCP1254.obj \ .\$(OBJDIR)\nsUnicodeToCP1255.obj \ @@ -241,11 +227,9 @@ CPP_OBJS= \ .\$(OBJDIR)\nsUnicodeToCP866.obj \ .\$(OBJDIR)\nsUnicodeToKOI8R.obj \ .\$(OBJDIR)\nsUnicodeToKOI8U.obj \ - .\$(OBJDIR)\nsUnicodeToMacRoman.obj \ .\$(OBJDIR)\nsUnicodeToMacCE.obj \ .\$(OBJDIR)\nsUnicodeToMacGreek.obj \ .\$(OBJDIR)\nsUnicodeToMacTurkish.obj \ - .\$(OBJDIR)\nsUnicodeToUTF8.obj \ .\$(OBJDIR)\nsUnicodeToUTF7.obj \ .\$(OBJDIR)\nsUnicodeToMUTF7.obj \ .\$(OBJDIR)\nsUnicodeToUCS2BE.obj \ diff --git a/intl/uconv/ucvlatin/nsUCvLatinCID.h b/intl/uconv/ucvlatin/nsUCvLatinCID.h index 79b853a43699..4013345cbbe7 100644 --- a/intl/uconv/ucvlatin/nsUCvLatinCID.h +++ b/intl/uconv/ucvlatin/nsUCvLatinCID.h @@ -25,13 +25,6 @@ #include "nsISupports.h" -// Class ID for our ISO88591ToUnicode charset converter -// {A3254CB0-8E20-11d2-8A98-00600811A836} -NS_DECLARE_ID(kISO88591ToUnicodeCID, - 0xa3254cb0, 0x8e20, 0x11d2, 0x8a, 0x98, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36); -#define NS_ISO88591TOUNICODE_CID \ - { 0xa3254cb0, 0x8e20, 0x11d2, {0x8a, 0x98, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}} - // Class ID for our ISO88592ToUnicode charset converter // {7C657D11-EC5E-11d2-8AAC-00600811A836} NS_DECLARE_ID(kISO88592ToUnicodeCID, @@ -145,13 +138,6 @@ NS_DECLARE_ID(kCP1251ToUnicodeCID, #define NS_CP1251TOUNICODE_CID \ { 0xa578e0a1, 0xf76b, 0x11d2, {0x8a, 0xad, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}} -// Class ID for our CP1252ToUnicode charset converter -// {7C657D15-EC5E-11d2-8AAC-00600811A836} -NS_DECLARE_ID(kCP1252ToUnicodeCID, - 0x7c657d15, 0xec5e, 0x11d2, 0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36); -#define NS_CP1252TOUNICODE_CID \ - { 0x7c657d15, 0xec5e, 0x11d2, {0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}} - // Class ID for our CP1253ToUnicode charset converter // {AF7A9952-AA48-11d2-B3AE-00805F8A6670} NS_DECLARE_ID(kCP1253ToUnicodeCID, @@ -201,13 +187,6 @@ NS_DECLARE_ID(kKOI8UToUnicodeCID, #define NS_KOI8UTOUNICODE_CID \ { 0x6394eea6, 0xfc3d, 0x11d2, {0xb3, 0xb8, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}} -// Class ID for our MacRomanToUnicode charset converter -// {7B8556A1-EC79-11d2-8AAC-00600811A836} -NS_DECLARE_ID(kMacRomanToUnicodeCID, - 0x7b8556a1, 0xec79, 0x11d2, 0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36); -#define NS_MACROMANTOUNICODE_CID \ - { 0x7b8556a1, 0xec79, 0x11d2, {0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}} - // Class ID for our MacCEToUnicode charset converter // {7B8556A2-EC79-11d2-8AAC-00600811A836} NS_DECLARE_ID(kMacCEToUnicodeCID, @@ -292,13 +271,6 @@ NS_DECLARE_ID(kVPSToUnicodeCID, #define NS_VPSTOUNICODE_CID \ { 0x6394eeb0, 0xfc3d, 0x11d2, {0xb3, 0xb8, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}} -// Class ID for our UTF8ToUnicode charset converter -// {5534DDC0-DD96-11d2-8AAC-00600811A836} -NS_DECLARE_ID(kUTF8ToUnicodeCID, - 0x5534ddc0, 0xdd96, 0x11d2, 0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36); -#define NS_UTF8TOUNICODE_CID \ - { 0x5534ddc0, 0xdd96, 0x11d2, {0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}} - // Class ID for our UTF7ToUnicode charset converter // {77CFAAF1-1CF4-11d3-8AAF-00600811A836} NS_DECLARE_ID(kUTF7ToUnicodeCID, @@ -313,12 +285,6 @@ NS_DECLARE_ID(kMUTF7ToUnicodeCID, #define NS_MUTF7TOUNICODE_CID \ { 0xb57f97c1, 0xd70, 0x11d3, {0x8a, 0xae, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}} -// {920307B0-C6E8-11d2-8AA8-00600811A836} -NS_DECLARE_ID(kUnicodeToISO88591CID, - 0x920307b0, 0xc6e8, 0x11d2, 0x8a, 0xa8, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36); -#define NS_UNICODETOISO88591_CID \ - { 0x920307b0, 0xc6e8, 0x11d2, {0x8a, 0xa8, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}} - // Class ID for our UnicodeToISO88592 charset converter // {7B8556A6-EC79-11d2-8AAC-00600811A836} NS_DECLARE_ID(kUnicodeToISO88592CID, @@ -431,13 +397,6 @@ NS_DECLARE_ID(kUnicodeToCP1251CID, #define NS_UNICODETOCP1251_CID \ { 0xa578e0a3, 0xf76b, 0x11d2, {0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}} -// Class ID for our UnicodeToCP1252 charset converter -// {7B8556AC-EC79-11d2-8AAC-00600811A836} -NS_DECLARE_ID(kUnicodeToCP1252CID, - 0x7b8556ac, 0xec79, 0x11d2, 0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36); -#define NS_UNICODETOCP1252_CID \ - { 0x7b8556ac, 0xec79, 0x11d2, {0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}} - // Class ID for our UnicodeToCP1253 charset converter // {7B8556AD-EC79-11d2-8AAC-00600811A836} NS_DECLARE_ID(kUnicodeToCP1253CID, @@ -487,13 +446,6 @@ NS_DECLARE_ID(kUnicodeToKOI8UCID, #define NS_UNICODETOKOI8U_CID \ { 0x6394eeb6, 0xfc3d, 0x11d2, {0xb3, 0xb8, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}} -// Class ID for our UnicodeToMacRoman charset converter -// {7B8556AF-EC79-11d2-8AAC-00600811A836} -NS_DECLARE_ID(kUnicodeToMacRomanCID, - 0x7b8556af, 0xec79, 0x11d2, 0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36); -#define NS_UNICODETOMACROMAN_CID \ - { 0x7b8556af, 0xec79, 0x11d2, {0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}} - // Class ID for our UnicodeToMacCE charset converter // {7B8556B0-EC79-11d2-8AAC-00600811A836} NS_DECLARE_ID(kUnicodeToMacCECID, @@ -578,13 +530,6 @@ NS_DECLARE_ID(kUnicodeToVPSCID, #define NS_UNICODETOVPS_CID \ { 0x6394eec0, 0xfc3d, 0x11d2, {0xb3, 0xb8, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}} -// Class ID for our UnicodeToUTF8 charset converter -// {7C657D18-EC5E-11d2-8AAC-00600811A836} -NS_DECLARE_ID(kUnicodeToUTF8CID, - 0x7c657d18, 0xec5e, 0x11d2, 0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36); -#define NS_UNICODETOUTF8_CID \ - { 0x7c657d18, 0xec5e, 0x11d2, {0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}} - // Class ID for our UnicodeToUTF7 charset converter // {77CFAAF2-1CF4-11d3-8AAF-00600811A836} NS_DECLARE_ID(kUnicodeToUTF7CID, diff --git a/intl/uconv/ucvlatin/nsUCvLatinModule.cpp b/intl/uconv/ucvlatin/nsUCvLatinModule.cpp index 762a273d977c..ff7e1a8f50d1 100644 --- a/intl/uconv/ucvlatin/nsUCvLatinModule.cpp +++ b/intl/uconv/ucvlatin/nsUCvLatinModule.cpp @@ -39,7 +39,6 @@ #include "nsUEscapeToUnicode.h" #include "nsUnicodeToUEscape.h" #include "nsAsciiToUnicode.h" -#include "nsISO88591ToUnicode.h" #include "nsISO88592ToUnicode.h" #include "nsISO88593ToUnicode.h" #include "nsISO88594ToUnicode.h" @@ -59,7 +58,6 @@ #include "nsISOIR111ToUnicode.h" #include "nsCP1250ToUnicode.h" #include "nsCP1251ToUnicode.h" -#include "nsCP1252ToUnicode.h" #include "nsCP1253ToUnicode.h" #include "nsCP1254ToUnicode.h" #include "nsCP1255ToUnicode.h" @@ -70,7 +68,6 @@ #include "nsCP866ToUnicode.h" #include "nsKOI8RToUnicode.h" #include "nsKOI8UToUnicode.h" -#include "nsMacRomanToUnicode.h" #include "nsMacCEToUnicode.h" #include "nsMacGreekToUnicode.h" #include "nsMacTurkishToUnicode.h" @@ -83,7 +80,6 @@ #include "nsTCVN5712ToUnicode.h" #include "nsVISCIIToUnicode.h" #include "nsVPSToUnicode.h" -#include "nsUTF8ToUnicode.h" #include "nsUTF7ToUnicode.h" #include "nsMUTF7ToUnicode.h" #include "nsUCS4BEToUnicode.h" @@ -93,7 +89,6 @@ #include "nsT61ToUnicode.h" #include "nsUserDefinedToUnicode.h" #include "nsUnicodeToAscii.h" -#include "nsUnicodeToISO88591.h" #include "nsUnicodeToISO88592.h" #include "nsUnicodeToISO88593.h" #include "nsUnicodeToISO88594.h" @@ -113,7 +108,6 @@ #include "nsUnicodeToISOIR111.h" #include "nsUnicodeToCP1250.h" #include "nsUnicodeToCP1251.h" -#include "nsUnicodeToCP1252.h" #include "nsUnicodeToCP1253.h" #include "nsUnicodeToCP1254.h" #include "nsUnicodeToCP1255.h" @@ -124,7 +118,6 @@ #include "nsUnicodeToCP866.h" #include "nsUnicodeToKOI8R.h" #include "nsUnicodeToKOI8U.h" -#include "nsUnicodeToMacRoman.h" #include "nsUnicodeToMacCE.h" #include "nsUnicodeToMacGreek.h" #include "nsUnicodeToMacTurkish.h" @@ -137,7 +130,6 @@ #include "nsUnicodeToTCVN5712.h" #include "nsUnicodeToVISCII.h" #include "nsUnicodeToVPS.h" -#include "nsUnicodeToUTF8.h" #include "nsUnicodeToUTF7.h" #include "nsUnicodeToMUTF7.h" #include "nsUnicodeToUCS2BE.h" @@ -164,7 +156,6 @@ NS_IMPL_NSUCONVERTERREGSELF NS_UCONV_REG_UNREG(nsAsciiToUnicode, "us-ascii", "Unicode" , NS_ASCIITOUNICODE_CID); NS_UCONV_REG_UNREG(nsUEscapeToUnicode, "x-u-escaped", "Unicode" , NS_UESCAPETOUNICODE_CID); -NS_UCONV_REG_UNREG(nsISO88591ToUnicode, "ISO-8859-1", "Unicode" , NS_ISO88591TOUNICODE_CID); NS_UCONV_REG_UNREG(nsISO88592ToUnicode, "ISO-8859-2", "Unicode" , NS_ISO88592TOUNICODE_CID); NS_UCONV_REG_UNREG(nsISO88593ToUnicode, "ISO-8859-3", "Unicode" , NS_ISO88593TOUNICODE_CID); NS_UCONV_REG_UNREG(nsISO88594ToUnicode, "ISO-8859-4", "Unicode" , NS_ISO88594TOUNICODE_CID); @@ -184,7 +175,6 @@ NS_UCONV_REG_UNREG(nsISO885915ToUnicode, "ISO-8859-15", "Unicode" , NS_ISO885915 NS_UCONV_REG_UNREG(nsISOIR111ToUnicode, "ISO-IR-111", "Unicode" , NS_ISOIR111TOUNICODE_CID); NS_UCONV_REG_UNREG(nsCP1250ToUnicode, "windows-1250", "Unicode" , NS_CP1250TOUNICODE_CID); NS_UCONV_REG_UNREG(nsCP1251ToUnicode, "windows-1251", "Unicode" , NS_CP1251TOUNICODE_CID); -NS_UCONV_REG_UNREG(nsCP1252ToUnicode, "windows-1252", "Unicode" , NS_CP1252TOUNICODE_CID); NS_UCONV_REG_UNREG(nsCP1253ToUnicode, "windows-1253", "Unicode" , NS_CP1253TOUNICODE_CID); NS_UCONV_REG_UNREG(nsCP1254ToUnicode, "windows-1254", "Unicode" , NS_CP1254TOUNICODE_CID); NS_UCONV_REG_UNREG(nsCP1255ToUnicode, "windows-1255", "Unicode" , NS_CP1255TOUNICODE_CID); @@ -195,7 +185,6 @@ NS_UCONV_REG_UNREG(nsCP874ToUnicode, "TIS-620", "Unicode" , NS_CP874TOUNICODE_CI NS_UCONV_REG_UNREG(nsCP866ToUnicode, "IBM866", "Unicode" , NS_CP866TOUNICODE_CID); NS_UCONV_REG_UNREG(nsKOI8RToUnicode, "KOI8-R", "Unicode" , NS_KOI8RTOUNICODE_CID); NS_UCONV_REG_UNREG(nsKOI8UToUnicode, "KOI8-U", "Unicode" , NS_KOI8UTOUNICODE_CID); -NS_UCONV_REG_UNREG(nsMacRomanToUnicode, "x-mac-roman", "Unicode" , NS_MACROMANTOUNICODE_CID); NS_UCONV_REG_UNREG(nsMacCEToUnicode, "x-mac-ce", "Unicode" , NS_MACCETOUNICODE_CID); NS_UCONV_REG_UNREG(nsMacGreekToUnicode, "x-mac-greek", "Unicode" , NS_MACGREEKTOUNICODE_CID); NS_UCONV_REG_UNREG(nsMacTurkishToUnicode, "x-mac-turkish", "Unicode" , NS_MACTURKISHTOUNICODE_CID); @@ -208,7 +197,6 @@ NS_UCONV_REG_UNREG(nsARMSCII8ToUnicode, "armscii-8", "Unicode" , NS_ARMSCII8TOUN NS_UCONV_REG_UNREG(nsTCVN5712ToUnicode, "x-viet-tcvn5712", "Unicode" , NS_TCVN5712TOUNICODE_CID); NS_UCONV_REG_UNREG(nsVISCIIToUnicode, "VISCII", "Unicode" , NS_VISCIITOUNICODE_CID); NS_UCONV_REG_UNREG(nsVPSToUnicode, "x-viet-vps", "Unicode" , NS_VPSTOUNICODE_CID); -NS_UCONV_REG_UNREG(nsUTF8ToUnicode, "UTF-8", "Unicode" , NS_UTF8TOUNICODE_CID); NS_UCONV_REG_UNREG(nsUTF7ToUnicode, "UTF-7", "Unicode" , NS_UTF7TOUNICODE_CID); NS_UCONV_REG_UNREG(nsMUTF7ToUnicode, "x-imap4-modified-utf7", "Unicode" , NS_MUTF7TOUNICODE_CID); NS_UCONV_REG_UNREG(nsUTF16BEToUnicode, "UTF-16BE", "Unicode" , NS_UTF16BETOUNICODE_CID); @@ -219,7 +207,6 @@ NS_UCONV_REG_UNREG(nsT61ToUnicode, "T.61-8bit", "Unicode" , NS_T61TOUNICODE_CID) NS_UCONV_REG_UNREG(nsUserDefinedToUnicode, "x-user-defined", "Unicode" , NS_USERDEFINEDTOUNICODE_CID); NS_UCONV_REG_UNREG(nsUnicodeToAscii, "Unicode", "us-ascii" , NS_UNICODETOASCII_CID); NS_UCONV_REG_UNREG(nsUnicodeToUEscape, "Unicode", "x-u-escaped" , NS_UNICODETOUESCAPE_CID); -NS_UCONV_REG_UNREG(nsUnicodeToISO88591, "Unicode", "ISO-8859-1" , NS_UNICODETOISO88591_CID); NS_UCONV_REG_UNREG(nsUnicodeToISO88592, "Unicode", "ISO-8859-2" , NS_UNICODETOISO88592_CID); NS_UCONV_REG_UNREG(nsUnicodeToISO88593, "Unicode", "ISO-8859-3" , NS_UNICODETOISO88593_CID); NS_UCONV_REG_UNREG(nsUnicodeToISO88594, "Unicode", "ISO-8859-4" , NS_UNICODETOISO88594_CID); @@ -239,7 +226,6 @@ NS_UCONV_REG_UNREG(nsUnicodeToISO885915, "Unicode", "ISO-8859-15" , NS_UNICODETO NS_UCONV_REG_UNREG(nsUnicodeToISOIR111, "Unicode", "ISO-IR-111" , NS_UNICODETOISOIR111_CID); NS_UCONV_REG_UNREG(nsUnicodeToCP1250, "Unicode", "windows-1250" , NS_UNICODETOCP1250_CID); NS_UCONV_REG_UNREG(nsUnicodeToCP1251, "Unicode", "windows-1251" , NS_UNICODETOCP1251_CID); -NS_UCONV_REG_UNREG(nsUnicodeToCP1252, "Unicode", "windows-1252" , NS_UNICODETOCP1252_CID); NS_UCONV_REG_UNREG(nsUnicodeToCP1253, "Unicode", "windows-1253" , NS_UNICODETOCP1253_CID); NS_UCONV_REG_UNREG(nsUnicodeToCP1254, "Unicode", "windows-1254" , NS_UNICODETOCP1254_CID); NS_UCONV_REG_UNREG(nsUnicodeToCP1255, "Unicode", "windows-1255" , NS_UNICODETOCP1255_CID); @@ -250,7 +236,6 @@ NS_UCONV_REG_UNREG(nsUnicodeToCP874, "Unicode", "TIS-620" , NS_UNICODETOCP874_CI NS_UCONV_REG_UNREG(nsUnicodeToCP866, "Unicode", "IBM866" , NS_UNICODETOCP866_CID); NS_UCONV_REG_UNREG(nsUnicodeToKOI8R, "Unicode", "KOI8-R" , NS_UNICODETOKOI8R_CID); NS_UCONV_REG_UNREG(nsUnicodeToKOI8U, "Unicode", "KOI8-U" , NS_UNICODETOKOI8U_CID); -NS_UCONV_REG_UNREG(nsUnicodeToMacRoman, "Unicode", "x-mac-roman" , NS_UNICODETOMACROMAN_CID); NS_UCONV_REG_UNREG(nsUnicodeToMacCE, "Unicode", "x-mac-ce" , NS_UNICODETOMACCE_CID); NS_UCONV_REG_UNREG(nsUnicodeToMacGreek, "Unicode", "x-mac-greek" , NS_UNICODETOMACGREEK_CID); NS_UCONV_REG_UNREG(nsUnicodeToMacTurkish, "Unicode", "x-mac-turkish" , NS_UNICODETOMACTURKISH_CID); @@ -263,7 +248,6 @@ NS_UCONV_REG_UNREG(nsUnicodeToARMSCII8, "Unicode", "armscii-8" , NS_UNICODETOARM NS_UCONV_REG_UNREG(nsUnicodeToTCVN5712, "Unicode", "x-viet-tcvn5712" , NS_UNICODETOTCVN5712_CID); NS_UCONV_REG_UNREG(nsUnicodeToVISCII, "Unicode", "VISCII" , NS_UNICODETOVISCII_CID); NS_UCONV_REG_UNREG(nsUnicodeToVPS, "Unicode", "x-viet-vps" , NS_UNICODETOVPS_CID); -NS_UCONV_REG_UNREG(nsUnicodeToUTF8, "Unicode", "UTF-8" , NS_UNICODETOUTF8_CID); NS_UCONV_REG_UNREG(nsUnicodeToUTF7, "Unicode", "UTF-7" , NS_UNICODETOUTF7_CID); NS_UCONV_REG_UNREG(nsUnicodeToMUTF7, "Unicode", "x-imap4-modified-utf7" , NS_UNICODETOMUTF7_CID); NS_UCONV_REG_UNREG(nsUnicodeToUTF16BE, "Unicode", "UTF-16BE" , NS_UNICODETOUTF16BE_CID); @@ -278,7 +262,6 @@ NS_UCONV_REG_UNREG(nsUnicodeToZapfDingbat, "Unicode", "x-zapf-dingbats" , NS_UNI NS_GENERIC_FACTORY_CONSTRUCTOR(nsAsciiToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUEscapeToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88591ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88592ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88593ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88594ToUnicode); @@ -298,7 +281,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO885915ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsISOIR111ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP1250ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP1251ToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP1252ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP1253ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP1254ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP1255ToUnicode); @@ -309,7 +291,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP874ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP866ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOI8RToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOI8UToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacRomanToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacCEToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacGreekToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacTurkishToUnicode); @@ -322,7 +303,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsARMSCII8ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsTCVN5712ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsVISCIIToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsVPSToUnicode); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF8ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF7ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsMUTF7ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF16BEToUnicode); @@ -333,7 +313,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsT61ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserDefinedToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToAscii); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUEscape); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88591); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88592); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88593); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88594); @@ -353,7 +332,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO885915); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISOIR111); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP1250); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP1251); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP1252); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP1253); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP1254); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP1255); @@ -364,7 +342,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP874); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP866); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToKOI8R); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToKOI8U); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacRoman); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacCE); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacGreek); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacTurkish); @@ -377,7 +354,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToARMSCII8); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTCVN5712); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToVISCII); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToVPS); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF8); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF7); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMUTF7); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF16BE); @@ -404,12 +380,6 @@ static nsModuleComponentInfo components[] = nsUEscapeToUnicodeConstructor , nsUEscapeToUnicodeRegSelf , nsUEscapeToUnicodeUnRegSelf }, - { - DECODER_NAME_BASE "ISO-8859-1" , NS_ISO88591TOUNICODE_CID, - NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-1", - nsISO88591ToUnicodeConstructor , - nsISO88591ToUnicodeRegSelf , nsISO88591ToUnicodeUnRegSelf - }, { DECODER_NAME_BASE "ISO-8859-2" , NS_ISO88592TOUNICODE_CID, NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-2", @@ -524,12 +494,6 @@ static nsModuleComponentInfo components[] = nsCP1251ToUnicodeConstructor , nsCP1251ToUnicodeRegSelf , nsCP1251ToUnicodeUnRegSelf }, - { - DECODER_NAME_BASE "windows-1252" , NS_CP1252TOUNICODE_CID, - NS_UNICODEDECODER_CONTRACTID_BASE "windows-1252", - nsCP1252ToUnicodeConstructor , - nsCP1252ToUnicodeRegSelf , nsCP1252ToUnicodeUnRegSelf - }, { DECODER_NAME_BASE "windows-1253" , NS_CP1253TOUNICODE_CID, NS_UNICODEDECODER_CONTRACTID_BASE "windows-1253", @@ -591,13 +555,7 @@ static nsModuleComponentInfo components[] = nsKOI8UToUnicodeRegSelf , nsKOI8UToUnicodeUnRegSelf }, { - DECODER_NAME_BASE "x-mac-roman" , NS_MACROMANTOUNICODE_CID, - NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-roman", - nsMacRomanToUnicodeConstructor , - nsMacRomanToUnicodeRegSelf , nsMacRomanToUnicodeUnRegSelf - }, - { - DECODER_NAME_BASE "x-mac-ce" , NS_MACROMANTOUNICODE_CID, + DECODER_NAME_BASE "x-mac-ce" , NS_MACCETOUNICODE_CID, NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-ce", nsMacCEToUnicodeConstructor , nsMacCEToUnicodeRegSelf , nsMacCEToUnicodeUnRegSelf @@ -614,12 +572,6 @@ static nsModuleComponentInfo components[] = nsMacTurkishToUnicodeConstructor , nsMacTurkishToUnicodeRegSelf , nsMacTurkishToUnicodeUnRegSelf }, - { - DECODER_NAME_BASE "x-mac-roman" , NS_MACROMANTOUNICODE_CID, - NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-roman", - nsMacRomanToUnicodeConstructor , - nsMacRomanToUnicodeRegSelf , nsMacRomanToUnicodeUnRegSelf - }, { DECODER_NAME_BASE "x-mac-croatian" , NS_MACCROATIANTOUNICODE_CID, NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-croatian", @@ -674,12 +626,6 @@ static nsModuleComponentInfo components[] = nsVPSToUnicodeConstructor , nsVPSToUnicodeRegSelf , nsVPSToUnicodeUnRegSelf }, - { - DECODER_NAME_BASE "UTF-8" , NS_UTF8TOUNICODE_CID, - NS_UNICODEDECODER_CONTRACTID_BASE "UTF-8", - nsUTF8ToUnicodeConstructor , - nsUTF8ToUnicodeRegSelf , nsUTF8ToUnicodeUnRegSelf - }, { DECODER_NAME_BASE "UTF-7" , NS_UTF7TOUNICODE_CID, NS_UNICODEDECODER_CONTRACTID_BASE "UTF-7", @@ -740,12 +686,6 @@ static nsModuleComponentInfo components[] = nsUnicodeToUEscapeConstructor, nsUnicodeToUEscapeRegSelf, nsUnicodeToUEscapeUnRegSelf }, - { - ENCODER_NAME_BASE "ISO-8859-1" , NS_UNICODETOISO88591_CID, - NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-1", - nsUnicodeToISO88591Constructor, - nsUnicodeToISO88591RegSelf, nsUnicodeToISO88591UnRegSelf - }, { ENCODER_NAME_BASE "ISO-8859-2" , NS_UNICODETOISO88592_CID, NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-2", @@ -860,12 +800,6 @@ static nsModuleComponentInfo components[] = nsUnicodeToCP1251Constructor, nsUnicodeToCP1251RegSelf, nsUnicodeToCP1251UnRegSelf }, - { - ENCODER_NAME_BASE "windows-1252" , NS_UNICODETOCP1252_CID, - NS_UNICODEENCODER_CONTRACTID_BASE "windows-1252", - nsUnicodeToCP1252Constructor, - nsUnicodeToCP1252RegSelf, nsUnicodeToCP1252UnRegSelf - }, { ENCODER_NAME_BASE "windows-1253" , NS_UNICODETOCP1253_CID, NS_UNICODEENCODER_CONTRACTID_BASE "windows-1253", @@ -926,12 +860,6 @@ static nsModuleComponentInfo components[] = nsUnicodeToKOI8UConstructor, nsUnicodeToKOI8URegSelf, nsUnicodeToKOI8UUnRegSelf }, - { - ENCODER_NAME_BASE "x-mac-roman" , NS_UNICODETOMACROMAN_CID, - NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-roman", - nsUnicodeToMacRomanConstructor, - nsUnicodeToMacRomanRegSelf, nsUnicodeToMacRomanUnRegSelf - }, { ENCODER_NAME_BASE "x-mac-ce" , NS_UNICODETOMACCE_CID, NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-ce", @@ -998,12 +926,6 @@ static nsModuleComponentInfo components[] = nsUnicodeToVPSConstructor, nsUnicodeToVPSRegSelf, nsUnicodeToVPSUnRegSelf }, - { - ENCODER_NAME_BASE "UTF-8" , NS_UNICODETOUTF8_CID, - NS_UNICODEENCODER_CONTRACTID_BASE "UTF-8", - nsUnicodeToUTF8Constructor, - nsUnicodeToUTF8RegSelf, nsUnicodeToUTF8UnRegSelf - }, { ENCODER_NAME_BASE "UTF-7" , NS_UNICODETOUTF7_CID, NS_UNICODEENCODER_CONTRACTID_BASE "UTF-7", @@ -1046,7 +968,7 @@ static nsModuleComponentInfo components[] = nsUnicodeToUCS4LEConstructor, nsUnicodeToUCS4LERegSelf, nsUnicodeToUCS4LEUnRegSelf }, - { + { ENCODER_NAME_BASE "T.61-8bit" , NS_UNICODETOT61_CID, NS_UNICODEENCODER_CONTRACTID_BASE "T.61-8bit", nsUnicodeToT61Constructor,