diff --git a/build/mac/build_scripts/MozillaBuildList.pm b/build/mac/build_scripts/MozillaBuildList.pm index 2357ae64563..b399f3f9d4a 100644 --- a/build/mac/build_scripts/MozillaBuildList.pm +++ b/build/mac/build_scripts/MozillaBuildList.pm @@ -1748,13 +1748,6 @@ sub BuildInternationalProjects() BuildOneProject(":mozilla:intl:chardet:macbuild:chardet.xml", "chardet$D.$S", 1, $main::ALIAS_SYM_FILES, 1); BuildOneProject(":mozilla:intl:uconv:macbuild:uconv.xml", "uconv$D.$S", 1, $main::ALIAS_SYM_FILES, 1); - BuildOneProject(":mozilla:intl:uconv:macbuild:ucvlatin.xml", "ucvlatin$D.$S", 1, $main::ALIAS_SYM_FILES, 1); - BuildOneProject(":mozilla:intl:uconv:macbuild:ucvja.xml", "ucvja$D.$S", 1, $main::ALIAS_SYM_FILES, 1); - BuildOneProject(":mozilla:intl:uconv:macbuild:ucvtw.xml", "ucvtw$D.$S", 1, $main::ALIAS_SYM_FILES, 1); - BuildOneProject(":mozilla:intl:uconv:macbuild:ucvtw2.xml", "ucvtw2$D.$S", 1, $main::ALIAS_SYM_FILES, 1); - BuildOneProject(":mozilla:intl:uconv:macbuild:ucvcn.xml", "ucvcn$D.$S", 1, $main::ALIAS_SYM_FILES, 1); - BuildOneProject(":mozilla:intl:uconv:macbuild:ucvko.xml", "ucvko$D.$S", 1, $main::ALIAS_SYM_FILES, 1); - BuildOneProject(":mozilla:intl:uconv:macbuild:ucvibm.xml", "ucvibm$D.$S", 1, $main::ALIAS_SYM_FILES, 1); if ($main::options{mathml}) { BuildOneProject(":mozilla:intl:uconv:macbuild:ucvmath.xml", "ucvmath$D.$S", 1, $main::ALIAS_SYM_FILES, 1); diff --git a/embedding/config/basebrowser-mac-cfm b/embedding/config/basebrowser-mac-cfm index 980b132bfed..480932e2d24 100644 --- a/embedding/config/basebrowser-mac-cfm +++ b/embedding/config/basebrowser-mac-cfm @@ -209,19 +209,10 @@ Components:uconv.xpt Components:lwbrk.shlb Components:nslocale.shlb Components:nslocale.xpt -Components:ucvlatin.shlb Components:chardet.shlb Components:chardet.xpt Components:Universalchardet.shlb -; optional - on english only systems -; Components:ucvja.shlb for japanese -; Components:ucvko.shlb for korean -; Components:ucvcn.shlb for simplified chinese -; Components:ucvtw.shlb for traditional chinese -; Components:ucvtw2.shlb for traditional chinese -; Components:ucvibm.shlb for ibm - res:language.properties res:langGroups.properties diff --git a/embedding/config/basebrowser-mac-cfmDebug b/embedding/config/basebrowser-mac-cfmDebug index e9ef349911f..08b35cd79fb 100644 --- a/embedding/config/basebrowser-mac-cfmDebug +++ b/embedding/config/basebrowser-mac-cfmDebug @@ -209,19 +209,10 @@ Components:uconv.xpt Components:lwbrkDebug.shlb Components:nslocaleDebug.shlb Components:nslocale.xpt -Components:ucvlatinDebug.shlb Components:chardetDebug.shlb Components:chardet.xpt Components:UniversalchardetDebug.shlb -; optional - on english only systems -; Components:ucvjaDebug.shlb for japanese -; Components:ucvkoDebug.shlb for korean -; Components:ucvcnDebug.shlb for simplified chinese -; Components:ucvtwDebug.shlb for traditional chinese -; Components:ucvtw2Debug.shlb for traditional chinese -; Components:ucvibmDebug.shlb for ibm - res:language.properties res:langGroups.properties diff --git a/embedding/config/basebrowser-mac-macho b/embedding/config/basebrowser-mac-macho index a9d15638c25..3f6dd718800 100644 --- a/embedding/config/basebrowser-mac-macho +++ b/embedding/config/basebrowser-mac-macho @@ -198,17 +198,8 @@ components/libuconv.dylib components/uconv.xpt components/liblwbrk.dylib components/libnslocale.dylib -components/libucvlatin.dylib components/unicharutil.xpt components/libchardet.dylib -; optional - on english only systems -; components/libucvja.dylib for japanese -; components/libucvko.dylib for korean -; components/libucvcn.dylib for simplified chinese -; components/libucvtw.dylib for traditional chinese -; components/libucvtw2.dylib for traditional chinese -; components/libucvibm.dylib for ibm - res/language.properties res/langGroups.properties diff --git a/embedding/config/basebrowser-unix b/embedding/config/basebrowser-unix index 94389f3581a..dbefb87737a 100644 --- a/embedding/config/basebrowser-unix +++ b/embedding/config/basebrowser-unix @@ -141,16 +141,8 @@ components/libuconv.so components/uconv.xpt components/liblwbrk.so components/libnslocale.so -components/libucvlatin.so components/unicharutil.xpt components/libchardet.so -; optional - on english only systems -; components/libucvja.so for japanese -; components/libucvko.so for korean -; components/libucvcn.so for simplified chinese -; components/libucvtw.so for traditional chinese -; components/libucvtw2.so for traditional chinese -; components/libucvibm.so for ibm ; required i18n libs components/libstrres.so diff --git a/embedding/config/basebrowser-win b/embedding/config/basebrowser-win index 481a5ad1b56..2d5ee851344 100644 --- a/embedding/config/basebrowser-win +++ b/embedding/config/basebrowser-win @@ -149,16 +149,8 @@ components\uconv.dll components\uconv.xpt components\lwbrk.dll components\nslocale.dll -components\ucvlatin.dll components\unicharutil.xpt components\chardet.dll -; optional - on english only systems -; components\ucvja.dll for japanese -; components\ucvko.dll for korean -; components\ucvcn.dll for simplified chinese -; components\ucvtw.dll for traditional chinese -; components\ucvtw2.dll for traditional chinese -; components\ucvibm.dll for ibm ; required i18n libs components\strres.dll diff --git a/intl/uconv/Makefile.in b/intl/uconv/Makefile.in index 824941ecc34..8617304e8e0 100644 --- a/intl/uconv/Makefile.in +++ b/intl/uconv/Makefile.in @@ -38,7 +38,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = idl public src ucvja ucvcn ucvlatin ucvtw ucvtw2 ucvko ucvibm +DIRS = idl public util ucvja ucvcn ucvlatin ucvtw ucvtw2 ucvko ucvibm src ifdef MOZ_MATHML DIRS += ucvmath diff --git a/intl/uconv/macbuild/uconv.xml b/intl/uconv/macbuild/uconv.xml index 99d958df22a..7a6da14d103 100644 --- a/intl/uconv/macbuild/uconv.xml +++ b/intl/uconv/macbuild/uconv.xml @@ -95,6 +95,86 @@ FrameworkPathfalse HostFlagsAll + + SearchPath + Path::util: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::ucvja: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::ucvko: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::ucvtw: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::ucvtw2: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::ucvcn: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::ucvlatin: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::ucvibm: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + SystemSearchPaths @@ -534,7 +614,7 @@ MWFTP_Post_hostName MWFTP_Post_username - MWFTP_Post_password0<s + MWFTP_Post_password MWFTP_Post_remoteDir MWFTP_Post_ftp_PathVersion1 MWFTP_Post_ftp_PathType0 @@ -1084,13 +1164,6 @@ Text Debug - - Name - nsUCvMinSupport.cpp - MacOS - Text - Debug - Name nsUnicodeToCP1252.cpp @@ -1147,6 +1220,1343 @@ Text Debug + + Name + nsUCSupport.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToSJIS.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP932.cpp + MacOS + Text + Debug + + + Name + nsCP932ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToJISx0212.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToJISx0208.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToJISx0201.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO2022JP.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToEUCJP.cpp + MacOS + Text + Debug + + + Name + nsJapaneseToUnicode.cpp + MacOS + Text + Debug + + + Name + nsEUCKRToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToEUCKR.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToKSC5601.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO2022KR.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP949.cpp + MacOS + Text + Debug + + + Name + nsISO2022KRToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP949ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToX11Johab.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToJohab.cpp + MacOS + Text + Debug + + + Name + nsJohabToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToJohabNoAscii.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToBIG5.cpp + MacOS + Text + Debug + + + Name + nsBIG5ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToBIG5NoAscii.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP950.cpp + MacOS + Text + Debug + + + Name + nsCP950ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsBIG5HKSCSToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToBIG5HKSCS.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToHKSCS.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToEUCTW.cpp + MacOS + Text + Debug + + + Name + nsEUCTWToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCNS11643p1.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCNS11643p2.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCNS11643p7.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCNS11643p6.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCNS11643p5.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCNS11643p4.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCNS11643p3.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToGB2312GL.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO2022CN.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToHZ.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToGBK.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP936.cpp + MacOS + Text + Debug + + + Name + nsISO2022CNToUnicode.cpp + MacOS + Text + Debug + + + Name + nsHZToUnicode.cpp + MacOS + Text + Debug + + + Name + nsGBKToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP936ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToGB2312V2.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToGBKNoAscii.cpp + MacOS + Text + Debug + + + Name + nsGB2312ToUnicodeV2.cpp + MacOS + Text + Debug + + + Name + nsGBKConvUtil.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88592.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88593.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88594.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88595.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88596.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88596E.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88596I.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88597.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88598.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88598E.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88598I.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88599.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO885910.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO885913.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO885914.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO885915.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO885916.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISOIR111.cpp + MacOS + Text + Debug + + + Name + nsISO88592ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88593ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88594ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88595ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88596ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88596EToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88596IToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88597ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88598ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88598EToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88598IToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88599ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO885910ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO885913ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO885914ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO885915ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO885916ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISOIR111ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToUTF7.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMUTF7.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToUCS2LE.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToUCS2BE.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToUCS4LE.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToUCS4BE.cpp + MacOS + Text + Debug + + + Name + nsUTF7ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMUTF7ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUCS2LEToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUCS2BEToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUCS4LEToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUCS4BEToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP866.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP874.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1250.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1251.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1253.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1254.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1255.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1257.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1256.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1258.cpp + MacOS + Text + Debug + + + Name + nsCP866ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP874ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1250ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1251ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1253ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1254ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1255ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1256ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1257ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1258ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacArabic.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacCE.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacCroatian.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacCyrillic.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacDevanagari.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacFarsi.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacGreek.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacGujarati.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacGurmukhi.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacHebrew.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacIcelandic.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacRomanian.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacTurkish.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacUkrainian.cpp + MacOS + Text + Debug + + + Name + nsMacArabicToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacCEToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacCroatianToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacCyrillicToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacDevanagariToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacFarsiToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacGreekToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacGujaratiToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacGurmukhiToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacHebrewToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacIcelandicToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacRomanianToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacUkrainianToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacTurkishToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToAscii.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToARMSCII8.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToKOI8U.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToKOI8R.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToSymbol.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToT61.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToTCVN5712.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToUserDefined.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToUEscape.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToVIQR.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToVISCII.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToVNI.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToVPS.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToZapfDingbat.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToGEOSTD8.cpp + MacOS + Text + Debug + + + Name + nsAsciiToUnicode.cpp + MacOS + Text + Debug + + + Name + nsARMSCII8ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsKOI8UToUnicode.cpp + MacOS + Text + Debug + + + Name + nsKOI8RToUnicode.cpp + MacOS + Text + Debug + + + Name + nsT61ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsTCVN5712ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUEscapeToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUserDefinedToUnicode.cpp + MacOS + Text + Debug + + + Name + nsVISCIIToUnicode.cpp + MacOS + Text + Debug + + + Name + nsVIQRToUnicode.cpp + MacOS + Text + Debug + + + Name + nsVNIToUnicode.cpp + MacOS + Text + Debug + + + Name + nsVPSToUnicode.cpp + MacOS + Text + Debug + + + Name + nsGEOSTD8ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP852ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP855ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP857ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP862ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP864ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP850.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP852.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP855.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP857.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP862.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP864.cpp + MacOS + Text + Debug + + + Name + nsCP850ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP864iToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP864i.cpp + MacOS + Text + Debug + + + Name + nsUCConstructors.cpp + MacOS + Text + Debug + + + Name + nsUCRegUtils.cpp + MacOS + Text + Debug + @@ -1254,11 +2664,6 @@ nsMacRomanToUnicode.cpp MacOS - - Name - nsUCvMinSupport.cpp - MacOS - Name nsUnicodeToCP1252.cpp @@ -1299,6 +2704,961 @@ nsConverterInputStream.cpp MacOS + + Name + nsUCSupport.cpp + MacOS + + + Name + nsUnicodeToSJIS.cpp + MacOS + + + Name + nsUnicodeToCP932.cpp + MacOS + + + Name + nsCP932ToUnicode.cpp + MacOS + + + Name + nsUnicodeToJISx0212.cpp + MacOS + + + Name + nsUnicodeToJISx0208.cpp + MacOS + + + Name + nsUnicodeToJISx0201.cpp + MacOS + + + Name + nsUnicodeToISO2022JP.cpp + MacOS + + + Name + nsUnicodeToEUCJP.cpp + MacOS + + + Name + nsJapaneseToUnicode.cpp + MacOS + + + Name + nsEUCKRToUnicode.cpp + MacOS + + + Name + nsUnicodeToEUCKR.cpp + MacOS + + + Name + nsUnicodeToKSC5601.cpp + MacOS + + + Name + nsUnicodeToISO2022KR.cpp + MacOS + + + Name + nsUnicodeToCP949.cpp + MacOS + + + Name + nsISO2022KRToUnicode.cpp + MacOS + + + Name + nsCP949ToUnicode.cpp + MacOS + + + Name + nsUnicodeToX11Johab.cpp + MacOS + + + Name + nsUnicodeToJohab.cpp + MacOS + + + Name + nsJohabToUnicode.cpp + MacOS + + + Name + nsUnicodeToJohabNoAscii.cpp + MacOS + + + Name + nsUnicodeToBIG5.cpp + MacOS + + + Name + nsBIG5ToUnicode.cpp + MacOS + + + Name + nsUnicodeToBIG5NoAscii.cpp + MacOS + + + Name + nsUnicodeToCP950.cpp + MacOS + + + Name + nsCP950ToUnicode.cpp + MacOS + + + Name + nsBIG5HKSCSToUnicode.cpp + MacOS + + + Name + nsUnicodeToBIG5HKSCS.cpp + MacOS + + + Name + nsUnicodeToHKSCS.cpp + MacOS + + + Name + nsUnicodeToEUCTW.cpp + MacOS + + + Name + nsEUCTWToUnicode.cpp + MacOS + + + Name + nsUnicodeToCNS11643p1.cpp + MacOS + + + Name + nsUnicodeToCNS11643p2.cpp + MacOS + + + Name + nsUnicodeToCNS11643p7.cpp + MacOS + + + Name + nsUnicodeToCNS11643p6.cpp + MacOS + + + Name + nsUnicodeToCNS11643p5.cpp + MacOS + + + Name + nsUnicodeToCNS11643p4.cpp + MacOS + + + Name + nsUnicodeToCNS11643p3.cpp + MacOS + + + Name + nsUnicodeToGB2312GL.cpp + MacOS + + + Name + nsUnicodeToISO2022CN.cpp + MacOS + + + Name + nsUnicodeToHZ.cpp + MacOS + + + Name + nsUnicodeToGBK.cpp + MacOS + + + Name + nsUnicodeToCP936.cpp + MacOS + + + Name + nsISO2022CNToUnicode.cpp + MacOS + + + Name + nsHZToUnicode.cpp + MacOS + + + Name + nsGBKToUnicode.cpp + MacOS + + + Name + nsCP936ToUnicode.cpp + MacOS + + + Name + nsUnicodeToGB2312V2.cpp + MacOS + + + Name + nsUnicodeToGBKNoAscii.cpp + MacOS + + + Name + nsGB2312ToUnicodeV2.cpp + MacOS + + + Name + nsGBKConvUtil.cpp + MacOS + + + Name + nsUnicodeToISO88592.cpp + MacOS + + + Name + nsUnicodeToISO88593.cpp + MacOS + + + Name + nsUnicodeToISO88594.cpp + MacOS + + + Name + nsUnicodeToISO88595.cpp + MacOS + + + Name + nsUnicodeToISO88596.cpp + MacOS + + + Name + nsUnicodeToISO88596E.cpp + MacOS + + + Name + nsUnicodeToISO88596I.cpp + MacOS + + + Name + nsUnicodeToISO88597.cpp + MacOS + + + Name + nsUnicodeToISO88598.cpp + MacOS + + + Name + nsUnicodeToISO88598E.cpp + MacOS + + + Name + nsUnicodeToISO88598I.cpp + MacOS + + + Name + nsUnicodeToISO88599.cpp + MacOS + + + Name + nsUnicodeToISO885910.cpp + MacOS + + + Name + nsUnicodeToISO885913.cpp + MacOS + + + Name + nsUnicodeToISO885914.cpp + MacOS + + + Name + nsUnicodeToISO885915.cpp + MacOS + + + Name + nsUnicodeToISO885916.cpp + MacOS + + + Name + nsUnicodeToISOIR111.cpp + MacOS + + + Name + nsISO88592ToUnicode.cpp + MacOS + + + Name + nsISO88593ToUnicode.cpp + MacOS + + + Name + nsISO88594ToUnicode.cpp + MacOS + + + Name + nsISO88595ToUnicode.cpp + MacOS + + + Name + nsISO88596ToUnicode.cpp + MacOS + + + Name + nsISO88596EToUnicode.cpp + MacOS + + + Name + nsISO88596IToUnicode.cpp + MacOS + + + Name + nsISO88597ToUnicode.cpp + MacOS + + + Name + nsISO88598ToUnicode.cpp + MacOS + + + Name + nsISO88598EToUnicode.cpp + MacOS + + + Name + nsISO88598IToUnicode.cpp + MacOS + + + Name + nsISO88599ToUnicode.cpp + MacOS + + + Name + nsISO885910ToUnicode.cpp + MacOS + + + Name + nsISO885913ToUnicode.cpp + MacOS + + + Name + nsISO885914ToUnicode.cpp + MacOS + + + Name + nsISO885915ToUnicode.cpp + MacOS + + + Name + nsISO885916ToUnicode.cpp + MacOS + + + Name + nsISOIR111ToUnicode.cpp + MacOS + + + Name + nsUnicodeToUTF7.cpp + MacOS + + + Name + nsUnicodeToMUTF7.cpp + MacOS + + + Name + nsUnicodeToUCS2LE.cpp + MacOS + + + Name + nsUnicodeToUCS2BE.cpp + MacOS + + + Name + nsUnicodeToUCS4LE.cpp + MacOS + + + Name + nsUnicodeToUCS4BE.cpp + MacOS + + + Name + nsUTF7ToUnicode.cpp + MacOS + + + Name + nsMUTF7ToUnicode.cpp + MacOS + + + Name + nsUCS2LEToUnicode.cpp + MacOS + + + Name + nsUCS2BEToUnicode.cpp + MacOS + + + Name + nsUCS4LEToUnicode.cpp + MacOS + + + Name + nsUCS4BEToUnicode.cpp + MacOS + + + Name + nsUnicodeToCP866.cpp + MacOS + + + Name + nsUnicodeToCP874.cpp + MacOS + + + Name + nsUnicodeToCP1250.cpp + MacOS + + + Name + nsUnicodeToCP1251.cpp + MacOS + + + Name + nsUnicodeToCP1253.cpp + MacOS + + + Name + nsUnicodeToCP1254.cpp + MacOS + + + Name + nsUnicodeToCP1255.cpp + MacOS + + + Name + nsUnicodeToCP1257.cpp + MacOS + + + Name + nsUnicodeToCP1256.cpp + MacOS + + + Name + nsUnicodeToCP1258.cpp + MacOS + + + Name + nsCP866ToUnicode.cpp + MacOS + + + Name + nsCP874ToUnicode.cpp + MacOS + + + Name + nsCP1250ToUnicode.cpp + MacOS + + + Name + nsCP1251ToUnicode.cpp + MacOS + + + Name + nsCP1253ToUnicode.cpp + MacOS + + + Name + nsCP1254ToUnicode.cpp + MacOS + + + Name + nsCP1255ToUnicode.cpp + MacOS + + + Name + nsCP1256ToUnicode.cpp + MacOS + + + Name + nsCP1257ToUnicode.cpp + MacOS + + + Name + nsCP1258ToUnicode.cpp + MacOS + + + Name + nsUnicodeToMacArabic.cpp + MacOS + + + Name + nsUnicodeToMacCE.cpp + MacOS + + + Name + nsUnicodeToMacCroatian.cpp + MacOS + + + Name + nsUnicodeToMacCyrillic.cpp + MacOS + + + Name + nsUnicodeToMacDevanagari.cpp + MacOS + + + Name + nsUnicodeToMacFarsi.cpp + MacOS + + + Name + nsUnicodeToMacGreek.cpp + MacOS + + + Name + nsUnicodeToMacGujarati.cpp + MacOS + + + Name + nsUnicodeToMacGurmukhi.cpp + MacOS + + + Name + nsUnicodeToMacHebrew.cpp + MacOS + + + Name + nsUnicodeToMacIcelandic.cpp + MacOS + + + Name + nsUnicodeToMacRomanian.cpp + MacOS + + + Name + nsUnicodeToMacTurkish.cpp + MacOS + + + Name + nsUnicodeToMacUkrainian.cpp + MacOS + + + Name + nsMacArabicToUnicode.cpp + MacOS + + + Name + nsMacCEToUnicode.cpp + MacOS + + + Name + nsMacCroatianToUnicode.cpp + MacOS + + + Name + nsMacCyrillicToUnicode.cpp + MacOS + + + Name + nsMacDevanagariToUnicode.cpp + MacOS + + + Name + nsMacFarsiToUnicode.cpp + MacOS + + + Name + nsMacGreekToUnicode.cpp + MacOS + + + Name + nsMacGujaratiToUnicode.cpp + MacOS + + + Name + nsMacGurmukhiToUnicode.cpp + MacOS + + + Name + nsMacHebrewToUnicode.cpp + MacOS + + + Name + nsMacIcelandicToUnicode.cpp + MacOS + + + Name + nsMacRomanianToUnicode.cpp + MacOS + + + Name + nsMacUkrainianToUnicode.cpp + MacOS + + + Name + nsMacTurkishToUnicode.cpp + MacOS + + + Name + nsUnicodeToAscii.cpp + MacOS + + + Name + nsUnicodeToARMSCII8.cpp + MacOS + + + Name + nsUnicodeToKOI8U.cpp + MacOS + + + Name + nsUnicodeToKOI8R.cpp + MacOS + + + Name + nsUnicodeToSymbol.cpp + MacOS + + + Name + nsUnicodeToT61.cpp + MacOS + + + Name + nsUnicodeToTCVN5712.cpp + MacOS + + + Name + nsUnicodeToUserDefined.cpp + MacOS + + + Name + nsUnicodeToUEscape.cpp + MacOS + + + Name + nsUnicodeToVIQR.cpp + MacOS + + + Name + nsUnicodeToVISCII.cpp + MacOS + + + Name + nsUnicodeToVNI.cpp + MacOS + + + Name + nsUnicodeToVPS.cpp + MacOS + + + Name + nsUnicodeToZapfDingbat.cpp + MacOS + + + Name + nsUnicodeToGEOSTD8.cpp + MacOS + + + Name + nsAsciiToUnicode.cpp + MacOS + + + Name + nsARMSCII8ToUnicode.cpp + MacOS + + + Name + nsKOI8UToUnicode.cpp + MacOS + + + Name + nsKOI8RToUnicode.cpp + MacOS + + + Name + nsT61ToUnicode.cpp + MacOS + + + Name + nsTCVN5712ToUnicode.cpp + MacOS + + + Name + nsUEscapeToUnicode.cpp + MacOS + + + Name + nsUserDefinedToUnicode.cpp + MacOS + + + Name + nsVISCIIToUnicode.cpp + MacOS + + + Name + nsVIQRToUnicode.cpp + MacOS + + + Name + nsVNIToUnicode.cpp + MacOS + + + Name + nsVPSToUnicode.cpp + MacOS + + + Name + nsGEOSTD8ToUnicode.cpp + MacOS + + + Name + nsCP852ToUnicode.cpp + MacOS + + + Name + nsCP855ToUnicode.cpp + MacOS + + + Name + nsCP857ToUnicode.cpp + MacOS + + + Name + nsCP862ToUnicode.cpp + MacOS + + + Name + nsCP864ToUnicode.cpp + MacOS + + + Name + nsUnicodeToCP850.cpp + MacOS + + + Name + nsUnicodeToCP852.cpp + MacOS + + + Name + nsUnicodeToCP855.cpp + MacOS + + + Name + nsUnicodeToCP857.cpp + MacOS + + + Name + nsUnicodeToCP862.cpp + MacOS + + + Name + nsUnicodeToCP864.cpp + MacOS + + + Name + nsCP850ToUnicode.cpp + MacOS + + + Name + nsCP864iToUnicode.cpp + MacOS + + + Name + nsUnicodeToCP864i.cpp + MacOS + + + Name + nsUCConstructors.cpp + MacOS + + + Name + nsUCRegUtils.cpp + MacOS + @@ -1343,6 +3703,86 @@ FrameworkPathfalse HostFlagsAll + + SearchPath + Path::util: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::ucvja: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::ucvko: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::ucvtw: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::ucvtw2: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::ucvcn: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::ucvlatin: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path::ucvibm: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + SystemSearchPaths @@ -1782,7 +4222,7 @@ MWFTP_Post_hostName MWFTP_Post_username - MWFTP_Post_password0<s + MWFTP_Post_password MWFTP_Post_remoteDir MWFTP_Post_ftp_PathVersion1 MWFTP_Post_ftp_PathType0 @@ -2332,13 +4772,6 @@ Text Debug - - Name - nsUCvMinSupport.cpp - MacOS - Text - Debug - Name nsUnicodeToCP1252.cpp @@ -2395,6 +4828,1343 @@ Text Debug + + Name + nsUCSupport.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToSJIS.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP932.cpp + MacOS + Text + Debug + + + Name + nsCP932ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToJISx0212.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToJISx0208.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToJISx0201.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO2022JP.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToEUCJP.cpp + MacOS + Text + Debug + + + Name + nsJapaneseToUnicode.cpp + MacOS + Text + Debug + + + Name + nsEUCKRToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToEUCKR.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToKSC5601.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO2022KR.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP949.cpp + MacOS + Text + Debug + + + Name + nsISO2022KRToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP949ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToX11Johab.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToJohab.cpp + MacOS + Text + Debug + + + Name + nsJohabToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToJohabNoAscii.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToBIG5.cpp + MacOS + Text + Debug + + + Name + nsBIG5ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToBIG5NoAscii.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP950.cpp + MacOS + Text + Debug + + + Name + nsCP950ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsBIG5HKSCSToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToBIG5HKSCS.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToHKSCS.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToEUCTW.cpp + MacOS + Text + Debug + + + Name + nsEUCTWToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCNS11643p1.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCNS11643p2.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCNS11643p7.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCNS11643p6.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCNS11643p5.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCNS11643p4.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCNS11643p3.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToGB2312GL.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO2022CN.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToHZ.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToGBK.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP936.cpp + MacOS + Text + Debug + + + Name + nsISO2022CNToUnicode.cpp + MacOS + Text + Debug + + + Name + nsHZToUnicode.cpp + MacOS + Text + Debug + + + Name + nsGBKToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP936ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToGB2312V2.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToGBKNoAscii.cpp + MacOS + Text + Debug + + + Name + nsGB2312ToUnicodeV2.cpp + MacOS + Text + Debug + + + Name + nsGBKConvUtil.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88592.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88593.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88594.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88595.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88596.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88596E.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88596I.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88597.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88598.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88598E.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88598I.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO88599.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO885910.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO885913.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO885914.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO885915.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISO885916.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToISOIR111.cpp + MacOS + Text + Debug + + + Name + nsISO88592ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88593ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88594ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88595ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88596ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88596EToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88596IToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88597ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88598ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88598EToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88598IToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO88599ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO885910ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO885913ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO885914ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO885915ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISO885916ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsISOIR111ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToUTF7.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMUTF7.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToUCS2LE.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToUCS2BE.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToUCS4LE.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToUCS4BE.cpp + MacOS + Text + Debug + + + Name + nsUTF7ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMUTF7ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUCS2LEToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUCS2BEToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUCS4LEToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUCS4BEToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP866.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP874.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1250.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1251.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1253.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1254.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1255.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1257.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1256.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP1258.cpp + MacOS + Text + Debug + + + Name + nsCP866ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP874ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1250ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1251ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1253ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1254ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1255ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1256ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1257ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP1258ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacArabic.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacCE.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacCroatian.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacCyrillic.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacDevanagari.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacFarsi.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacGreek.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacGujarati.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacGurmukhi.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacHebrew.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacIcelandic.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacRomanian.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacTurkish.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToMacUkrainian.cpp + MacOS + Text + Debug + + + Name + nsMacArabicToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacCEToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacCroatianToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacCyrillicToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacDevanagariToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacFarsiToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacGreekToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacGujaratiToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacGurmukhiToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacHebrewToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacIcelandicToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacRomanianToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacUkrainianToUnicode.cpp + MacOS + Text + Debug + + + Name + nsMacTurkishToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToAscii.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToARMSCII8.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToKOI8U.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToKOI8R.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToSymbol.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToT61.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToTCVN5712.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToUserDefined.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToUEscape.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToVIQR.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToVISCII.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToVNI.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToVPS.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToZapfDingbat.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToGEOSTD8.cpp + MacOS + Text + Debug + + + Name + nsAsciiToUnicode.cpp + MacOS + Text + Debug + + + Name + nsARMSCII8ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsKOI8UToUnicode.cpp + MacOS + Text + Debug + + + Name + nsKOI8RToUnicode.cpp + MacOS + Text + Debug + + + Name + nsT61ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsTCVN5712ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUEscapeToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUserDefinedToUnicode.cpp + MacOS + Text + Debug + + + Name + nsVISCIIToUnicode.cpp + MacOS + Text + Debug + + + Name + nsVIQRToUnicode.cpp + MacOS + Text + Debug + + + Name + nsVNIToUnicode.cpp + MacOS + Text + Debug + + + Name + nsVPSToUnicode.cpp + MacOS + Text + Debug + + + Name + nsGEOSTD8ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP852ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP855ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP857ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP862ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP864ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP850.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP852.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP855.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP857.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP862.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP864.cpp + MacOS + Text + Debug + + + Name + nsCP850ToUnicode.cpp + MacOS + Text + Debug + + + Name + nsCP864iToUnicode.cpp + MacOS + Text + Debug + + + Name + nsUnicodeToCP864i.cpp + MacOS + Text + Debug + + + Name + nsUCConstructors.cpp + MacOS + Text + Debug + + + Name + nsUCRegUtils.cpp + MacOS + Text + Debug + @@ -2502,11 +6272,6 @@ nsMacRomanToUnicode.cpp MacOS - - Name - nsUCvMinSupport.cpp - MacOS - Name nsUnicodeToCP1252.cpp @@ -2547,6 +6312,961 @@ nsConverterInputStream.cpp MacOS + + Name + nsUCSupport.cpp + MacOS + + + Name + nsUnicodeToSJIS.cpp + MacOS + + + Name + nsUnicodeToCP932.cpp + MacOS + + + Name + nsCP932ToUnicode.cpp + MacOS + + + Name + nsUnicodeToJISx0212.cpp + MacOS + + + Name + nsUnicodeToJISx0208.cpp + MacOS + + + Name + nsUnicodeToJISx0201.cpp + MacOS + + + Name + nsUnicodeToISO2022JP.cpp + MacOS + + + Name + nsUnicodeToEUCJP.cpp + MacOS + + + Name + nsJapaneseToUnicode.cpp + MacOS + + + Name + nsEUCKRToUnicode.cpp + MacOS + + + Name + nsUnicodeToEUCKR.cpp + MacOS + + + Name + nsUnicodeToKSC5601.cpp + MacOS + + + Name + nsUnicodeToISO2022KR.cpp + MacOS + + + Name + nsUnicodeToCP949.cpp + MacOS + + + Name + nsISO2022KRToUnicode.cpp + MacOS + + + Name + nsCP949ToUnicode.cpp + MacOS + + + Name + nsUnicodeToX11Johab.cpp + MacOS + + + Name + nsUnicodeToJohab.cpp + MacOS + + + Name + nsJohabToUnicode.cpp + MacOS + + + Name + nsUnicodeToJohabNoAscii.cpp + MacOS + + + Name + nsUnicodeToBIG5.cpp + MacOS + + + Name + nsBIG5ToUnicode.cpp + MacOS + + + Name + nsUnicodeToBIG5NoAscii.cpp + MacOS + + + Name + nsUnicodeToCP950.cpp + MacOS + + + Name + nsCP950ToUnicode.cpp + MacOS + + + Name + nsBIG5HKSCSToUnicode.cpp + MacOS + + + Name + nsUnicodeToBIG5HKSCS.cpp + MacOS + + + Name + nsUnicodeToHKSCS.cpp + MacOS + + + Name + nsUnicodeToEUCTW.cpp + MacOS + + + Name + nsEUCTWToUnicode.cpp + MacOS + + + Name + nsUnicodeToCNS11643p1.cpp + MacOS + + + Name + nsUnicodeToCNS11643p2.cpp + MacOS + + + Name + nsUnicodeToCNS11643p7.cpp + MacOS + + + Name + nsUnicodeToCNS11643p6.cpp + MacOS + + + Name + nsUnicodeToCNS11643p5.cpp + MacOS + + + Name + nsUnicodeToCNS11643p4.cpp + MacOS + + + Name + nsUnicodeToCNS11643p3.cpp + MacOS + + + Name + nsUnicodeToGB2312GL.cpp + MacOS + + + Name + nsUnicodeToISO2022CN.cpp + MacOS + + + Name + nsUnicodeToHZ.cpp + MacOS + + + Name + nsUnicodeToGBK.cpp + MacOS + + + Name + nsUnicodeToCP936.cpp + MacOS + + + Name + nsISO2022CNToUnicode.cpp + MacOS + + + Name + nsHZToUnicode.cpp + MacOS + + + Name + nsGBKToUnicode.cpp + MacOS + + + Name + nsCP936ToUnicode.cpp + MacOS + + + Name + nsUnicodeToGB2312V2.cpp + MacOS + + + Name + nsUnicodeToGBKNoAscii.cpp + MacOS + + + Name + nsGB2312ToUnicodeV2.cpp + MacOS + + + Name + nsGBKConvUtil.cpp + MacOS + + + Name + nsUnicodeToISO88592.cpp + MacOS + + + Name + nsUnicodeToISO88593.cpp + MacOS + + + Name + nsUnicodeToISO88594.cpp + MacOS + + + Name + nsUnicodeToISO88595.cpp + MacOS + + + Name + nsUnicodeToISO88596.cpp + MacOS + + + Name + nsUnicodeToISO88596E.cpp + MacOS + + + Name + nsUnicodeToISO88596I.cpp + MacOS + + + Name + nsUnicodeToISO88597.cpp + MacOS + + + Name + nsUnicodeToISO88598.cpp + MacOS + + + Name + nsUnicodeToISO88598E.cpp + MacOS + + + Name + nsUnicodeToISO88598I.cpp + MacOS + + + Name + nsUnicodeToISO88599.cpp + MacOS + + + Name + nsUnicodeToISO885910.cpp + MacOS + + + Name + nsUnicodeToISO885913.cpp + MacOS + + + Name + nsUnicodeToISO885914.cpp + MacOS + + + Name + nsUnicodeToISO885915.cpp + MacOS + + + Name + nsUnicodeToISO885916.cpp + MacOS + + + Name + nsUnicodeToISOIR111.cpp + MacOS + + + Name + nsISO88592ToUnicode.cpp + MacOS + + + Name + nsISO88593ToUnicode.cpp + MacOS + + + Name + nsISO88594ToUnicode.cpp + MacOS + + + Name + nsISO88595ToUnicode.cpp + MacOS + + + Name + nsISO88596ToUnicode.cpp + MacOS + + + Name + nsISO88596EToUnicode.cpp + MacOS + + + Name + nsISO88596IToUnicode.cpp + MacOS + + + Name + nsISO88597ToUnicode.cpp + MacOS + + + Name + nsISO88598ToUnicode.cpp + MacOS + + + Name + nsISO88598EToUnicode.cpp + MacOS + + + Name + nsISO88598IToUnicode.cpp + MacOS + + + Name + nsISO88599ToUnicode.cpp + MacOS + + + Name + nsISO885910ToUnicode.cpp + MacOS + + + Name + nsISO885913ToUnicode.cpp + MacOS + + + Name + nsISO885914ToUnicode.cpp + MacOS + + + Name + nsISO885915ToUnicode.cpp + MacOS + + + Name + nsISO885916ToUnicode.cpp + MacOS + + + Name + nsISOIR111ToUnicode.cpp + MacOS + + + Name + nsUnicodeToUTF7.cpp + MacOS + + + Name + nsUnicodeToMUTF7.cpp + MacOS + + + Name + nsUnicodeToUCS2LE.cpp + MacOS + + + Name + nsUnicodeToUCS2BE.cpp + MacOS + + + Name + nsUnicodeToUCS4LE.cpp + MacOS + + + Name + nsUnicodeToUCS4BE.cpp + MacOS + + + Name + nsUTF7ToUnicode.cpp + MacOS + + + Name + nsMUTF7ToUnicode.cpp + MacOS + + + Name + nsUCS2LEToUnicode.cpp + MacOS + + + Name + nsUCS2BEToUnicode.cpp + MacOS + + + Name + nsUCS4LEToUnicode.cpp + MacOS + + + Name + nsUCS4BEToUnicode.cpp + MacOS + + + Name + nsUnicodeToCP866.cpp + MacOS + + + Name + nsUnicodeToCP874.cpp + MacOS + + + Name + nsUnicodeToCP1250.cpp + MacOS + + + Name + nsUnicodeToCP1251.cpp + MacOS + + + Name + nsUnicodeToCP1253.cpp + MacOS + + + Name + nsUnicodeToCP1254.cpp + MacOS + + + Name + nsUnicodeToCP1255.cpp + MacOS + + + Name + nsUnicodeToCP1257.cpp + MacOS + + + Name + nsUnicodeToCP1256.cpp + MacOS + + + Name + nsUnicodeToCP1258.cpp + MacOS + + + Name + nsCP866ToUnicode.cpp + MacOS + + + Name + nsCP874ToUnicode.cpp + MacOS + + + Name + nsCP1250ToUnicode.cpp + MacOS + + + Name + nsCP1251ToUnicode.cpp + MacOS + + + Name + nsCP1253ToUnicode.cpp + MacOS + + + Name + nsCP1254ToUnicode.cpp + MacOS + + + Name + nsCP1255ToUnicode.cpp + MacOS + + + Name + nsCP1256ToUnicode.cpp + MacOS + + + Name + nsCP1257ToUnicode.cpp + MacOS + + + Name + nsCP1258ToUnicode.cpp + MacOS + + + Name + nsUnicodeToMacArabic.cpp + MacOS + + + Name + nsUnicodeToMacCE.cpp + MacOS + + + Name + nsUnicodeToMacCroatian.cpp + MacOS + + + Name + nsUnicodeToMacCyrillic.cpp + MacOS + + + Name + nsUnicodeToMacDevanagari.cpp + MacOS + + + Name + nsUnicodeToMacFarsi.cpp + MacOS + + + Name + nsUnicodeToMacGreek.cpp + MacOS + + + Name + nsUnicodeToMacGujarati.cpp + MacOS + + + Name + nsUnicodeToMacGurmukhi.cpp + MacOS + + + Name + nsUnicodeToMacHebrew.cpp + MacOS + + + Name + nsUnicodeToMacIcelandic.cpp + MacOS + + + Name + nsUnicodeToMacRomanian.cpp + MacOS + + + Name + nsUnicodeToMacTurkish.cpp + MacOS + + + Name + nsUnicodeToMacUkrainian.cpp + MacOS + + + Name + nsMacArabicToUnicode.cpp + MacOS + + + Name + nsMacCEToUnicode.cpp + MacOS + + + Name + nsMacCroatianToUnicode.cpp + MacOS + + + Name + nsMacCyrillicToUnicode.cpp + MacOS + + + Name + nsMacDevanagariToUnicode.cpp + MacOS + + + Name + nsMacFarsiToUnicode.cpp + MacOS + + + Name + nsMacGreekToUnicode.cpp + MacOS + + + Name + nsMacGujaratiToUnicode.cpp + MacOS + + + Name + nsMacGurmukhiToUnicode.cpp + MacOS + + + Name + nsMacHebrewToUnicode.cpp + MacOS + + + Name + nsMacIcelandicToUnicode.cpp + MacOS + + + Name + nsMacRomanianToUnicode.cpp + MacOS + + + Name + nsMacUkrainianToUnicode.cpp + MacOS + + + Name + nsMacTurkishToUnicode.cpp + MacOS + + + Name + nsUnicodeToAscii.cpp + MacOS + + + Name + nsUnicodeToARMSCII8.cpp + MacOS + + + Name + nsUnicodeToKOI8U.cpp + MacOS + + + Name + nsUnicodeToKOI8R.cpp + MacOS + + + Name + nsUnicodeToSymbol.cpp + MacOS + + + Name + nsUnicodeToT61.cpp + MacOS + + + Name + nsUnicodeToTCVN5712.cpp + MacOS + + + Name + nsUnicodeToUserDefined.cpp + MacOS + + + Name + nsUnicodeToUEscape.cpp + MacOS + + + Name + nsUnicodeToVIQR.cpp + MacOS + + + Name + nsUnicodeToVISCII.cpp + MacOS + + + Name + nsUnicodeToVNI.cpp + MacOS + + + Name + nsUnicodeToVPS.cpp + MacOS + + + Name + nsUnicodeToZapfDingbat.cpp + MacOS + + + Name + nsUnicodeToGEOSTD8.cpp + MacOS + + + Name + nsAsciiToUnicode.cpp + MacOS + + + Name + nsARMSCII8ToUnicode.cpp + MacOS + + + Name + nsKOI8UToUnicode.cpp + MacOS + + + Name + nsKOI8RToUnicode.cpp + MacOS + + + Name + nsT61ToUnicode.cpp + MacOS + + + Name + nsTCVN5712ToUnicode.cpp + MacOS + + + Name + nsUEscapeToUnicode.cpp + MacOS + + + Name + nsUserDefinedToUnicode.cpp + MacOS + + + Name + nsVISCIIToUnicode.cpp + MacOS + + + Name + nsVIQRToUnicode.cpp + MacOS + + + Name + nsVNIToUnicode.cpp + MacOS + + + Name + nsVPSToUnicode.cpp + MacOS + + + Name + nsGEOSTD8ToUnicode.cpp + MacOS + + + Name + nsCP852ToUnicode.cpp + MacOS + + + Name + nsCP855ToUnicode.cpp + MacOS + + + Name + nsCP857ToUnicode.cpp + MacOS + + + Name + nsCP862ToUnicode.cpp + MacOS + + + Name + nsCP864ToUnicode.cpp + MacOS + + + Name + nsUnicodeToCP850.cpp + MacOS + + + Name + nsUnicodeToCP852.cpp + MacOS + + + Name + nsUnicodeToCP855.cpp + MacOS + + + Name + nsUnicodeToCP857.cpp + MacOS + + + Name + nsUnicodeToCP862.cpp + MacOS + + + Name + nsUnicodeToCP864.cpp + MacOS + + + Name + nsCP850ToUnicode.cpp + MacOS + + + Name + nsCP864iToUnicode.cpp + MacOS + + + Name + nsUnicodeToCP864i.cpp + MacOS + + + Name + nsUCConstructors.cpp + MacOS + + + Name + nsUCRegUtils.cpp + MacOS + @@ -2618,12 +7338,6 @@ nsCP1252ToUnicode.cpp MacOS - - uconv.shlb - Name - nsUCvMinSupport.cpp - MacOS - uconv.shlb Name @@ -2678,6 +7392,24 @@ nsConverterInputStream.cpp MacOS + + uconv.shlb + Name + nsUCSupport.cpp + MacOS + + + uconv.shlb + Name + nsUCConstructors.cpp + MacOS + + + uconv.shlb + Name + nsUCRegUtils.cpp + MacOS + uconv-c @@ -2781,6 +7513,1168 @@ MacOS + ucvcn + + uconv.shlb + Name + nsUnicodeToGB2312GL.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO2022CN.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToHZ.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToGBK.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP936.cpp + MacOS + + + uconv.shlb + Name + nsISO2022CNToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsHZToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsGBKToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP936ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToGB2312V2.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToGBKNoAscii.cpp + MacOS + + + uconv.shlb + Name + nsGB2312ToUnicodeV2.cpp + MacOS + + + uconv.shlb + Name + nsGBKConvUtil.cpp + MacOS + + + ucvtw2 + + uconv.shlb + Name + nsUnicodeToEUCTW.cpp + MacOS + + + uconv.shlb + Name + nsEUCTWToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCNS11643p1.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCNS11643p2.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCNS11643p7.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCNS11643p6.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCNS11643p5.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCNS11643p4.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCNS11643p3.cpp + MacOS + + + ucvtw + + uconv.shlb + Name + nsUnicodeToBIG5.cpp + MacOS + + + uconv.shlb + Name + nsBIG5ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToBIG5NoAscii.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP950.cpp + MacOS + + + uconv.shlb + Name + nsCP950ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsBIG5HKSCSToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToBIG5HKSCS.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToHKSCS.cpp + MacOS + + + ucvko + + uconv.shlb + Name + nsEUCKRToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToEUCKR.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToKSC5601.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO2022KR.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP949.cpp + MacOS + + + uconv.shlb + Name + nsISO2022KRToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP949ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToX11Johab.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToJohab.cpp + MacOS + + + uconv.shlb + Name + nsJohabToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToJohabNoAscii.cpp + MacOS + + + ucvja + + uconv.shlb + Name + nsUnicodeToSJIS.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP932.cpp + MacOS + + + uconv.shlb + Name + nsCP932ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToJISx0212.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToJISx0208.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToJISx0201.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO2022JP.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToEUCJP.cpp + MacOS + + + uconv.shlb + Name + nsJapaneseToUnicode.cpp + MacOS + + + ucvlatin + Other Decoder + + uconv.shlb + Name + nsAsciiToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsARMSCII8ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsKOI8UToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsKOI8RToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsT61ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsTCVN5712ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUEscapeToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUserDefinedToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsVISCIIToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsVIQRToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsVNIToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsVPSToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsGEOSTD8ToUnicode.cpp + MacOS + + + Other Encoder + + uconv.shlb + Name + nsUnicodeToAscii.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToARMSCII8.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToKOI8U.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToKOI8R.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToSymbol.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToT61.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToTCVN5712.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToUserDefined.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToUEscape.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToVIQR.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToVISCII.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToVNI.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToVPS.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToZapfDingbat.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToGEOSTD8.cpp + MacOS + + + Mac Decoder + + uconv.shlb + Name + nsMacArabicToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsMacCEToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsMacCroatianToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsMacCyrillicToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsMacDevanagariToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsMacFarsiToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsMacGreekToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsMacGujaratiToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsMacGurmukhiToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsMacHebrewToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsMacIcelandicToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsMacRomanianToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsMacUkrainianToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsMacTurkishToUnicode.cpp + MacOS + + + Mac Encoder + + uconv.shlb + Name + nsUnicodeToMacArabic.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToMacCE.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToMacCroatian.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToMacCyrillic.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToMacDevanagari.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToMacFarsi.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToMacGreek.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToMacGujarati.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToMacGurmukhi.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToMacHebrew.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToMacIcelandic.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToMacRomanian.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToMacTurkish.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToMacUkrainian.cpp + MacOS + + + Window Decoder + + uconv.shlb + Name + nsCP866ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP874ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP1250ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP1251ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP1253ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP1254ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP1255ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP1256ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP1257ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP1258ToUnicode.cpp + MacOS + + + Window Encoder + + uconv.shlb + Name + nsUnicodeToCP866.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP874.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP1250.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP1251.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP1253.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP1254.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP1255.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP1257.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP1256.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP1258.cpp + MacOS + + + UTF Decoder + + uconv.shlb + Name + nsUTF7ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsMUTF7ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUCS2LEToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUCS2BEToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUCS4LEToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUCS4BEToUnicode.cpp + MacOS + + + UTF Encoder + + uconv.shlb + Name + nsUnicodeToUTF7.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToMUTF7.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToUCS2LE.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToUCS2BE.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToUCS4LE.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToUCS4BE.cpp + MacOS + + + ISO Decoder + + uconv.shlb + Name + nsISO88592ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO88593ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO88594ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO88595ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO88596ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO88596EToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO88596IToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO88597ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO88598ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO88598EToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO88598IToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO88599ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO885910ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO885913ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO885914ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO885915ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISO885916ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsISOIR111ToUnicode.cpp + MacOS + + + ISO Encoder + + uconv.shlb + Name + nsUnicodeToISO88592.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO88593.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO88594.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO88595.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO88596.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO88596E.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO88596I.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO88597.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO88598.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO88598E.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO88598I.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO88599.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO885910.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO885913.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO885914.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO885915.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISO885916.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToISOIR111.cpp + MacOS + + + + ucvibm + + uconv.shlb + Name + nsCP852ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP855ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP857ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP862ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP864ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP850.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP852.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP855.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP857.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP862.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP864.cpp + MacOS + + + uconv.shlb + Name + nsCP850ToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsCP864iToUnicode.cpp + MacOS + + + uconv.shlb + Name + nsUnicodeToCP864i.cpp + MacOS + + diff --git a/intl/uconv/macbuild/ucvcn.xml b/intl/uconv/macbuild/ucvcn.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/macbuild/ucvibm.xml b/intl/uconv/macbuild/ucvibm.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/macbuild/ucvja.xml b/intl/uconv/macbuild/ucvja.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/macbuild/ucvko.xml b/intl/uconv/macbuild/ucvko.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/macbuild/ucvlatin.xml b/intl/uconv/macbuild/ucvlatin.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/macbuild/ucvtw.xml b/intl/uconv/macbuild/ucvtw.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/macbuild/ucvtw2.xml b/intl/uconv/macbuild/ucvtw2.xml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/src/Makefile.in b/intl/uconv/src/Makefile.in index 65620c4b971..e896601d861 100644 --- a/intl/uconv/src/Makefile.in +++ b/intl/uconv/src/Makefile.in @@ -67,7 +67,6 @@ CPPSRCS = \ nsUnicodeToCP1252.cpp \ nsUnicodeToMacRoman.cpp \ nsUnicodeToUTF8.cpp \ - nsUCvMinSupport.cpp \ nsScriptableUConv.cpp \ nsConverterInputStream.cpp \ $(NULL) @@ -120,6 +119,28 @@ ifneq (,$(filter cocoa mac, $(MOZ_WIDGET_TOOLKIT))) EXTRA_DSO_LDOPTS += $(TK_LIBS) endif +LOCAL_INCLUDES = -I$(srcdir)/../util \ + -I$(srcdir)/../ucvlatin \ + -I$(srcdir)/../ucvibm \ + -I$(srcdir)/../ucvja \ + -I$(srcdir)/../ucvtw2 \ + -I$(srcdir)/../ucvtw \ + -I$(srcdir)/../ucvko \ + -I$(srcdir)/../ucvcn \ + $(NULL) + +SHARED_LIBRARY_LIBS = \ + $(DIST)/lib/$(LIB_PREFIX)ucvutil_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)ucvlatin_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)ucvibm_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)ucvutil_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)ucvja_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)ucvtw2_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)ucvtw_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)ucvko_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)ucvcn_s.$(LIB_SUFFIX) \ + $(NULL) + include $(topsrcdir)/config/rules.mk # Reserved name __STDC__ cannot be defined as a macro name on AIX or OpenVMS. diff --git a/intl/uconv/src/nsCP1252ToUnicode.cpp b/intl/uconv/src/nsCP1252ToUnicode.cpp index 023723cf2d9..68c247c19a1 100644 --- a/intl/uconv/src/nsCP1252ToUnicode.cpp +++ b/intl/uconv/src/nsCP1252ToUnicode.cpp @@ -36,7 +36,7 @@ * * ***** END LICENSE BLOCK ***** */ -#include "nsUCvMinSupport.h" +#include "nsUCSupport.h" #include "nsCP1252ToUnicode.h" //---------------------------------------------------------------------- diff --git a/intl/uconv/src/nsISO88591ToUnicode.cpp b/intl/uconv/src/nsISO88591ToUnicode.cpp index 8c68ea3d9d6..42711526ae7 100644 --- a/intl/uconv/src/nsISO88591ToUnicode.cpp +++ b/intl/uconv/src/nsISO88591ToUnicode.cpp @@ -36,7 +36,7 @@ * * ***** END LICENSE BLOCK ***** */ -#include "nsUCvMinSupport.h" +#include "nsUCSupport.h" #include "nsISO88591ToUnicode.h" //---------------------------------------------------------------------- diff --git a/intl/uconv/src/nsMacRomanToUnicode.cpp b/intl/uconv/src/nsMacRomanToUnicode.cpp index e9484d5ba95..0b0cc28def6 100644 --- a/intl/uconv/src/nsMacRomanToUnicode.cpp +++ b/intl/uconv/src/nsMacRomanToUnicode.cpp @@ -36,7 +36,7 @@ * * ***** END LICENSE BLOCK ***** */ -#include "nsUCvMinSupport.h" +#include "nsUCSupport.h" #include "nsMacRomanToUnicode.h" //---------------------------------------------------------------------- @@ -56,18 +56,7 @@ static const PRInt16 g_MacRomanShiftTable[] = { nsMacRomanToUnicode::nsMacRomanToUnicode() : nsTableDecoderSupport((uShiftTable*) &g_MacRomanShiftTable, - (uMappingTable*) &g_MacRomanMappingTable) + (uMappingTable*) &g_MacRomanMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableDecoderSupport class [implementation] - -NS_IMETHODIMP nsMacRomanToUnicode::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - // we are a single byte to Unicode converter, so... - *aDestLength = aSrcLength; - return NS_OK_UDEC_EXACTLENGTH; -} diff --git a/intl/uconv/src/nsMacRomanToUnicode.h b/intl/uconv/src/nsMacRomanToUnicode.h index a4dcddc7761..586883bff9d 100644 --- a/intl/uconv/src/nsMacRomanToUnicode.h +++ b/intl/uconv/src/nsMacRomanToUnicode.h @@ -69,11 +69,6 @@ public: protected: - //-------------------------------------------------------------------- - // Subclassing of nsDecoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsMacRomanToUnicode_h___ */ diff --git a/intl/uconv/src/nsUConvModule.cpp b/intl/uconv/src/nsUConvModule.cpp index 518027fb474..0dfca99bcb2 100644 --- a/intl/uconv/src/nsUConvModule.cpp +++ b/intl/uconv/src/nsUConvModule.cpp @@ -58,7 +58,7 @@ #include "nsIScriptableUConv.h" #include "nsConverterInputStream.h" -#include "nsUCvMinSupport.h" +#include "nsUCSupport.h" #include "nsCharsetConverterManager.h" #include "nsUnicodeDecodeHelper.h" #include "nsUnicodeEncodeHelper.h" @@ -75,11 +75,342 @@ #include "nsUnicodeToUTF8.h" #include "nsScriptableUConv.h" +// ucvlatin +#include "nsUCvLatinCID.h" +#include "nsUCvLatinDll.h" +#include "nsUEscapeToUnicode.h" +#include "nsUnicodeToUEscape.h" +#include "nsAsciiToUnicode.h" +#include "nsISO88592ToUnicode.h" +#include "nsISO88593ToUnicode.h" +#include "nsISO88594ToUnicode.h" +#include "nsISO88595ToUnicode.h" +#include "nsISO88596ToUnicode.h" +#include "nsISO88596EToUnicode.h" +#include "nsISO88596IToUnicode.h" +#include "nsISO88597ToUnicode.h" +#include "nsISO88598ToUnicode.h" +#include "nsISO88598EToUnicode.h" +#include "nsISO88598IToUnicode.h" +#include "nsISO88599ToUnicode.h" +#include "nsISO885910ToUnicode.h" +#include "nsISO885913ToUnicode.h" +#include "nsISO885914ToUnicode.h" +#include "nsISO885915ToUnicode.h" +#include "nsISO885916ToUnicode.h" +#include "nsISOIR111ToUnicode.h" +#include "nsCP1250ToUnicode.h" +#include "nsCP1251ToUnicode.h" +#include "nsCP1253ToUnicode.h" +#include "nsCP1254ToUnicode.h" +#include "nsCP1255ToUnicode.h" +#include "nsCP1256ToUnicode.h" +#include "nsCP1257ToUnicode.h" +#include "nsCP1258ToUnicode.h" +#include "nsCP874ToUnicode.h" +#include "nsCP866ToUnicode.h" +#include "nsKOI8RToUnicode.h" +#include "nsKOI8UToUnicode.h" +#include "nsMacCEToUnicode.h" +#include "nsMacGreekToUnicode.h" +#include "nsMacTurkishToUnicode.h" +#include "nsMacCroatianToUnicode.h" +#include "nsMacRomanianToUnicode.h" +#include "nsMacCyrillicToUnicode.h" +#include "nsMacUkrainianToUnicode.h" +#include "nsMacIcelandicToUnicode.h" +#include "nsGEOSTD8ToUnicode.h" +#include "nsARMSCII8ToUnicode.h" +#include "nsTCVN5712ToUnicode.h" +#include "nsVISCIIToUnicode.h" +#include "nsVPSToUnicode.h" +#include "nsUTF7ToUnicode.h" +#include "nsMUTF7ToUnicode.h" +#include "nsUCS4BEToUnicode.h" +#include "nsUCS4LEToUnicode.h" +#include "nsUCS2BEToUnicode.h" +#include "nsUCS2LEToUnicode.h" +#include "nsT61ToUnicode.h" +#include "nsUserDefinedToUnicode.h" +#include "nsUnicodeToAscii.h" +#include "nsUnicodeToISO88592.h" +#include "nsUnicodeToISO88593.h" +#include "nsUnicodeToISO88594.h" +#include "nsUnicodeToISO88595.h" +#include "nsUnicodeToISO88596.h" +#include "nsUnicodeToISO88596E.h" +#include "nsUnicodeToISO88596I.h" +#include "nsUnicodeToISO88597.h" +#include "nsUnicodeToISO88598.h" +#include "nsUnicodeToISO88598E.h" +#include "nsUnicodeToISO88598I.h" +#include "nsUnicodeToISO88599.h" +#include "nsUnicodeToISO885910.h" +#include "nsUnicodeToISO885913.h" +#include "nsUnicodeToISO885914.h" +#include "nsUnicodeToISO885915.h" +#include "nsUnicodeToISO885916.h" +#include "nsUnicodeToISOIR111.h" +#include "nsUnicodeToCP1250.h" +#include "nsUnicodeToCP1251.h" +#include "nsUnicodeToCP1253.h" +#include "nsUnicodeToCP1254.h" +#include "nsUnicodeToCP1255.h" +#include "nsUnicodeToCP1256.h" +#include "nsUnicodeToCP1257.h" +#include "nsUnicodeToCP1258.h" +#include "nsUnicodeToCP874.h" +#include "nsUnicodeToCP866.h" +#include "nsUnicodeToKOI8R.h" +#include "nsUnicodeToKOI8U.h" +#include "nsUnicodeToMacCE.h" +#include "nsUnicodeToMacGreek.h" +#include "nsUnicodeToMacTurkish.h" +#include "nsUnicodeToMacCroatian.h" +#include "nsUnicodeToMacRomanian.h" +#include "nsUnicodeToMacCyrillic.h" +#include "nsUnicodeToMacUkrainian.h" +#include "nsUnicodeToMacIcelandic.h" +#include "nsUnicodeToGEOSTD8.h" +#include "nsUnicodeToARMSCII8.h" +#include "nsUnicodeToTCVN5712.h" +#include "nsUnicodeToVISCII.h" +#include "nsUnicodeToVPS.h" +#include "nsUnicodeToUTF7.h" +#include "nsUnicodeToMUTF7.h" +#include "nsUnicodeToUCS2BE.h" +#include "nsUnicodeToUCS2LE.h" +#include "nsUnicodeToUCS4BE.h" +#include "nsUnicodeToUCS4LE.h" +#include "nsUnicodeToT61.h" +#include "nsUnicodeToUserDefined.h" +#include "nsUnicodeToSymbol.h" +#include "nsUnicodeToZapfDingbat.h" +#include "nsMacArabicToUnicode.h" +#include "nsMacDevanagariToUnicode.h" +#include "nsMacFarsiToUnicode.h" +#include "nsMacGujaratiToUnicode.h" +#include "nsMacGurmukhiToUnicode.h" +#include "nsMacHebrewToUnicode.h" +#include "nsUnicodeToMacArabic.h" +#include "nsUnicodeToMacDevanagari.h" +#include "nsUnicodeToMacFarsi.h" +#include "nsUnicodeToMacGujarati.h" +#include "nsUnicodeToMacGurmukhi.h" +#include "nsUnicodeToMacHebrew.h" + +// ucvibm +#include "nsUCvIBMCID.h" +#include "nsUCvIBMDll.h" +#include "nsCP850ToUnicode.h" +#include "nsCP852ToUnicode.h" +#include "nsCP855ToUnicode.h" +#include "nsCP857ToUnicode.h" +#include "nsCP862ToUnicode.h" +#include "nsCP864ToUnicode.h" +#include "nsCP864iToUnicode.h" +#include "nsUnicodeToCP850.h" +#include "nsUnicodeToCP852.h" +#include "nsUnicodeToCP855.h" +#include "nsUnicodeToCP857.h" +#include "nsUnicodeToCP862.h" +#include "nsUnicodeToCP864.h" +#include "nsUnicodeToCP864i.h" + +// ucvja +#include "nsUCVJACID.h" +#include "nsUCVJA2CID.h" +#include "nsUCVJADll.h" +#include "nsJapaneseToUnicode.h" +#include "nsUnicodeToSJIS.h" +#include "nsUnicodeToEUCJP.h" +#include "nsUnicodeToISO2022JP.h" +#include "nsUnicodeToJISx0201.h" +#include "nsUnicodeToJISx0208.h" +#include "nsUnicodeToJISx0212.h" + +// ucvtw2 +#include "nsUCvTW2CID.h" +#include "nsUCvTW2Dll.h" +#include "nsEUCTWToUnicode.h" +#include "nsUnicodeToEUCTW.h" +#include "nsUnicodeToCNS11643p1.h" +#include "nsUnicodeToCNS11643p2.h" +#include "nsUnicodeToCNS11643p3.h" +#include "nsUnicodeToCNS11643p4.h" +#include "nsUnicodeToCNS11643p5.h" +#include "nsUnicodeToCNS11643p6.h" +#include "nsUnicodeToCNS11643p7.h" + +// ucvtw +#include "nsUCvTWCID.h" +#include "nsUCvTWDll.h" +#include "nsBIG5ToUnicode.h" +#include "nsUnicodeToBIG5.h" +#include "nsUnicodeToBIG5NoAscii.h" +#include "nsBIG5HKSCSToUnicode.h" +#include "nsUnicodeToBIG5HKSCS.h" +#include "nsUnicodeToHKSCS.h" + +// ucvko +#include "nsUCvKOCID.h" +#include "nsUCvKODll.h" +#include "nsEUCKRToUnicode.h" +#include "nsUnicodeToEUCKR.h" +#include "nsUnicodeToKSC5601.h" +#include "nsUnicodeToX11Johab.h" +#include "nsJohabToUnicode.h" +#include "nsUnicodeToJohab.h" +#include "nsUnicodeToJohabNoAscii.h" +#include "nsCP949ToUnicode.h" +#include "nsUnicodeToCP949.h" +#include "nsISO2022KRToUnicode.h" + +// ucvcn +#include "nsUCvCnCID.h" +#include "nsUCvCnDll.h" +#include "nsHZToUnicode.h" +#include "nsUnicodeToHZ.h" +#include "nsGBKToUnicode.h" +#include "nsUnicodeToGBK.h" +#include "nsUnicodeToGBKNoAscii.h" +#include "nsCP936ToUnicode.h" +#include "nsUnicodeToCP936.h" +#include "nsGB2312ToUnicodeV2.h" +#include "nsUnicodeToGB2312V2.h" +#include "nsUnicodeToGB2312GL.h" +#include "gbku.h" + +#define DECODER_NAME_BASE "Unicode Decoder-" +#define ENCODER_NAME_BASE "Unicode Encoder-" + NS_CONVERTER_REGISTRY_START NS_UCONV_REG_UNREG("ISO-8859-1", NS_ISO88591TOUNICODE_CID, NS_UNICODETOISO88591_CID) NS_UCONV_REG_UNREG("windows-1252", NS_CP1252TOUNICODE_CID, NS_UNICODETOCP1252_CID) NS_UCONV_REG_UNREG("x-mac-roman", NS_MACROMANTOUNICODE_CID, NS_UNICODETOMACROMAN_CID) NS_UCONV_REG_UNREG("UTF-8", NS_UTF8TOUNICODE_CID, NS_UNICODETOUTF8_CID) + + // ucvlatin +NS_UCONV_REG_UNREG("us-ascii", NS_ASCIITOUNICODE_CID, NS_UNICODETOASCII_CID) +NS_UCONV_REG_UNREG("x-u-escaped", NS_UESCAPETOUNICODE_CID, NS_UNICODETOUESCAPE_CID) +NS_UCONV_REG_UNREG("ISO-8859-2", NS_ISO88592TOUNICODE_CID, NS_UNICODETOISO88592_CID) +NS_UCONV_REG_UNREG("ISO-8859-3", NS_ISO88593TOUNICODE_CID, NS_UNICODETOISO88593_CID) +NS_UCONV_REG_UNREG("ISO-8859-4", NS_ISO88594TOUNICODE_CID, NS_UNICODETOISO88594_CID) +NS_UCONV_REG_UNREG("ISO-8859-5", NS_ISO88595TOUNICODE_CID, NS_UNICODETOISO88595_CID) +NS_UCONV_REG_UNREG("ISO-8859-6", NS_ISO88596TOUNICODE_CID, NS_UNICODETOISO88596_CID) +NS_UCONV_REG_UNREG("ISO-8859-6-I", NS_ISO88596ITOUNICODE_CID, NS_UNICODETOISO88596I_CID) +NS_UCONV_REG_UNREG("ISO-8859-6-E", NS_ISO88596ETOUNICODE_CID, NS_UNICODETOISO88596E_CID) +NS_UCONV_REG_UNREG("ISO-8859-7", NS_ISO88597TOUNICODE_CID, NS_UNICODETOISO88597_CID) +NS_UCONV_REG_UNREG("ISO-8859-8", NS_ISO88598TOUNICODE_CID, NS_UNICODETOISO88598_CID) +NS_UCONV_REG_UNREG("ISO-8859-8-I", NS_ISO88598ITOUNICODE_CID, NS_UNICODETOISO88598I_CID) +NS_UCONV_REG_UNREG("ISO-8859-8-E", NS_ISO88598ETOUNICODE_CID, NS_UNICODETOISO88598E_CID) +NS_UCONV_REG_UNREG("ISO-8859-9", NS_ISO88599TOUNICODE_CID, NS_UNICODETOISO88599_CID) +NS_UCONV_REG_UNREG("ISO-8859-10", NS_ISO885910TOUNICODE_CID, NS_UNICODETOISO885910_CID) +NS_UCONV_REG_UNREG("ISO-8859-13", NS_ISO885913TOUNICODE_CID, NS_UNICODETOISO885913_CID) +NS_UCONV_REG_UNREG("ISO-8859-14", NS_ISO885914TOUNICODE_CID, NS_UNICODETOISO885914_CID) +NS_UCONV_REG_UNREG("ISO-8859-15", NS_ISO885915TOUNICODE_CID, NS_UNICODETOISO885915_CID) +NS_UCONV_REG_UNREG("ISO-8859-16", NS_ISO885916TOUNICODE_CID, NS_UNICODETOISO885916_CID) +NS_UCONV_REG_UNREG("ISO-IR-111", NS_ISOIR111TOUNICODE_CID, NS_UNICODETOISOIR111_CID) +NS_UCONV_REG_UNREG("windows-1250", NS_CP1250TOUNICODE_CID, NS_UNICODETOCP1250_CID) +NS_UCONV_REG_UNREG("windows-1251", NS_CP1251TOUNICODE_CID, NS_UNICODETOCP1251_CID) +NS_UCONV_REG_UNREG("windows-1253", NS_CP1253TOUNICODE_CID, NS_UNICODETOCP1253_CID) +NS_UCONV_REG_UNREG("windows-1254", NS_CP1254TOUNICODE_CID, NS_UNICODETOCP1254_CID) +NS_UCONV_REG_UNREG("windows-1255", NS_CP1255TOUNICODE_CID, NS_UNICODETOCP1255_CID) +NS_UCONV_REG_UNREG("windows-1256", NS_CP1256TOUNICODE_CID, NS_UNICODETOCP1256_CID) +NS_UCONV_REG_UNREG("windows-1257", NS_CP1257TOUNICODE_CID, NS_UNICODETOCP1257_CID) +NS_UCONV_REG_UNREG("windows-1258", NS_CP1258TOUNICODE_CID, NS_UNICODETOCP1258_CID) +NS_UCONV_REG_UNREG("TIS-620", NS_CP874TOUNICODE_CID, NS_UNICODETOCP874_CID) +NS_UCONV_REG_UNREG("IBM866", NS_CP866TOUNICODE_CID, NS_UNICODETOCP866_CID) +NS_UCONV_REG_UNREG("KOI8-R", NS_KOI8RTOUNICODE_CID, NS_UNICODETOKOI8R_CID) +NS_UCONV_REG_UNREG("KOI8-U", NS_KOI8UTOUNICODE_CID, NS_UNICODETOKOI8U_CID) +NS_UCONV_REG_UNREG("x-mac-ce", NS_MACCETOUNICODE_CID, NS_UNICODETOMACCE_CID) +NS_UCONV_REG_UNREG("x-mac-greek", NS_MACGREEKTOUNICODE_CID, NS_UNICODETOMACGREEK_CID) +NS_UCONV_REG_UNREG("x-mac-turkish", NS_MACTURKISHTOUNICODE_CID, NS_UNICODETOMACTURKISH_CID) +NS_UCONV_REG_UNREG("x-mac-croatian", NS_MACCROATIANTOUNICODE_CID, NS_UNICODETOMACCROATIAN_CID) +NS_UCONV_REG_UNREG("x-mac-romanian", NS_MACROMANIANTOUNICODE_CID, NS_UNICODETOMACROMANIAN_CID) +NS_UCONV_REG_UNREG("x-mac-cyrillic", NS_MACCYRILLICTOUNICODE_CID, NS_UNICODETOMACCYRILLIC_CID) +NS_UCONV_REG_UNREG("x-mac-ukrainian", NS_MACUKRAINIANTOUNICODE_CID, NS_UNICODETOMACUKRAINIAN_CID) +NS_UCONV_REG_UNREG("x-mac-icelandic", NS_MACICELANDICTOUNICODE_CID, NS_UNICODETOMACICELANDIC_CID) +NS_UCONV_REG_UNREG("GEOSTD8", NS_GEOSTD8TOUNICODE_CID, NS_UNICODETOGEOSTD8_CID) +NS_UCONV_REG_UNREG("armscii-8", NS_ARMSCII8TOUNICODE_CID, NS_UNICODETOARMSCII8_CID) +NS_UCONV_REG_UNREG("x-viet-tcvn5712", NS_TCVN5712TOUNICODE_CID, NS_UNICODETOTCVN5712_CID) +NS_UCONV_REG_UNREG("VISCII", NS_VISCIITOUNICODE_CID, NS_UNICODETOVISCII_CID) +NS_UCONV_REG_UNREG("x-viet-vps", NS_VPSTOUNICODE_CID, NS_UNICODETOVPS_CID) +NS_UCONV_REG_UNREG("UTF-7", NS_UTF7TOUNICODE_CID, NS_UNICODETOUTF7_CID) +NS_UCONV_REG_UNREG("x-imap4-modified-utf7", NS_MUTF7TOUNICODE_CID, NS_UNICODETOMUTF7_CID) +NS_UCONV_REG_UNREG("UTF-16BE", NS_UTF16BETOUNICODE_CID, NS_UNICODETOUTF16BE_CID) +NS_UCONV_REG_UNREG("UTF-16LE", NS_UTF16LETOUNICODE_CID, NS_UNICODETOUTF16LE_CID) +NS_UCONV_REG_UNREG("UTF-32BE", NS_UTF32BETOUNICODE_CID, NS_UNICODETOUTF32BE_CID) +NS_UCONV_REG_UNREG("UTF-32LE", NS_UTF32LETOUNICODE_CID, NS_UNICODETOUTF32LE_CID) +NS_UCONV_REG_UNREG("T.61-8bit", NS_T61TOUNICODE_CID, NS_UNICODETOT61_CID) +NS_UCONV_REG_UNREG("x-user-defined", NS_USERDEFINEDTOUNICODE_CID, NS_UNICODETOUSERDEFINED_CID) +NS_UCONV_REG_UNREG("x-mac-arabic" , NS_MACARABICTOUNICODE_CID, NS_UNICODETOMACARABIC_CID) +NS_UCONV_REG_UNREG("x-mac-devanagari" , NS_MACDEVANAGARITOUNICODE_CID, NS_UNICODETOMACDEVANAGARI_CID) +NS_UCONV_REG_UNREG("x-mac-farsi" , NS_MACFARSITOUNICODE_CID, NS_UNICODETOMACFARSI_CID) +NS_UCONV_REG_UNREG("x-mac-gurmukhi" , NS_MACGURMUKHITOUNICODE_CID, NS_UNICODETOMACGURMUKHI_CID) +NS_UCONV_REG_UNREG("x-mac-gujarati" , NS_MACGUJARATITOUNICODE_CID, NS_UNICODETOMACGUJARATI_CID) +NS_UCONV_REG_UNREG("x-mac-hebrew" , NS_MACHEBREWTOUNICODE_CID, NS_UNICODETOMACHEBREW_CID) + +NS_UCONV_REG_UNREG_ENCODER("UTF-16" , NS_UNICODETOUTF16_CID) +NS_UCONV_REG_UNREG_ENCODER("Adobe-Symbol-Encoding" , NS_UNICODETOSYMBOL_CID) +NS_UCONV_REG_UNREG_ENCODER("x-zapf-dingbats" , NS_UNICODETOZAPFDINGBATS_CID) + + // ucvibm +NS_UCONV_REG_UNREG("IBM850", NS_CP850TOUNICODE_CID, NS_UNICODETOCP850_CID) +NS_UCONV_REG_UNREG("IBM852", NS_CP852TOUNICODE_CID, NS_UNICODETOCP852_CID) +NS_UCONV_REG_UNREG("IBM855", NS_CP855TOUNICODE_CID, NS_UNICODETOCP855_CID) +NS_UCONV_REG_UNREG("IBM857", NS_CP857TOUNICODE_CID, NS_UNICODETOCP857_CID) +NS_UCONV_REG_UNREG("IBM862", NS_CP862TOUNICODE_CID, NS_UNICODETOCP862_CID) +NS_UCONV_REG_UNREG("IBM864", NS_CP864TOUNICODE_CID, NS_UNICODETOCP864_CID) +NS_UCONV_REG_UNREG("IBM864i", NS_CP864ITOUNICODE_CID, NS_UNICODETOCP864I_CID) + + // ucvja +NS_UCONV_REG_UNREG("Shift_JIS", NS_SJISTOUNICODE_CID, NS_UNICODETOSJIS_CID) +NS_UCONV_REG_UNREG("ISO-2022-JP", NS_ISO2022JPTOUNICODE_CID, NS_UNICODETOISO2022JP_CID) +NS_UCONV_REG_UNREG("EUC-JP", NS_EUCJPTOUNICODE_CID, NS_UNICODETOEUCJP_CID) + +NS_UCONV_REG_UNREG_ENCODER("jis_0201" , NS_UNICODETOJISX0201_CID) +NS_UCONV_REG_UNREG_ENCODER("jis_0208-1983" , NS_UNICODETOJISX0208_CID) +NS_UCONV_REG_UNREG_ENCODER("jis_0212-1990" , NS_UNICODETOJISX0212_CID) + + // ucvtw2 +NS_UCONV_REG_UNREG("x-euc-tw", NS_EUCTWTOUNICODE_CID, NS_UNICODETOEUCTW_CID) +NS_UCONV_REG_UNREG_ENCODER("x-cns-11643-1" , NS_UNICODETOCNS11643P1_CID) +NS_UCONV_REG_UNREG_ENCODER("x-cns-11643-2" , NS_UNICODETOCNS11643P2_CID) +NS_UCONV_REG_UNREG_ENCODER("x-cns-11643-3" , NS_UNICODETOCNS11643P3_CID) +NS_UCONV_REG_UNREG_ENCODER("x-cns-11643-4" , NS_UNICODETOCNS11643P4_CID) +NS_UCONV_REG_UNREG_ENCODER("x-cns-11643-5" , NS_UNICODETOCNS11643P5_CID) +NS_UCONV_REG_UNREG_ENCODER("x-cns-11643-6" , NS_UNICODETOCNS11643P6_CID) +NS_UCONV_REG_UNREG_ENCODER("x-cns-11643-7" , NS_UNICODETOCNS11643P7_CID) + + // ucvtw +NS_UCONV_REG_UNREG("Big5", NS_BIG5TOUNICODE_CID, NS_UNICODETOBIG5_CID) +NS_UCONV_REG_UNREG("Big5-HKSCS", NS_BIG5HKSCSTOUNICODE_CID, NS_UNICODETOBIG5HKSCS_CID) + +NS_UCONV_REG_UNREG_ENCODER("hkscs-1" , NS_UNICODETOHKSCS_CID) +NS_UCONV_REG_UNREG_ENCODER("x-x-big5", NS_UNICODETOBIG5NOASCII_CID) + + // ucvko +NS_UCONV_REG_UNREG("EUC-KR", NS_EUCKRTOUNICODE_CID, NS_UNICODETOEUCKR_CID) +NS_UCONV_REG_UNREG("x-johab", NS_JOHABTOUNICODE_CID, NS_UNICODETOJOHAB_CID) +NS_UCONV_REG_UNREG("x-windows-949", NS_CP949TOUNICODE_CID, NS_UNICODETOCP949_CID) +NS_UCONV_REG_UNREG_DECODER("ISO-2022-KR", NS_ISO2022KRTOUNICODE_CID) + +NS_UCONV_REG_UNREG_ENCODER("ks_c_5601-1987", NS_UNICODETOKSC5601_CID) +NS_UCONV_REG_UNREG_ENCODER("x-x11johab", NS_UNICODETOX11JOHAB_CID) +NS_UCONV_REG_UNREG_ENCODER("x-johab-noascii", NS_UNICODETOJOHABNOASCII_CID) + +// ucvcn +NS_UCONV_REG_UNREG("GB2312", NS_GB2312TOUNICODE_CID, NS_UNICODETOGB2312_CID) +NS_UCONV_REG_UNREG("windows-936", NS_CP936TOUNICODE_CID, NS_UNICODETOCP936_CID) +NS_UCONV_REG_UNREG("x-gbk", NS_GBKTOUNICODE_CID, NS_UNICODETOGBK_CID) +NS_UCONV_REG_UNREG_ENCODER("x-gbk-noascii", NS_UNICODETOGBKNOASCII_CID) +NS_UCONV_REG_UNREG("HZ-GB-2312", NS_HZTOUNICODE_CID, NS_UNICODETOHZ_CID) +NS_UCONV_REG_UNREG_ENCODER("gb_2312-80", NS_UNICODETOGB2312GL_CID) +NS_UCONV_REG_UNREG("gb18030", NS_GB18030TOUNICODE_CID, NS_UNICODETOGB18030_CID) +NS_UCONV_REG_UNREG_ENCODER("gb18030.2000-0", NS_UNICODETOGB18030Font0_CID) +NS_UCONV_REG_UNREG_ENCODER("gb18030.2000-1", NS_UNICODETOGB18030Font1_CID) + NS_CONVERTER_REGISTRY_END NS_IMPL_NSUCONVERTERREGSELF @@ -101,6 +432,333 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP1252) NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacRoman) NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF8) +// ucvlatin +NS_GENERIC_FACTORY_CONSTRUCTOR(nsAsciiToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUEscapeToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88592ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88593ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88594ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88595ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88596ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88596EToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88596IToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88597ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88598ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88598EToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88598IToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO88599ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO885910ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO885913ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO885914ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO885915ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO885916ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISOIR111ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP1250ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP1251ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP1253ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP1254ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP1255ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP1256ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP1257ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP1258ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP874ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP866ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOI8RToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOI8UToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacCEToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacGreekToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacTurkishToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacCroatianToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacRomanianToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacCyrillicToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacUkrainianToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacIcelandicToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsGEOSTD8ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsARMSCII8ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsTCVN5712ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsVISCIIToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsVPSToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF7ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMUTF7ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF16BEToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF16LEToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUCS4BEToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUCS4LEToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsT61ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserDefinedToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToAscii); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUEscape); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88592); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88593); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88594); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88595); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88596); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88596E); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88596I); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88597); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88598); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88598E); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88598I); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO88599); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO885910); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO885913); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO885914); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO885915); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO885916); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISOIR111); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP1250); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP1251); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP1253); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP1254); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP1255); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP1256); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP1257); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP1258); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP874); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP866); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToKOI8R); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToKOI8U); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacCE); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacGreek); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacTurkish); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacCroatian); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacRomanian); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacCyrillic); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacUkrainian); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacIcelandic); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGEOSTD8); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToARMSCII8); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTCVN5712); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToVISCII); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToVPS); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF7); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMUTF7); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF16BE); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF16LE); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF16); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUCS4BE); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUCS4LE); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToT61); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUserDefined); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToSymbol); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToZapfDingbat); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacArabicToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacDevanagariToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacFarsiToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacGurmukhiToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacGujaratiToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacHebrewToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacArabic); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacDevanagari); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacFarsi); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacGurmukhi); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacGujarati); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacHebrew); + +// ucvibm +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP850ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP852ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP855ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP857ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP862ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP864ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP864iToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP850); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP852); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP855); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP857); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP862); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP864); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP864i); + +// ucvja +NS_GENERIC_FACTORY_CONSTRUCTOR(nsShiftJISToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsEUCJPToUnicodeV2); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO2022JPToUnicodeV2); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToSJIS); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToEUCJP); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO2022JP); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToJISx0201); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToJISx0208); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToJISx0212); + +// ucvtw2 +NS_GENERIC_FACTORY_CONSTRUCTOR(nsEUCTWToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToEUCTW); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCNS11643p1); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCNS11643p2); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCNS11643p3); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCNS11643p4); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCNS11643p5); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCNS11643p6); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCNS11643p7); + +// ucvtw +NS_GENERIC_FACTORY_CONSTRUCTOR(nsBIG5ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToBIG5); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToBIG5NoAscii); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsBIG5HKSCSToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToBIG5HKSCS); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToHKSCS); + +// ucvko +NS_GENERIC_FACTORY_CONSTRUCTOR(nsEUCKRToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToEUCKR); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToKSC5601); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToX11Johab); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsJohabToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToJohab); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToJohabNoAscii); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP949ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP949); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO2022KRToUnicode); + +// ucvcn +NS_GENERIC_FACTORY_CONSTRUCTOR(nsGB2312ToUnicodeV2); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB2312V2); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP936ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP936); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsGBKToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGBK); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGBKNoAscii); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsHZToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToHZ); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB2312GL); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsGB18030ToUnicode); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB18030); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB18030Font0); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB18030Font1); + + +//---------------------------------------------------------------------------- +// Global functions and data [declaration] + +static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); + +#define DECODER_NAME_BASE "Unicode Decoder-" +#define ENCODER_NAME_BASE "Unicode Encoder-" + +// ucvja +PRUint16 g_uf0201Mapping[] = { +#include "jis0201.uf" +}; +PRUint16 g_uf0201GLMapping[] = { +#include "jis0201gl.uf" +}; + +PRUint16 g_uf0208Mapping[] = { +#include "jis0208.uf" +}; + +PRUint16 g_uf0208extMapping[] = { +#include "jis0208ext.uf" +}; + +PRUint16 g_uf0212Mapping[] = { +#include "jis0212.uf" +}; + +// ucvtw2 +PRUint16 g_ufCNS1MappingTable[] = { +#include "cns_1.uf" +}; + +PRUint16 g_ufCNS2MappingTable[] = { +#include "cns_2.uf" +}; + +PRUint16 g_ufCNS3MappingTable[] = { +#include "cns3.uf" +}; + +PRUint16 g_ufCNS4MappingTable[] = { +#include "cns4.uf" +}; + +PRUint16 g_ufCNS5MappingTable[] = { +#include "cns5.uf" +}; + +PRUint16 g_ufCNS6MappingTable[] = { +#include "cns6.uf" +}; + +PRUint16 g_ufCNS7MappingTable[] = { +#include "cns7.uf" +}; + +PRUint16 g_utCNS1MappingTable[] = { +#include "cns_1.ut" +}; + +PRUint16 g_utCNS2MappingTable[] = { +#include "cns_2.ut" +}; + +PRUint16 g_utCNS3MappingTable[] = { +#include "cns3.ut" +}; + +PRUint16 g_utCNS4MappingTable[] = { +#include "cns4.ut" +}; + +PRUint16 g_utCNS5MappingTable[] = { +#include "cns5.ut" +}; + +PRUint16 g_utCNS6MappingTable[] = { +#include "cns6.ut" +}; + +PRUint16 g_utCNS7MappingTable[] = { +#include "cns7.ut" +}; + +PRUint16 g_ASCIIMappingTable[] = { + 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0x007F, 0x0000 +}; + +// ucvtw +PRUint16 g_ufBig5Mapping[] = { +#include "big5.uf" +}; + +PRUint16 g_utBIG5Mapping[] = { +#include "big5.ut" +}; + +PRUint16 g_ufBig5HKSCSMapping[] = { +#include "hkscs.uf" +}; + +PRUint16 g_ASCIIMapping[] = { + 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0x007F, 0x0000 +}; + +PRUint16 g_utBig5HKSCSMapping[] = { +#include "hkscs.ut" +}; + +// ucvko +PRUint16 g_utKSC5601Mapping[] = { +#include "u20kscgl.ut" +}; + +PRUint16 g_ufKSC5601Mapping[] = { +#include "u20kscgl.uf" +}; + +PRUint16 g_ucvko_AsciiMapping[] = { + 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0x007F, 0x0000 +}; +PRUint16 g_HangulNullMapping[] ={ + 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0xAC00, 0xD7A3, 0xAC00 +}; +PRUint16 g_ufJohabJamoMapping[] ={ +#include "johabjamo.uf" +}; + NS_IMETHODIMP nsConverterManagerDataRegister(nsIComponentManager* aCompMgr, nsIFile* aPath, @@ -194,7 +852,937 @@ static const nsModuleComponentInfo components[] = "Unicode To UTF-8 Converter", NS_UNICODETOUTF8_CID, NS_UNICODETOUTF8_CONTRACTID, nsUnicodeToUTF8Constructor, - } + }, + + // ucvlatin + { + DECODER_NAME_BASE "us-ascii" , NS_ASCIITOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "us-ascii", + nsAsciiToUnicodeConstructor , + // global converter registration + nsUConverterRegSelf, nsUConverterUnregSelf, + }, + { + DECODER_NAME_BASE "x-u-escaped" , NS_UESCAPETOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-u-escaped", + nsUEscapeToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-2" , NS_ISO88592TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-2", + nsISO88592ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-3" , NS_ISO88593TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-3", + nsISO88593ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-4" , NS_ISO88594TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-4", + nsISO88594ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-5" , NS_ISO88595TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-5", + nsISO88595ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-6" , NS_ISO88596TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-6", + nsISO88596ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-6-I" , NS_ISO88596ITOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-6-I", + nsISO88596IToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-6-E" , NS_ISO88596ETOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-6-E", + nsISO88596EToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-7" , NS_ISO88597TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-7", + nsISO88597ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-8" , NS_ISO88598TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-8", + nsISO88598ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-8-I" , NS_ISO88598ITOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-8-I", + nsISO88598IToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-8-E" , NS_ISO88598ETOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-8-E", + nsISO88598EToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-9" , NS_ISO88599TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-9", + nsISO88599ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-10" , NS_ISO885910TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-10", + nsISO885910ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-13" , NS_ISO885913TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-13", + nsISO885913ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-14" , NS_ISO885914TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-14", + nsISO885914ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-15" , NS_ISO885915TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-15", + nsISO885915ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-8859-16" , NS_ISO885916TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-16", + nsISO885916ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "ISO-IR-111" , NS_ISOIR111TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-IR-111", + nsISOIR111ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "windows-1250" , NS_CP1250TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "windows-1250", + nsCP1250ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "windows-1251" , NS_CP1251TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "windows-1251", + nsCP1251ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "windows-1253" , NS_CP1253TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "windows-1253", + nsCP1253ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "windows-1254" , NS_CP1254TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "windows-1254", + nsCP1254ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "windows-1255" , NS_CP1255TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "windows-1255", + nsCP1255ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "windows-1256" , NS_CP1256TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "windows-1256", + nsCP1256ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "windows-1257" , NS_CP1257TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "windows-1257", + nsCP1257ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "windows-1258" , NS_CP1258TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "windows-1258", + nsCP1258ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "TIS-620" , NS_CP874TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "TIS-620", + nsCP874ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "IBM866" , NS_CP866TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "IBM866", + nsCP866ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "KOI8-R" , NS_KOI8RTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "KOI8-R", + nsKOI8RToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "KOI8-U" , NS_KOI8UTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "KOI8-U", + nsKOI8UToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-mac-ce" , NS_MACCETOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-ce", + nsMacCEToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-mac-greek" , NS_MACGREEKTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-greek", + nsMacGreekToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-mac-turkish" , NS_MACTURKISHTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-turkish", + nsMacTurkishToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-mac-croatian" , NS_MACCROATIANTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-croatian", + nsMacCroatianToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-mac-romanian" , NS_MACROMANIANTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-romanian", + nsMacRomanianToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-mac-cyrillic" , NS_MACCYRILLICTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-cyrillic", + nsMacCyrillicToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-mac-ukrainian" , NS_MACUKRAINIANTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-ukrainian", + nsMacUkrainianToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-mac-icelandic" , NS_MACICELANDICTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-icelandic", + nsMacIcelandicToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "GEOSTD8" , NS_GEOSTD8TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "GEOSTD8", + nsGEOSTD8ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "armscii-8" , NS_ARMSCII8TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "armscii-8", + nsARMSCII8ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-viet-tcvn5712" , NS_TCVN5712TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-viet-tcvn5712", + nsTCVN5712ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "VISCII" , NS_VISCIITOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "VISCII", + nsVISCIIToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-viet-vps" , NS_VPSTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-viet-vps", + nsVPSToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "UTF-7" , NS_UTF7TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "UTF-7", + nsUTF7ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-imap4-modified-utf7" , NS_MUTF7TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-imap4-modified-utf7", + nsMUTF7ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "UTF-16BE" , NS_UTF16BETOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "UTF-16BE", + nsUTF16BEToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "UTF-16LE" , NS_UTF16LETOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "UTF-16LE", + nsUTF16LEToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "UTF-32BE" , NS_UTF32BETOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "UTF-32BE", + nsUCS4BEToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "UTF-32LE" , NS_UTF32LETOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "UTF-32LE", + nsUCS4LEToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "T.61-8bit" , NS_T61TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "T.61-8bit", + nsT61ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-user-defined" , NS_USERDEFINEDTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-user-defined", + nsUserDefinedToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-mac-arabic" , NS_MACARABICTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-arabic", + nsMacArabicToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-mac-devanagari" , NS_MACDEVANAGARITOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-devanagari", + nsMacDevanagariToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-mac-farsi" , NS_MACFARSITOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-farsi", + nsMacFarsiToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-mac-gurmukhi" , NS_MACGURMUKHITOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-gurmukhi", + nsMacGurmukhiToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-mac-gujarati" , NS_MACGUJARATITOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-gujarati", + nsMacGujaratiToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "x-mac-hebrew" , NS_MACHEBREWTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-hebrew", + nsMacHebrewToUnicodeConstructor , + }, + { + ENCODER_NAME_BASE "us-ascii" , NS_UNICODETOASCII_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "us-ascii", + nsUnicodeToAsciiConstructor, + }, + { + ENCODER_NAME_BASE "x-u-escaped" , NS_UNICODETOUESCAPE_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-u-escaped", + nsUnicodeToUEscapeConstructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-2" , NS_UNICODETOISO88592_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-2", + nsUnicodeToISO88592Constructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-3" , NS_UNICODETOISO88593_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-3", + nsUnicodeToISO88593Constructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-4" , NS_UNICODETOISO88594_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-4", + nsUnicodeToISO88594Constructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-5" , NS_UNICODETOISO88595_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-5", + nsUnicodeToISO88595Constructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-6" , NS_UNICODETOISO88596_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-6", + nsUnicodeToISO88596Constructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-6-I" , NS_UNICODETOISO88596I_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-6-I", + nsUnicodeToISO88596IConstructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-6-E" , NS_UNICODETOISO88596E_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-6-E", + nsUnicodeToISO88596EConstructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-7" , NS_UNICODETOISO88597_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-7", + nsUnicodeToISO88597Constructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-8" , NS_UNICODETOISO88598_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-8", + nsUnicodeToISO88598Constructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-8-I" , NS_UNICODETOISO88598I_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-8-I", + nsUnicodeToISO88598IConstructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-8-E" , NS_UNICODETOISO88598E_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-8-E", + nsUnicodeToISO88598EConstructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-9" , NS_UNICODETOISO88599_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-9", + nsUnicodeToISO88599Constructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-10" , NS_UNICODETOISO885910_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-10", + nsUnicodeToISO885910Constructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-13" , NS_UNICODETOISO885913_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-13", + nsUnicodeToISO885913Constructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-14" , NS_UNICODETOISO885914_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-14", + nsUnicodeToISO885914Constructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-15" , NS_UNICODETOISO885915_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-15", + nsUnicodeToISO885915Constructor, + }, + { + ENCODER_NAME_BASE "ISO-8859-16" , NS_UNICODETOISO885916_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-16", + nsUnicodeToISO885916Constructor, + }, + { + ENCODER_NAME_BASE "ISO-IR-111" , NS_UNICODETOISOIR111_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-IR-111", + nsUnicodeToISOIR111Constructor, + }, + { + ENCODER_NAME_BASE "windows-1250" , NS_UNICODETOCP1250_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "windows-1250", + nsUnicodeToCP1250Constructor, + }, + { + ENCODER_NAME_BASE "windows-1251" , NS_UNICODETOCP1251_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "windows-1251", + nsUnicodeToCP1251Constructor, + }, + { + ENCODER_NAME_BASE "windows-1253" , NS_UNICODETOCP1253_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "windows-1253", + nsUnicodeToCP1253Constructor, + }, + { + ENCODER_NAME_BASE "windows-1254" , NS_UNICODETOCP1254_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "windows-1254", + nsUnicodeToCP1254Constructor, + }, + { + ENCODER_NAME_BASE "windows-1255" , NS_UNICODETOCP1255_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "windows-1255", + nsUnicodeToCP1255Constructor, + }, + { + ENCODER_NAME_BASE "windows-1256" , NS_UNICODETOCP1256_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "windows-1256", + nsUnicodeToCP1256Constructor, + }, + { + ENCODER_NAME_BASE "windows-1257" , NS_UNICODETOCP1257_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "windows-1257", + nsUnicodeToCP1257Constructor, + }, + { + ENCODER_NAME_BASE "windows-1258" , NS_UNICODETOCP1258_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "windows-1258", + nsUnicodeToCP1258Constructor, + }, + { + ENCODER_NAME_BASE "TIS-620" , NS_UNICODETOCP874_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "TIS-620", + nsUnicodeToCP874Constructor, + }, + { + ENCODER_NAME_BASE "IBM866" , NS_UNICODETOCP866_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "IBM866", + nsUnicodeToCP866Constructor, + }, + { + ENCODER_NAME_BASE "KOI8-R" , NS_UNICODETOKOI8R_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "KOI8-R", + nsUnicodeToKOI8RConstructor, + }, + { + ENCODER_NAME_BASE "KOI8-U" , NS_UNICODETOKOI8U_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "KOI8-U", + nsUnicodeToKOI8UConstructor, + }, + { + ENCODER_NAME_BASE "x-mac-ce" , NS_UNICODETOMACCE_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-ce", + nsUnicodeToMacCEConstructor, + }, + { + ENCODER_NAME_BASE "x-mac-greek" , NS_UNICODETOMACGREEK_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-greek", + nsUnicodeToMacGreekConstructor, + }, + { + ENCODER_NAME_BASE "x-mac-turkish" , NS_UNICODETOMACTURKISH_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-turkish", + nsUnicodeToMacTurkishConstructor, + }, + { + ENCODER_NAME_BASE "x-mac-croatian" , NS_UNICODETOMACCROATIAN_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-croatian", + nsUnicodeToMacCroatianConstructor, + }, + { + ENCODER_NAME_BASE "x-mac-romanian" , NS_UNICODETOMACROMANIAN_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-romanian", + nsUnicodeToMacRomanianConstructor, + }, + { + ENCODER_NAME_BASE "x-mac-cyrillic" , NS_UNICODETOMACCYRILLIC_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-cyrillic", + nsUnicodeToMacCyrillicConstructor, + }, + { + ENCODER_NAME_BASE "x-mac-ukrainian" , NS_UNICODETOMACUKRAINIAN_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-ukrainian", + nsUnicodeToMacUkrainianConstructor, + }, + { + ENCODER_NAME_BASE "x-mac-icelandic" , NS_UNICODETOMACICELANDIC_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-icelandic", + nsUnicodeToMacIcelandicConstructor, + }, + { + ENCODER_NAME_BASE "GEOSTD8" , NS_UNICODETOGEOSTD8_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "GEOSTD8", + nsUnicodeToGEOSTD8Constructor, + }, + { + ENCODER_NAME_BASE "armscii-8" , NS_UNICODETOARMSCII8_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "armscii-8", + nsUnicodeToARMSCII8Constructor, + }, + { + ENCODER_NAME_BASE "x-viet-tcvn5712" , NS_UNICODETOTCVN5712_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-viet-tcvn5712", + nsUnicodeToTCVN5712Constructor, + }, + { + ENCODER_NAME_BASE "VISCII" , NS_UNICODETOVISCII_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "VISCII", + nsUnicodeToVISCIIConstructor, + }, + { + ENCODER_NAME_BASE "x-viet-vps" , NS_UNICODETOVPS_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-viet-vps", + nsUnicodeToVPSConstructor, + }, + { + ENCODER_NAME_BASE "UTF-7" , NS_UNICODETOUTF7_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "UTF-7", + nsUnicodeToUTF7Constructor, + }, + { + ENCODER_NAME_BASE "x-imap4-modified-utf7" , NS_UNICODETOMUTF7_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-imap4-modified-utf7", + nsUnicodeToMUTF7Constructor, + }, + { + ENCODER_NAME_BASE "UTF-16BE" , NS_UNICODETOUTF16BE_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "UTF-16BE", + nsUnicodeToUTF16BEConstructor, + }, + { + ENCODER_NAME_BASE "UTF-16LE" , NS_UNICODETOUTF16LE_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "UTF-16LE", + nsUnicodeToUTF16LEConstructor, + }, + { + ENCODER_NAME_BASE "UTF-16" , NS_UNICODETOUTF16_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "UTF-16", + nsUnicodeToUTF16Constructor, + }, + { + ENCODER_NAME_BASE "UTF-32BE" , NS_UNICODETOUTF32BE_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "UTF-32BE", + nsUnicodeToUCS4BEConstructor, + }, + { + ENCODER_NAME_BASE "UTF-32LE" , NS_UNICODETOUTF32LE_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "UTF-32LE", + nsUnicodeToUCS4LEConstructor, + }, + { + ENCODER_NAME_BASE "T.61-8bit" , NS_UNICODETOT61_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "T.61-8bit", + nsUnicodeToT61Constructor, + }, + { + ENCODER_NAME_BASE "x-user-defined" , NS_UNICODETOUSERDEFINED_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-user-defined", + nsUnicodeToUserDefinedConstructor, + }, + { + ENCODER_NAME_BASE "Adobe-Symbol-Encoding" , NS_UNICODETOSYMBOL_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "Adobe-Symbol-Encoding", + nsUnicodeToSymbolConstructor, + }, + { + ENCODER_NAME_BASE "x-zapf-dingbats" , NS_UNICODETOZAPFDINGBATS_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-zapf-dingbats", + nsUnicodeToZapfDingbatConstructor, + }, + { + ENCODER_NAME_BASE "x-mac-arabic" , NS_UNICODETOMACARABIC_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-arabic", + nsUnicodeToMacArabicConstructor, + }, + { + ENCODER_NAME_BASE "x-mac-devanagari" , NS_UNICODETOMACDEVANAGARI_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-devanagari", + nsUnicodeToMacDevanagariConstructor, + }, + { + ENCODER_NAME_BASE "x-mac-farsi" , NS_UNICODETOMACFARSI_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-farsi", + nsUnicodeToMacFarsiConstructor, + }, + { + ENCODER_NAME_BASE "x-mac-gurmukhi" , NS_UNICODETOMACGURMUKHI_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-gurmukhi", + nsUnicodeToMacGurmukhiConstructor, + }, + { + ENCODER_NAME_BASE "x-mac-gujarati" , NS_UNICODETOMACGUJARATI_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-gujarati", + nsUnicodeToMacGujaratiConstructor, + }, + { + ENCODER_NAME_BASE "x-mac-hebrew" , NS_UNICODETOMACHEBREW_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-hebrew", + nsUnicodeToMacHebrewConstructor, + }, + // ucvibm + { + DECODER_NAME_BASE "IBM850" , NS_CP850TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "IBM850", + nsCP850ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "IBM852" , NS_CP852TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "IBM852", + nsCP852ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "IBM855" , NS_CP855TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "IBM855", + nsCP855ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "IBM857" , NS_CP857TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "IBM857", + nsCP857ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "IBM862" , NS_CP862TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "IBM862", + nsCP862ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "IBM864" , NS_CP864TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "IBM864", + nsCP864ToUnicodeConstructor , + }, + { + DECODER_NAME_BASE "IBM864i" , NS_CP864ITOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "IBM864i", + nsCP864iToUnicodeConstructor , + }, + { + ENCODER_NAME_BASE "IBM850" , NS_UNICODETOCP850_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "IBM850", + nsUnicodeToCP850Constructor, + }, + { + ENCODER_NAME_BASE "IBM852" , NS_UNICODETOCP852_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "IBM852", + nsUnicodeToCP852Constructor, + }, + { + ENCODER_NAME_BASE "IBM855" , NS_UNICODETOCP855_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "IBM855", + nsUnicodeToCP855Constructor, + }, + { + ENCODER_NAME_BASE "IBM857" , NS_UNICODETOCP857_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "IBM857", + nsUnicodeToCP857Constructor, + }, + { + ENCODER_NAME_BASE "IBM862" , NS_UNICODETOCP862_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "IBM862", + nsUnicodeToCP862Constructor, + }, + { + ENCODER_NAME_BASE "IBM864" , NS_UNICODETOCP864_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "IBM864", + nsUnicodeToCP864Constructor, + }, + { + ENCODER_NAME_BASE "IBM864i" , NS_UNICODETOCP864I_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "IBM864i", + nsUnicodeToCP864iConstructor, + }, + // ucvja + { + DECODER_NAME_BASE "Shift_JIS" , NS_SJISTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "Shift_JIS", + nsShiftJISToUnicodeConstructor , + // global converter registration + nsUConverterRegSelf, nsUConverterUnregSelf, + }, + { + DECODER_NAME_BASE "EUC-JP" , NS_EUCJPTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "EUC-JP", + nsEUCJPToUnicodeV2Constructor , + }, + { + DECODER_NAME_BASE "ISO-2022-JP" , NS_ISO2022JPTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-2022-JP", + nsISO2022JPToUnicodeV2Constructor , + }, + { + ENCODER_NAME_BASE "Shift_JIS" , NS_UNICODETOSJIS_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "Shift_JIS", + nsUnicodeToSJISConstructor, + }, + { + ENCODER_NAME_BASE "EUC-JP" , NS_UNICODETOEUCJP_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "EUC-JP", + nsUnicodeToEUCJPConstructor, + }, + { + ENCODER_NAME_BASE "ISO-2022-JP" , NS_UNICODETOISO2022JP_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ISO-2022-JP", + nsUnicodeToISO2022JPConstructor, + }, + { + ENCODER_NAME_BASE "jis_0201" , NS_UNICODETOJISX0201_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "jis_0201", + nsUnicodeToJISx0201Constructor, + }, + { + ENCODER_NAME_BASE "jis_0208-1983" , NS_UNICODETOJISX0208_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "jis_0208-1983", + nsUnicodeToJISx0208Constructor, + }, + { + ENCODER_NAME_BASE "jis_0212-1990" , NS_UNICODETOJISX0212_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "jis_0212-1990", + nsUnicodeToJISx0212Constructor, + }, + + // ucvtw2 + { + DECODER_NAME_BASE "x-euc-tw" , NS_EUCTWTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-euc-tw", + nsEUCTWToUnicodeConstructor, + }, + { + ENCODER_NAME_BASE "x-euc-tw" , NS_UNICODETOEUCTW_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-euc-tw", + nsUnicodeToEUCTWConstructor, + }, + { + ENCODER_NAME_BASE "x-cns-11643-1" , NS_UNICODETOCNS11643P1_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-cns-11643-1", + nsUnicodeToCNS11643p1Constructor, + }, + { + ENCODER_NAME_BASE "x-cns-11643-2" , NS_UNICODETOCNS11643P2_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-cns-11643-2", + nsUnicodeToCNS11643p2Constructor, + }, + { + ENCODER_NAME_BASE "x-cns-11643-3" , NS_UNICODETOCNS11643P3_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-cns-11643-3", + nsUnicodeToCNS11643p3Constructor, + }, + { + ENCODER_NAME_BASE "x-cns-11643-4" , NS_UNICODETOCNS11643P4_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-cns-11643-4", + nsUnicodeToCNS11643p4Constructor, + }, + { + ENCODER_NAME_BASE "x-cns-11643-5" , NS_UNICODETOCNS11643P5_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-cns-11643-5", + nsUnicodeToCNS11643p5Constructor, + }, + { + ENCODER_NAME_BASE "x-cns-11643-6" , NS_UNICODETOCNS11643P6_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-cns-11643-6", + nsUnicodeToCNS11643p6Constructor, + }, + { + ENCODER_NAME_BASE "x-cns-11643-7" , NS_UNICODETOCNS11643P7_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-cns-11643-7", + nsUnicodeToCNS11643p7Constructor, + }, + + // ucvtw + { + ENCODER_NAME_BASE "Big5" , NS_UNICODETOBIG5_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "Big5", + nsUnicodeToBIG5Constructor, + }, + { + ENCODER_NAME_BASE "x-x-big5" , NS_UNICODETOBIG5NOASCII_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-x-big5", + nsUnicodeToBIG5NoAsciiConstructor, + }, + { + DECODER_NAME_BASE "Big5" , NS_BIG5TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "Big5", + nsBIG5ToUnicodeConstructor , + }, + { + ENCODER_NAME_BASE "Big5-HKSCS" , NS_UNICODETOBIG5HKSCS_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "Big5-HKSCS", + nsUnicodeToBIG5HKSCSConstructor, + }, + { + ENCODER_NAME_BASE "hkscs-1" , NS_UNICODETOHKSCS_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "hkscs-1", + nsUnicodeToHKSCSConstructor, + }, + { + DECODER_NAME_BASE "Big5-HKSCS" , NS_BIG5HKSCSTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "Big5-HKSCS", + nsBIG5HKSCSToUnicodeConstructor , + }, + + // ucvko + { + DECODER_NAME_BASE "EUC-KR" , NS_EUCKRTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "EUC-KR", + nsEUCKRToUnicodeConstructor , + }, + { + ENCODER_NAME_BASE "EUC-KR" , NS_UNICODETOEUCKR_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "EUC-KR", + nsUnicodeToEUCKRConstructor, + }, + { + ENCODER_NAME_BASE "ks_c_5601-1987" , NS_UNICODETOKSC5601_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "ks_c_5601-1987", + nsUnicodeToKSC5601Constructor, + }, + { + ENCODER_NAME_BASE "x-x11johab" , NS_UNICODETOX11JOHAB_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-x11johab", + nsUnicodeToX11JohabConstructor, + }, + { + DECODER_NAME_BASE "x-johab" , NS_JOHABTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-johab", + nsJohabToUnicodeConstructor , + }, + { + ENCODER_NAME_BASE "x-johab" , NS_UNICODETOJOHAB_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-johab", + nsUnicodeToJohabConstructor, + }, + { + ENCODER_NAME_BASE "x-johab-noascii", NS_UNICODETOJOHABNOASCII_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-johab-noascii", + nsUnicodeToJohabNoAsciiConstructor, + }, + { + DECODER_NAME_BASE "x-windows-949" , NS_CP949TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-windows-949", + nsCP949ToUnicodeConstructor , + }, + { + ENCODER_NAME_BASE "x-windows-949" , NS_UNICODETOCP949_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-windows-949", + nsUnicodeToCP949Constructor, + }, + { + DECODER_NAME_BASE "ISO-2022-KR" , NS_ISO2022KRTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "ISO-2022-KR", + nsISO2022KRToUnicodeConstructor , + }, + // ucvcn + { + DECODER_NAME_BASE "GB2312" , NS_GB2312TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "GB2312", + nsGB2312ToUnicodeV2Constructor , + }, + { + ENCODER_NAME_BASE "GB2312" , NS_UNICODETOGB2312_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "GB2312", + nsUnicodeToGB2312V2Constructor, + }, + { + DECODER_NAME_BASE "windows-936" , NS_CP936TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "windows-936", + nsCP936ToUnicodeConstructor , + }, + { + ENCODER_NAME_BASE "windows-936" , NS_UNICODETOCP936_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "windows-936", + nsUnicodeToCP936Constructor, + }, + { + DECODER_NAME_BASE "x-gbk" , NS_GBKTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "x-gbk", + nsGBKToUnicodeConstructor , + }, + { + ENCODER_NAME_BASE "x-gbk" , NS_UNICODETOGBK_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-gbk", + nsUnicodeToGBKConstructor, + }, + { + ENCODER_NAME_BASE "x-gbk-noascii" , NS_UNICODETOGBKNOASCII_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "x-gbk-noascii", + nsUnicodeToGBKNoAsciiConstructor, + }, + { + DECODER_NAME_BASE "HZ-GB-2312" , NS_HZTOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "HZ-GB-2312", + nsHZToUnicodeConstructor , + }, + { + ENCODER_NAME_BASE "HZ-GB-2312" , NS_UNICODETOHZ_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "HZ-GB-2312", + nsUnicodeToHZConstructor, + }, + { + ENCODER_NAME_BASE "gb_2312-80" , NS_UNICODETOGB2312GL_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "gb_2312-80", + nsUnicodeToGB2312GLConstructor, + }, + { + DECODER_NAME_BASE "gb18030" , NS_GB18030TOUNICODE_CID, + NS_UNICODEDECODER_CONTRACTID_BASE "gb18030", + nsGB18030ToUnicodeConstructor , + }, + { + ENCODER_NAME_BASE "gb18030.2000-0" , NS_UNICODETOGB18030Font0_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "gb18030.2000-0", + nsUnicodeToGB18030Font0Constructor, + }, + { + ENCODER_NAME_BASE "gb18030.2000-1" , NS_UNICODETOGB18030Font1_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "gb18030.2000-1", + nsUnicodeToGB18030Font1Constructor, + }, + { + ENCODER_NAME_BASE "gb18030" , NS_UNICODETOGB18030_CID, + NS_UNICODEENCODER_CONTRACTID_BASE "gb18030", + nsUnicodeToGB18030Constructor, + }, }; NS_IMPL_NSGETMODULE(nsUConvModule, components); diff --git a/intl/uconv/src/nsUCvMinSupport.cpp b/intl/uconv/src/nsUCvMinSupport.cpp deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/src/nsUCvMinSupport.h b/intl/uconv/src/nsUCvMinSupport.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/src/nsUTF8ToUnicode.cpp b/intl/uconv/src/nsUTF8ToUnicode.cpp index 5c9c35c3ce8..e19780cb52a 100644 --- a/intl/uconv/src/nsUTF8ToUnicode.cpp +++ b/intl/uconv/src/nsUTF8ToUnicode.cpp @@ -36,7 +36,7 @@ * * ***** END LICENSE BLOCK ***** */ -#include "nsUCvMinSupport.h" +#include "nsUCSupport.h" #include "nsUTF8ToUnicode.h" NS_IMETHODIMP NS_NewUTF8ToUnicode(nsISupports* aOuter, diff --git a/intl/uconv/src/nsUnicodeToCP1252.cpp b/intl/uconv/src/nsUnicodeToCP1252.cpp index 2d0c271ced1..8762ebd5132 100644 --- a/intl/uconv/src/nsUnicodeToCP1252.cpp +++ b/intl/uconv/src/nsUnicodeToCP1252.cpp @@ -36,7 +36,7 @@ * * ***** END LICENSE BLOCK ***** */ -#include "nsUCvMinSupport.h" +#include "nsUCSupport.h" #include "nsUnicodeToCP1252.h" //---------------------------------------------------------------------- @@ -56,17 +56,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP1252::nsUnicodeToCP1252() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP1252::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/src/nsUnicodeToCP1252.h b/intl/uconv/src/nsUnicodeToCP1252.h index 7ce391ee080..5e004e1412d 100644 --- a/intl/uconv/src/nsUnicodeToCP1252.h +++ b/intl/uconv/src/nsUnicodeToCP1252.h @@ -67,13 +67,6 @@ public: */ nsUnicodeToCP1252(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP1252_h___ */ diff --git a/intl/uconv/src/nsUnicodeToISO88591.cpp b/intl/uconv/src/nsUnicodeToISO88591.cpp index 8173e15f57d..f39cdfc2bfa 100644 --- a/intl/uconv/src/nsUnicodeToISO88591.cpp +++ b/intl/uconv/src/nsUnicodeToISO88591.cpp @@ -36,7 +36,7 @@ * * ***** END LICENSE BLOCK ***** */ -#include "nsUCvMinSupport.h" +#include "nsUCSupport.h" #include "nsUnicodeToISO88591.h" //---------------------------------------------------------------------- @@ -56,18 +56,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToISO88591::nsUnicodeToISO88591() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToISO88591::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} - diff --git a/intl/uconv/src/nsUnicodeToISO88591.h b/intl/uconv/src/nsUnicodeToISO88591.h index da02f7f45a6..fb01a1d26b8 100644 --- a/intl/uconv/src/nsUnicodeToISO88591.h +++ b/intl/uconv/src/nsUnicodeToISO88591.h @@ -67,13 +67,5 @@ public: */ nsUnicodeToISO88591(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; - #endif /* nsUnicodeToISO88591_h___ */ diff --git a/intl/uconv/src/nsUnicodeToMacRoman.cpp b/intl/uconv/src/nsUnicodeToMacRoman.cpp index b1cba3fd318..618339a7ae4 100644 --- a/intl/uconv/src/nsUnicodeToMacRoman.cpp +++ b/intl/uconv/src/nsUnicodeToMacRoman.cpp @@ -36,7 +36,7 @@ * * ***** END LICENSE BLOCK ***** */ -#include "nsUCvMinSupport.h" +#include "nsUCSupport.h" #include "nsUnicodeToMacRoman.h" //---------------------------------------------------------------------- @@ -56,17 +56,7 @@ static const PRInt16 g_MacRomanShiftTable[] = { nsUnicodeToMacRoman::nsUnicodeToMacRoman() : nsTableEncoderSupport((uShiftTable*) &g_MacRomanShiftTable, - (uMappingTable*) &g_MacRomanMappingTable) + (uMappingTable*) &g_MacRomanMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToMacRoman::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/src/nsUnicodeToMacRoman.h b/intl/uconv/src/nsUnicodeToMacRoman.h index 48b859675df..6feeb3796a4 100644 --- a/intl/uconv/src/nsUnicodeToMacRoman.h +++ b/intl/uconv/src/nsUnicodeToMacRoman.h @@ -64,13 +64,6 @@ public: */ nsUnicodeToMacRoman(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToMacRoman_h___ */ diff --git a/intl/uconv/src/nsUnicodeToUTF8.cpp b/intl/uconv/src/nsUnicodeToUTF8.cpp index 43546a5e22f..4af7ad396b8 100644 --- a/intl/uconv/src/nsUnicodeToUTF8.cpp +++ b/intl/uconv/src/nsUnicodeToUTF8.cpp @@ -38,7 +38,7 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -#include "nsUCvMinSupport.h" +#include "nsUCSupport.h" #include "nsUnicodeToUTF8.h" #include diff --git a/intl/uconv/tests/Makefile.in b/intl/uconv/tests/Makefile.in index d3c8cd98b8b..3a7a82f09d9 100644 --- a/intl/uconv/tests/Makefile.in +++ b/intl/uconv/tests/Makefile.in @@ -50,6 +50,7 @@ include $(topsrcdir)/config/rules.mk INCLUDES += \ -I$(srcdir)/../ucvlatin \ -I$(srcdir)/../ucvja \ + -I$(srcdir)/../util \ $(NULL) LIBS += \ diff --git a/intl/uconv/tests/TestUConv.cpp b/intl/uconv/tests/TestUConv.cpp index 4247990c7c2..fcd6a7a8cac 100644 --- a/intl/uconv/tests/TestUConv.cpp +++ b/intl/uconv/tests/TestUConv.cpp @@ -39,6 +39,7 @@ #include "nsIServiceManager.h" #include "nsICharsetConverterManager.h" #include "nsICharsetConverterManager2.h" +#include "nsUCSupport.h" #include "nsString.h" //---------------------------------------------------------------------------- @@ -211,8 +212,18 @@ nsresult nsTestUConv::TestEncoders() mLog.AddTrace(trace); nsresult res = NS_OK; - // XXX write me + nsCOMPtr ccMan = + do_GetService(kCharsetConverterManagerCID, &res); + if (NS_FAILED(res)) return res; + + nsCOMPtr encoders; + res = ccMan->GetEncoderList(getter_AddRefs(encoders)); + if (NS_FAILED(res)) return res; + PRUint32 encoderCount; + encoders->Count(&encoderCount); + printf("There are %d encoders\n", encoderCount); + mLog.DelTrace(trace); return res; } @@ -385,6 +396,9 @@ nsresult nsTestUConv::DisplayCharsets() printf("***** Character Sets [%d] *****\n", count); + PRUint32 encCount = 0, decCount = 0; + PRUint32 basicEncCount = 0, basicDecCount = 0; + for (PRUint32 i = 0; i < count; i++) { nsCOMPtr cs; nsAutoString str; @@ -408,20 +422,47 @@ nsresult nsTestUConv::DisplayCharsets() printf("%s", buff.get()); PrintSpaces(24 - buff.Length()); // align to hard coded column number - res = ccMan->GetCharsetTitle2(cs, &str); - if (NS_FAILED(res)) str.SetLength(0); - NS_LossyConvertUCS2toASCII buff2(str); nsCOMPtr dec = NULL; res = ccMan->GetUnicodeDecoder(cs, getter_AddRefs(dec)); if (NS_FAILED(res)) printf (" "); - else printf("D"); + else { + printf("D"); + decCount++; + } +#ifdef NS_DEBUG + // show the "basic" decoder classes + if (dec) { + nsCOMPtr isBasic = do_QueryInterface(dec); + if (isBasic) { + basicDecCount++; + printf("b"); + } + else printf(" "); + } + else printf(" "); +#endif nsCOMPtr enc = NULL; res = ccMan->GetUnicodeEncoder(cs, getter_AddRefs(enc)); if (NS_FAILED(res)) printf (" "); - else printf("E"); + else { + printf("E"); + encCount++; + } +#ifdef NS_DEBUG + if (enc) { + nsCOMPtr isBasic = do_QueryInterface(enc); + if (isBasic) { + basicEncCount++; + printf("b"); + } + else printf(" "); + } + else printf(" "); +#endif + printf(" "); prop.Assign(NS_LITERAL_STRING(".notForBrowser")); @@ -444,9 +485,18 @@ nsresult nsTestUConv::DisplayCharsets() if ((enc != NULL) && (NS_FAILED(res))) printf ("E"); else printf("X"); - printf(" \"%s\"\n", buff2); + printf("(%3d, %3d) ", encCount, decCount); + res = ccMan->GetCharsetTitle2(cs, &str); + if (NS_FAILED(res)) str.SetLength(0); + NS_LossyConvertUCS2toASCII buff2(str); + printf(" \"%s\"\n", buff2.get()); } + printf("%u of %u decoders are basic (%d%%)\n", + basicDecCount, decCount, (basicDecCount * 100) / decCount); + + printf("%u of %u encoders are basic (%d%%)\n", + basicEncCount, encCount, (basicEncCount * 100) / encCount); mLog.DelTrace(trace); return NS_OK; } diff --git a/intl/uconv/ucvcn/Makefile.in b/intl/uconv/ucvcn/Makefile.in index 136e2d0a478..3039d6ee092 100644 --- a/intl/uconv/ucvcn/Makefile.in +++ b/intl/uconv/ucvcn/Makefile.in @@ -27,9 +27,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = ucvcn -LIBRARY_NAME = ucvcn -EXPORT_LIBRARY = 1 -IS_COMPONENT = 1 +LIBRARY_NAME = ucvcn_s +FORCE_STATIC_LIB=1 MODULE_NAME = nsUCvCnModule REQUIRES = xpcom \ string \ @@ -50,17 +49,17 @@ CPPSRCS = \ nsUnicodeToHZ.cpp \ nsCP936ToUnicode.cpp \ nsUnicodeToCP936.cpp \ - nsUCvCnSupport.cpp \ - nsUCvCnModule.cpp \ nsGBKConvUtil.cpp \ $(NULL) EXPORTS = nsUCvCnCID.h -EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) +LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk +DEFINES += -D_IMPL_NS_INTL + ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/intl/uconv/ucvcn/nsCP936ToUnicode.h b/intl/uconv/ucvcn/nsCP936ToUnicode.h index 7ecd4132f39..1e660a47bb8 100644 --- a/intl/uconv/ucvcn/nsCP936ToUnicode.h +++ b/intl/uconv/ucvcn/nsCP936ToUnicode.h @@ -38,7 +38,7 @@ #ifndef nsCP936ToUnicode_h___ #define nsCP936ToUnicode_h___ -#include "nsUCvCnSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP936ToUnicode [declaration] diff --git a/intl/uconv/ucvcn/nsGB2312ToUnicodeV2.h b/intl/uconv/ucvcn/nsGB2312ToUnicodeV2.h index 74f7ace5b83..045ecd87679 100644 --- a/intl/uconv/ucvcn/nsGB2312ToUnicodeV2.h +++ b/intl/uconv/ucvcn/nsGB2312ToUnicodeV2.h @@ -39,7 +39,7 @@ #ifndef nsGB2312ToUnicodeV2_h___ #define nsGB2312ToUnicodeV2_h___ -#include "nsUCvCnSupport.h" +#include "nsUCSupport.h" #include "gbku.h" #include "nsGBKToUnicode.h" //---------------------------------------------------------------------- diff --git a/intl/uconv/ucvcn/nsGBKToUnicode.cpp b/intl/uconv/ucvcn/nsGBKToUnicode.cpp index ac6f77abbda..71236cef6b9 100644 --- a/intl/uconv/ucvcn/nsGBKToUnicode.cpp +++ b/intl/uconv/ucvcn/nsGBKToUnicode.cpp @@ -62,12 +62,6 @@ public: virtual ~nsGBKUnique2BytesToUnicode() { }; protected: - NS_IMETHOD GetMaxLength(const char* aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength) - { - *aDestLength = aSrcLength; - return NS_OK; - }; }; static PRUint16 g_utGBKUnique2Bytes[] = { @@ -75,7 +69,7 @@ static PRUint16 g_utGBKUnique2Bytes[] = { }; nsGBKUnique2BytesToUnicode::nsGBKUnique2BytesToUnicode() : nsTableDecoderSupport((uShiftTable*) &g_2BytesShiftTable, - (uMappingTable*) &g_utGBKUnique2Bytes) + (uMappingTable*) &g_utGBKUnique2Bytes, 1) { } @@ -89,12 +83,6 @@ public: virtual ~nsGB18030Unique2BytesToUnicode() { }; protected: - NS_IMETHOD GetMaxLength(const char* aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength) - { - *aDestLength = aSrcLength; - return NS_OK; - }; }; static PRUint16 g_utGB18030Unique2Bytes[] = { @@ -102,7 +90,7 @@ static PRUint16 g_utGB18030Unique2Bytes[] = { }; nsGB18030Unique2BytesToUnicode::nsGB18030Unique2BytesToUnicode() : nsTableDecoderSupport((uShiftTable*) &g_2BytesShiftTable, - (uMappingTable*) &g_utGB18030Unique2Bytes) + (uMappingTable*) &g_utGB18030Unique2Bytes, 1) { } @@ -120,12 +108,6 @@ public: virtual ~nsGB18030Unique4BytesToUnicode() { }; protected: - NS_IMETHOD GetMaxLength(const char* aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength) - { - *aDestLength = aSrcLength; - return NS_OK; - }; }; static PRUint16 g_utGB18030Unique4Bytes[] = { @@ -133,7 +115,7 @@ static PRUint16 g_utGB18030Unique4Bytes[] = { }; nsGB18030Unique4BytesToUnicode::nsGB18030Unique4BytesToUnicode() : nsTableDecoderSupport((uShiftTable*) &g_GB18030_4BytesShiftTable, - (uMappingTable*) &g_utGB18030Unique4Bytes) + (uMappingTable*) &g_utGB18030Unique4Bytes, 1) { } @@ -144,14 +126,6 @@ nsGB18030Unique4BytesToUnicode::nsGB18030Unique4BytesToUnicode() //---------------------------------------------------------------------- // Subclassing of nsTablesDecoderSupport class [implementation] -NS_IMETHODIMP nsGBKToUnicode::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK; -} - #define LEGAL_GBK_MULTIBYTE_FIRST_BYTE(c) \ (UINT8_IN_RANGE(0x81, (c), 0xFE)) #define FIRST_BYTE_IS_SURROGATE(c) \ diff --git a/intl/uconv/ucvcn/nsGBKToUnicode.h b/intl/uconv/ucvcn/nsGBKToUnicode.h index f5762195bed..b28029a5dce 100644 --- a/intl/uconv/ucvcn/nsGBKToUnicode.h +++ b/intl/uconv/ucvcn/nsGBKToUnicode.h @@ -40,7 +40,7 @@ #include "nsCOMPtr.h" #include "nsIUnicodeDecoder.h" -#include "nsUCvCnSupport.h" +#include "nsUCSupport.h" #include "gbku.h" //---------------------------------------------------------------------- @@ -60,7 +60,7 @@ public: /** * Class constructor. */ - nsGBKToUnicode() + nsGBKToUnicode() : nsBufferDecoderSupport(1) { mExtensionDecoder = nsnull; m4BytesDecoder = nsnull; @@ -72,9 +72,6 @@ protected: // Subclassing of nsDecoderSupport class [declaration] NS_IMETHOD ConvertNoBuff(const char* aSrc, PRInt32 * aSrcLength, PRUnichar *aDest, PRInt32 * aDestLength); - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); - protected: nsGBKConvUtil mUtil; nsCOMPtr mExtensionDecoder; diff --git a/intl/uconv/ucvcn/nsHZToUnicode.cpp b/intl/uconv/ucvcn/nsHZToUnicode.cpp index fd29429729d..d5cfb606a29 100644 --- a/intl/uconv/ucvcn/nsHZToUnicode.cpp +++ b/intl/uconv/ucvcn/nsHZToUnicode.cpp @@ -69,13 +69,6 @@ //---------------------------------------------------------------------- // Subclassing of nsTablesDecoderSupport class [implementation] -NS_IMETHODIMP nsHZToUnicode::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK; -} #define HZ_STATE_GB 1 #define HZ_STATE_ASCII 2 #define HZ_STATE_TILD 3 @@ -84,7 +77,7 @@ NS_IMETHODIMP nsHZToUnicode::GetMaxLength(const char * aSrc, #define HZLEAD3 '}' #define HZLEAD4 '\n' -nsHZToUnicode::nsHZToUnicode() +nsHZToUnicode::nsHZToUnicode() : nsBufferDecoderSupport(1) { mHZState = HZ_STATE_ASCII; // per HZ spec, default to ASCII state } diff --git a/intl/uconv/ucvcn/nsHZToUnicode.h b/intl/uconv/ucvcn/nsHZToUnicode.h index 8bdfd651c2e..adfc7fe0211 100644 --- a/intl/uconv/ucvcn/nsHZToUnicode.h +++ b/intl/uconv/ucvcn/nsHZToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsHZToUnicode_h___ #define nsHZToUnicode_h___ -#include "nsUCvCnSupport.h" +#include "nsUCSupport.h" #include "gbku.h" //---------------------------------------------------------------------- @@ -67,8 +67,6 @@ protected: // Subclassing of nsDecoderSupport class [declaration] NS_IMETHOD ConvertNoBuff(const char* aSrc, PRInt32 * aSrcLength, PRUnichar *aDest, PRInt32 * aDestLength); - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); nsGBKConvUtil mUtil; private: diff --git a/intl/uconv/ucvcn/nsUCvCnDll.h b/intl/uconv/ucvcn/nsUCvCnDll.h index 3e5f0f948f1..073734f25ee 100644 --- a/intl/uconv/ucvcn/nsUCvCnDll.h +++ b/intl/uconv/ucvcn/nsUCvCnDll.h @@ -41,5 +41,4 @@ #include "prtypes.h" -#define g_AsciiMapping ucvcn_g_AsciiMapping #endif /* nsUCvCnDll_h___ */ diff --git a/intl/uconv/ucvcn/nsUCvCnSupport.cpp b/intl/uconv/ucvcn/nsUCvCnSupport.cpp deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvcn/nsUCvCnSupport.h b/intl/uconv/ucvcn/nsUCvCnSupport.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvcn/nsUnicodeToCP936.h b/intl/uconv/ucvcn/nsUnicodeToCP936.h index 556ac69cc60..591c05bc4ca 100644 --- a/intl/uconv/ucvcn/nsUnicodeToCP936.h +++ b/intl/uconv/ucvcn/nsUnicodeToCP936.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCP936_h___ #define nsUnicodeToCP936_h___ -#include "nsUCvCnSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP936 [declaration] diff --git a/intl/uconv/ucvcn/nsUnicodeToGB2312GL.cpp b/intl/uconv/ucvcn/nsUnicodeToGB2312GL.cpp index d3430826a50..dd709833456 100644 --- a/intl/uconv/ucvcn/nsUnicodeToGB2312GL.cpp +++ b/intl/uconv/ucvcn/nsUnicodeToGB2312GL.cpp @@ -46,7 +46,8 @@ //---------------------------------------------------------------------- // Class nsUnicodeToGB2312GL [implementation] -nsUnicodeToGB2312GL::nsUnicodeToGB2312GL() +nsUnicodeToGB2312GL::nsUnicodeToGB2312GL() : + nsEncoderSupport(2) { mUtil.InitToGBKTable(); } @@ -95,14 +96,6 @@ NS_IMETHODIMP nsUnicodeToGB2312GL::ConvertNoBuff(const PRUnichar * aSrc, //---------------------------------------------------------------------- // Subclassing of nsTableEncoderSupport class [implementation] -NS_IMETHODIMP nsUnicodeToGB2312GL::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK; -} - NS_IMETHODIMP nsUnicodeToGB2312GL::FillInfo(PRUint32 *aInfo) { mUtil.FillGB2312Info(aInfo); diff --git a/intl/uconv/ucvcn/nsUnicodeToGB2312GL.h b/intl/uconv/ucvcn/nsUnicodeToGB2312GL.h index f405695df68..096d7cdba43 100644 --- a/intl/uconv/ucvcn/nsUnicodeToGB2312GL.h +++ b/intl/uconv/ucvcn/nsUnicodeToGB2312GL.h @@ -40,7 +40,7 @@ #ifndef nsUnicodeToGB2312GL_h___ #define nsUnicodeToGB2312GL_h___ -#include "nsUCvCnSupport.h" +#include "nsUCSupport.h" #include "gbku.h" //---------------------------------------------------------------------- // Class nsUnicodeToGB2312GL [declaration] @@ -70,9 +70,6 @@ protected: //-------------------------------------------------------------------- // Subclassing of nsEncoderSupport class [declaration] - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); - NS_IMETHOD ConvertNoBuffNoErr(const PRUnichar * aSrc, PRInt32 * aSrcLength, char * aDest, PRInt32 * aDestLength) { diff --git a/intl/uconv/ucvcn/nsUnicodeToGB2312V2.cpp b/intl/uconv/ucvcn/nsUnicodeToGB2312V2.cpp index 745e15d498a..68c171080e9 100644 --- a/intl/uconv/ucvcn/nsUnicodeToGB2312V2.cpp +++ b/intl/uconv/ucvcn/nsUnicodeToGB2312V2.cpp @@ -44,7 +44,8 @@ //---------------------------------------------------------------------- // Class nsUnicodeToGB2312V2 [implementation] -nsUnicodeToGB2312V2::nsUnicodeToGB2312V2() +nsUnicodeToGB2312V2::nsUnicodeToGB2312V2() : + nsEncoderSupport(2) { mUtil.InitToGBKTable(); } @@ -103,14 +104,6 @@ NS_IMETHODIMP nsUnicodeToGB2312V2::ConvertNoBuff(const PRUnichar * aSrc, //---------------------------------------------------------------------- // Subclassing of nsTableEncoderSupport class [implementation] -NS_IMETHODIMP nsUnicodeToGB2312V2::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK; -} - NS_IMETHODIMP nsUnicodeToGB2312V2::FillInfo(PRUint32 *aInfo) { mUtil.FillGB2312Info(aInfo); diff --git a/intl/uconv/ucvcn/nsUnicodeToGB2312V2.h b/intl/uconv/ucvcn/nsUnicodeToGB2312V2.h index 8e3cb1f5c9e..ce7fb08c441 100644 --- a/intl/uconv/ucvcn/nsUnicodeToGB2312V2.h +++ b/intl/uconv/ucvcn/nsUnicodeToGB2312V2.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToGB2312V2_h___ #define nsUnicodeToGB2312V2_h___ -#include "nsUCvCnSupport.h" +#include "nsUCSupport.h" #include "gbku.h" //---------------------------------------------------------------------- @@ -70,9 +70,6 @@ protected: //-------------------------------------------------------------------- // Subclassing of nsEncoderSupport class [declaration] - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); - NS_IMETHOD ConvertNoBuffNoErr(const PRUnichar * aSrc, PRInt32 * aSrcLength, char * aDest, PRInt32 * aDestLength) { diff --git a/intl/uconv/ucvcn/nsUnicodeToGBK.cpp b/intl/uconv/ucvcn/nsUnicodeToGBK.cpp index f6faacd0d50..2b672008203 100644 --- a/intl/uconv/ucvcn/nsUnicodeToGBK.cpp +++ b/intl/uconv/ucvcn/nsUnicodeToGBK.cpp @@ -78,15 +78,8 @@ class nsUnicodeToGB18030Uniq2Bytes : public nsTableEncoderSupport public: nsUnicodeToGB18030Uniq2Bytes() : nsTableEncoderSupport((uShiftTable*) &g_2BytesShiftTable, - (uMappingTable*) &g_uf_gb18030_2bytes) {}; + (uMappingTable*) &g_uf_gb18030_2bytes, 2) {}; protected: - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) - { - *aDestLength = 2 * aSrcLength; - return NS_OK; - }; }; //----------------------------------------------------------------------- // Private class used by nsUnicodeToGB18030 @@ -100,15 +93,8 @@ class nsUnicodeTo4BytesGB18030 : public nsTableEncoderSupport public: nsUnicodeTo4BytesGB18030() : nsTableEncoderSupport( (uShiftTable*) &g_4BytesGB18030ShiftTable, - (uMappingTable*) &g_uf_gb18030_4bytes) {}; + (uMappingTable*) &g_uf_gb18030_4bytes, 4) {}; protected: - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) - { - *aDestLength = 4 * aSrcLength; - return NS_OK_UDEC_EXACTLENGTH; - }; }; //----------------------------------------------------------------------- // Private class used by nsUnicodeToGBK @@ -122,15 +108,8 @@ class nsUnicodeToGBKUniq2Bytes : public nsTableEncoderSupport public: nsUnicodeToGBKUniq2Bytes() : nsTableEncoderSupport( (uShiftTable*) &g_2BytesShiftTable, - (uMappingTable*) &g_uf_gbk_2bytes) {}; + (uMappingTable*) &g_uf_gbk_2bytes, 2) {}; protected: - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) - { - *aDestLength = 2 * aSrcLength; - return NS_OK_UDEC_EXACTLENGTH; - }; }; //----------------------------------------------------------------------- // nsUnicodeToGB18030 @@ -143,13 +122,7 @@ void nsUnicodeToGB18030::Create4BytesEncoder() { m4BytesEncoder = new nsUnicodeTo4BytesGB18030(); } -NS_IMETHODIMP nsUnicodeToGB18030::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 4 * aSrcLength; - return NS_OK; -} + PRBool nsUnicodeToGB18030::EncodeSurrogate( PRUnichar aSurrogateHigh, PRUnichar aSurrogateLow, @@ -205,19 +178,11 @@ NS_IMETHODIMP nsUnicodeToGB18030Font0::FillInfo(PRUint32 *aInfo) //----------------------------------------------------------------------- nsUnicodeToGB18030Font1::nsUnicodeToGB18030Font1() : nsTableEncoderSupport( (uShiftTable*) &g_2BytesShiftTable, - (uMappingTable*) &g_uf_gb18030_4bytes) + (uMappingTable*) &g_uf_gb18030_4bytes, 4) { } -NS_IMETHODIMP nsUnicodeToGB18030Font1::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 4 * aSrcLength; - return NS_OK_UDEC_EXACTLENGTH; // font encoding is exactly 4 bytes -} - NS_IMETHODIMP nsUnicodeToGB18030Font1::FillInfo(PRUint32 *aInfo) { nsresult res = nsTableEncoderSupport::FillInfo(aInfo); @@ -357,7 +322,8 @@ NS_IMETHODIMP nsUnicodeToGB18030Font1::FillInfo(PRUint32 *aInfo) //---------------------------------------------------------------------- // Class nsUnicodeToGBK [implementation] -nsUnicodeToGBK::nsUnicodeToGBK() +nsUnicodeToGBK::nsUnicodeToGBK(PRUint32 aMaxLength) : + nsEncoderSupport(aMaxLength) { mExtensionEncoder = nsnull; m4BytesEncoder = nsnull; @@ -562,15 +528,6 @@ NS_IMETHODIMP nsUnicodeToGBK::ConvertNoBuff( //---------------------------------------------------------------------- // Subclassing of nsTableEncoderSupport class [implementation] -NS_IMETHODIMP nsUnicodeToGBK::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK; -} - - NS_IMETHODIMP nsUnicodeToGBK::FillInfo(PRUint32 *aInfo) { mUtil.FillInfo(aInfo, 0x81, 0xFE, 0x40, 0xFE); diff --git a/intl/uconv/ucvcn/nsUnicodeToGBK.h b/intl/uconv/ucvcn/nsUnicodeToGBK.h index ec65360420b..b57fc4b4f90 100644 --- a/intl/uconv/ucvcn/nsUnicodeToGBK.h +++ b/intl/uconv/ucvcn/nsUnicodeToGBK.h @@ -47,7 +47,7 @@ #ifndef nsUnicodeToGBK_h___ #define nsUnicodeToGBK_h___ -#include "nsUCvCnSupport.h" +#include "nsUCSupport.h" #include "nsCOMPtr.h" #include "nsIUnicodeEncoder.h" #include "gbku.h" @@ -61,7 +61,7 @@ public: /** * Class constructor. */ - nsUnicodeToGBK(); + nsUnicodeToGBK(PRUint32 aMaxLengthFactor = 2); virtual ~nsUnicodeToGBK() {}; protected: @@ -73,9 +73,6 @@ protected: char * aDest, PRInt32 * aDestLength); - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); - NS_IMETHOD ConvertNoBuffNoErr(const PRUnichar * aSrc, PRInt32 * aSrcLength, char * aDest, PRInt32 * aDestLength) { @@ -100,11 +97,9 @@ protected: class nsUnicodeToGB18030: public nsUnicodeToGBK { public: - nsUnicodeToGB18030() {}; + nsUnicodeToGB18030() : nsUnicodeToGBK(4) {}; virtual ~nsUnicodeToGB18030() {}; protected: - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); virtual void CreateExtensionEncoder(); virtual void Create4BytesEncoder(); virtual PRBool EncodeSurrogate(PRUnichar aSurrogateHigh, PRUnichar aSurrogateLow, char* aDest); @@ -127,9 +122,6 @@ public: nsUnicodeToGB18030Font1(); virtual ~nsUnicodeToGB18030Font1() {}; protected: - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength); NS_IMETHOD FillInfo(PRUint32 *aInfo); }; diff --git a/intl/uconv/ucvcn/nsUnicodeToHZ.cpp b/intl/uconv/ucvcn/nsUnicodeToHZ.cpp index ffd937fd650..feed9f0e6fd 100644 --- a/intl/uconv/ucvcn/nsUnicodeToHZ.cpp +++ b/intl/uconv/ucvcn/nsUnicodeToHZ.cpp @@ -58,7 +58,7 @@ #define HZLEAD2 '{' #define HZLEAD3 '}' #define UNICODE_TILD 0x007E -nsUnicodeToHZ::nsUnicodeToHZ() +nsUnicodeToHZ::nsUnicodeToHZ() : nsEncoderSupport(6) { mUtil.InitToGBKTable(); mHZState = HZ_STATE_ASCII; // per HZ spec, default to HZ mode @@ -142,12 +142,3 @@ NS_IMETHODIMP nsUnicodeToHZ::FillInfo(PRUint32 *aInfo) SET_REPRESENTABLE(aInfo, u); return NS_OK; } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] -NS_IMETHODIMP nsUnicodeToHZ::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 6 * aSrcLength; - return NS_OK; -} diff --git a/intl/uconv/ucvcn/nsUnicodeToHZ.h b/intl/uconv/ucvcn/nsUnicodeToHZ.h index be91cbebe58..95555c276ea 100644 --- a/intl/uconv/ucvcn/nsUnicodeToHZ.h +++ b/intl/uconv/ucvcn/nsUnicodeToHZ.h @@ -47,7 +47,7 @@ #ifndef nsUnicodeToHZ_h___ #define nsUnicodeToHZ_h___ -#include "nsUCvCnSupport.h" +#include "nsUCSupport.h" #include "gbku.h" //---------------------------------------------------------------------- // Class nsUnicodeToHZ [declaration] @@ -78,9 +78,6 @@ protected: return NS_OK; }; // just make it not abstract; - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); - PRUint16 mHZState; protected: nsGBKConvUtil mUtil; diff --git a/intl/uconv/ucvibm/MANIFEST b/intl/uconv/ucvibm/MANIFEST deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvibm/Makefile.in b/intl/uconv/ucvibm/Makefile.in index 2bdff8c9a7c..923fe939849 100644 --- a/intl/uconv/ucvibm/Makefile.in +++ b/intl/uconv/ucvibm/Makefile.in @@ -38,9 +38,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = ucvibm -LIBRARY_NAME = ucvibm -EXPORT_LIBRARY = 1 -IS_COMPONENT = 1 +LIBRARY_NAME = ucvibm_s +FORCE_STATIC_LIB = 1 MODULE_NAME = nsUCvIBMModule REQUIRES = xpcom \ string \ @@ -62,13 +61,11 @@ CPPSRCS = \ nsUnicodeToCP862.cpp \ nsUnicodeToCP864.cpp \ nsUnicodeToCP864i.cpp \ - nsUCvIBMSupport.cpp \ - nsUCvIBMModule.cpp \ $(NULL) EXPORTS = nsUCvIBMCID.h -EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) +LOCAL_INCLUDES = -I$(srcdir)/../util ifeq ($(MOZ_WIDGET_TOOLKIT),os2) ifeq ($(MOZ_OS2_TOOLS),VACPP) @@ -80,6 +77,7 @@ endif include $(topsrcdir)/config/rules.mk +DEFINES += -D_IMPL_NS_INTL ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/intl/uconv/ucvibm/nsCP850ToUnicode.h b/intl/uconv/ucvibm/nsCP850ToUnicode.h index b79d342ddc9..8344364ce20 100644 --- a/intl/uconv/ucvibm/nsCP850ToUnicode.h +++ b/intl/uconv/ucvibm/nsCP850ToUnicode.h @@ -36,7 +36,7 @@ #ifndef nsCP850ToUnicode_h___ #define nsCP850ToUnicode_h___ -#include "nsUCvIBMSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP850ToUnicode [declaration] diff --git a/intl/uconv/ucvibm/nsCP852ToUnicode.h b/intl/uconv/ucvibm/nsCP852ToUnicode.h index fe7a851574a..7f02088a211 100644 --- a/intl/uconv/ucvibm/nsCP852ToUnicode.h +++ b/intl/uconv/ucvibm/nsCP852ToUnicode.h @@ -36,7 +36,7 @@ #ifndef nsCP852ToUnicode_h___ #define nsCP852ToUnicode_h___ -#include "nsUCvIBMSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP852ToUnicode [declaration] diff --git a/intl/uconv/ucvibm/nsCP855ToUnicode.h b/intl/uconv/ucvibm/nsCP855ToUnicode.h index fe678392b47..a2743199efa 100644 --- a/intl/uconv/ucvibm/nsCP855ToUnicode.h +++ b/intl/uconv/ucvibm/nsCP855ToUnicode.h @@ -36,7 +36,7 @@ #ifndef nsCP855ToUnicode_h___ #define nsCP855ToUnicode_h___ -#include "nsUCvIBMSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP855ToUnicode [declaration] diff --git a/intl/uconv/ucvibm/nsCP857ToUnicode.h b/intl/uconv/ucvibm/nsCP857ToUnicode.h index e5a662bd94a..1ab91151a8c 100644 --- a/intl/uconv/ucvibm/nsCP857ToUnicode.h +++ b/intl/uconv/ucvibm/nsCP857ToUnicode.h @@ -36,7 +36,7 @@ #ifndef nsCP857ToUnicode_h___ #define nsCP857ToUnicode_h___ -#include "nsUCvIBMSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP857ToUnicode [declaration] diff --git a/intl/uconv/ucvibm/nsCP862ToUnicode.h b/intl/uconv/ucvibm/nsCP862ToUnicode.h index fe86b9aa68c..de33408088f 100644 --- a/intl/uconv/ucvibm/nsCP862ToUnicode.h +++ b/intl/uconv/ucvibm/nsCP862ToUnicode.h @@ -36,7 +36,7 @@ #ifndef nsCP862ToUnicode_h___ #define nsCP862ToUnicode_h___ -#include "nsUCvIBMSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP862ToUnicode [declaration] diff --git a/intl/uconv/ucvibm/nsCP864ToUnicode.h b/intl/uconv/ucvibm/nsCP864ToUnicode.h index 9903836e8fc..78cf53de93c 100644 --- a/intl/uconv/ucvibm/nsCP864ToUnicode.h +++ b/intl/uconv/ucvibm/nsCP864ToUnicode.h @@ -36,7 +36,7 @@ #ifndef nsCP864ToUnicode_h___ #define nsCP864ToUnicode_h___ -#include "nsUCvIBMSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP864ToUnicode [declaration] diff --git a/intl/uconv/ucvibm/nsCP864iToUnicode.h b/intl/uconv/ucvibm/nsCP864iToUnicode.h index 6875e3a441f..ebd08815b35 100644 --- a/intl/uconv/ucvibm/nsCP864iToUnicode.h +++ b/intl/uconv/ucvibm/nsCP864iToUnicode.h @@ -74,7 +74,7 @@ -#include "nsUCvIBMSupport.h" +#include "nsUCSupport.h" diff --git a/intl/uconv/ucvibm/nsUCvIBMSupport.cpp b/intl/uconv/ucvibm/nsUCvIBMSupport.cpp deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvibm/nsUCvIBMSupport.h b/intl/uconv/ucvibm/nsUCvIBMSupport.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvibm/nsUnicodeToCP850.cpp b/intl/uconv/ucvibm/nsUnicodeToCP850.cpp index 512499b7edd..97f22618c7a 100644 --- a/intl/uconv/ucvibm/nsUnicodeToCP850.cpp +++ b/intl/uconv/ucvibm/nsUnicodeToCP850.cpp @@ -52,17 +52,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP850::nsUnicodeToCP850() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP850::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvibm/nsUnicodeToCP850.h b/intl/uconv/ucvibm/nsUnicodeToCP850.h index 461b57fa758..f24dc57b959 100644 --- a/intl/uconv/ucvibm/nsUnicodeToCP850.h +++ b/intl/uconv/ucvibm/nsUnicodeToCP850.h @@ -36,7 +36,7 @@ #ifndef nsUnicodeToCP850_h___ #define nsUnicodeToCP850_h___ -#include "nsUCvIBMSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP850 [declaration] @@ -52,14 +52,6 @@ public: * Class constructor. */ nsUnicodeToCP850(); - -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP850_h___ */ diff --git a/intl/uconv/ucvibm/nsUnicodeToCP852.cpp b/intl/uconv/ucvibm/nsUnicodeToCP852.cpp index 62069f1eecc..715d4e6524c 100644 --- a/intl/uconv/ucvibm/nsUnicodeToCP852.cpp +++ b/intl/uconv/ucvibm/nsUnicodeToCP852.cpp @@ -52,17 +52,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP852::nsUnicodeToCP852() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP852::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvibm/nsUnicodeToCP852.h b/intl/uconv/ucvibm/nsUnicodeToCP852.h index 0f99157f0a8..c54ecbed992 100644 --- a/intl/uconv/ucvibm/nsUnicodeToCP852.h +++ b/intl/uconv/ucvibm/nsUnicodeToCP852.h @@ -36,7 +36,7 @@ #ifndef nsUnicodeToCP852_h___ #define nsUnicodeToCP852_h___ -#include "nsUCvIBMSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP852 [declaration] @@ -53,13 +53,6 @@ public: */ nsUnicodeToCP852(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP852_h___ */ diff --git a/intl/uconv/ucvibm/nsUnicodeToCP855.cpp b/intl/uconv/ucvibm/nsUnicodeToCP855.cpp index d2cefa49037..ef8a36eff5b 100644 --- a/intl/uconv/ucvibm/nsUnicodeToCP855.cpp +++ b/intl/uconv/ucvibm/nsUnicodeToCP855.cpp @@ -52,17 +52,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP855::nsUnicodeToCP855() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP855::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvibm/nsUnicodeToCP855.h b/intl/uconv/ucvibm/nsUnicodeToCP855.h index a79b4dbc6db..f640369248b 100644 --- a/intl/uconv/ucvibm/nsUnicodeToCP855.h +++ b/intl/uconv/ucvibm/nsUnicodeToCP855.h @@ -36,7 +36,7 @@ #ifndef nsUnicodeToCP855_h___ #define nsUnicodeToCP855_h___ -#include "nsUCvIBMSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP855 [declaration] @@ -53,13 +53,6 @@ public: */ nsUnicodeToCP855(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP855_h___ */ diff --git a/intl/uconv/ucvibm/nsUnicodeToCP857.cpp b/intl/uconv/ucvibm/nsUnicodeToCP857.cpp index 6a02d317391..5227650d8e8 100644 --- a/intl/uconv/ucvibm/nsUnicodeToCP857.cpp +++ b/intl/uconv/ucvibm/nsUnicodeToCP857.cpp @@ -52,17 +52,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP857::nsUnicodeToCP857() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP857::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvibm/nsUnicodeToCP857.h b/intl/uconv/ucvibm/nsUnicodeToCP857.h index 6a0f900f639..2a711489818 100644 --- a/intl/uconv/ucvibm/nsUnicodeToCP857.h +++ b/intl/uconv/ucvibm/nsUnicodeToCP857.h @@ -36,7 +36,7 @@ #ifndef nsUnicodeToCP857_h___ #define nsUnicodeToCP857_h___ -#include "nsUCvIBMSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP857 [declaration] @@ -53,13 +53,6 @@ public: */ nsUnicodeToCP857(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP857_h___ */ diff --git a/intl/uconv/ucvibm/nsUnicodeToCP862.cpp b/intl/uconv/ucvibm/nsUnicodeToCP862.cpp index 23c59647833..c8f328b251c 100644 --- a/intl/uconv/ucvibm/nsUnicodeToCP862.cpp +++ b/intl/uconv/ucvibm/nsUnicodeToCP862.cpp @@ -52,17 +52,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP862::nsUnicodeToCP862() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP862::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvibm/nsUnicodeToCP862.h b/intl/uconv/ucvibm/nsUnicodeToCP862.h index 2c055299a86..140c0bec9e7 100644 --- a/intl/uconv/ucvibm/nsUnicodeToCP862.h +++ b/intl/uconv/ucvibm/nsUnicodeToCP862.h @@ -36,7 +36,7 @@ #ifndef nsUnicodeToCP862_h___ #define nsUnicodeToCP862_h___ -#include "nsUCvIBMSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP862 [declaration] @@ -53,13 +53,6 @@ public: */ nsUnicodeToCP862(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP862_h___ */ diff --git a/intl/uconv/ucvibm/nsUnicodeToCP864.cpp b/intl/uconv/ucvibm/nsUnicodeToCP864.cpp index 0131856e71b..4b55672273e 100644 --- a/intl/uconv/ucvibm/nsUnicodeToCP864.cpp +++ b/intl/uconv/ucvibm/nsUnicodeToCP864.cpp @@ -52,17 +52,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP864::nsUnicodeToCP864() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP864::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvibm/nsUnicodeToCP864.h b/intl/uconv/ucvibm/nsUnicodeToCP864.h index a66a3b9fa99..f441b5a0c9b 100644 --- a/intl/uconv/ucvibm/nsUnicodeToCP864.h +++ b/intl/uconv/ucvibm/nsUnicodeToCP864.h @@ -36,7 +36,7 @@ #ifndef nsUnicodeToCP864_h___ #define nsUnicodeToCP864_h___ -#include "nsUCvIBMSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP864 [declaration] @@ -53,13 +53,6 @@ public: */ nsUnicodeToCP864(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP864_h___ */ diff --git a/intl/uconv/ucvibm/nsUnicodeToCP864i.cpp b/intl/uconv/ucvibm/nsUnicodeToCP864i.cpp index 05167698c35..30bacea50ee 100644 --- a/intl/uconv/ucvibm/nsUnicodeToCP864i.cpp +++ b/intl/uconv/ucvibm/nsUnicodeToCP864i.cpp @@ -1,79 +1,41 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is Netscape Communications - * Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * IBM Corporation - * - * This Original Code has been modified by IBM Corporation. - * Modifications made by IBM described herein are - * Copyright (c) International Business Machines - * Corporation, 1999 - * - * Modifications to Mozilla code or documentation - * identified per MPL Section 3.3 - * - * Date Modified by Description of modification - * 12/09/1999 IBM Corp. Support for IBM codepages - 864i - * - */ - - #include "nsUnicodeToCP864i.h" - - //---------------------------------------------------------------------- - // Global functions and data [declaration] static const PRUint16 g_ufMappingTable[] = { #include "864i.uf" @@ -85,42 +47,12 @@ static const PRInt16 g_ufShiftTable[] = { }; //---------------------------------------------------------------------- - // Class nsUnicodeToCP864i [implementation] - - nsUnicodeToCP864i::nsUnicodeToCP864i() - : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - - (uMappingTable*) &g_ufMappingTable) - + (uMappingTable*) &g_ufMappingTable, 1) { - } - - - -//---------------------------------------------------------------------- - -// Subclassing of nsTableEncoderSupport class [implementation] - - - -NS_IMETHODIMP nsUnicodeToCP864i::GetMaxLength(const PRUnichar * aSrc, - - PRInt32 aSrcLength, - - PRInt32 * aDestLength) - -{ - - *aDestLength = aSrcLength; - - return NS_OK_UENC_EXACTLENGTH; - -} - diff --git a/intl/uconv/ucvibm/nsUnicodeToCP864i.h b/intl/uconv/ucvibm/nsUnicodeToCP864i.h index c8733371971..33f63691e39 100644 --- a/intl/uconv/ucvibm/nsUnicodeToCP864i.h +++ b/intl/uconv/ucvibm/nsUnicodeToCP864i.h @@ -1,130 +1,58 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is Netscape Communications - * Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * IBM Corporation - * - * This Original Code has been modified by IBM Corporation. - * Modifications made by IBM described herein are - * Copyright (c) International Business Machines - * Corporation, 1999 - * - * Modifications to Mozilla code or documentation - * identified per MPL Section 3.3 - * - * Date Modified by Description of modification - * 12/09/1999 IBM Corp. Support for IBM codepages - 864i - * - */ - - #ifndef nsUnicodeToCP864i_h___ - #define nsUnicodeToCP864i_h___ - - -#include "nsUCvIBMSupport.h" - - +#include "nsUCSupport.h" //---------------------------------------------------------------------- - // Class nsUnicodeToCP864i [declaration] - - /** - * A character set converter from Unicode to CP864i. - */ - class nsUnicodeToCP864i : public nsTableEncoderSupport - { - public: - - /** - * Class constructor. - */ - nsUnicodeToCP864i(); - - -protected: - - - - //-------------------------------------------------------------------- - - // Subclassing of nsEncoderSupport class [declaration] - - - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - - PRInt32 * aDestLength); - }; - - #endif /* nsUnicodeToCP864i_h___ */ - diff --git a/intl/uconv/ucvja/MANIFEST b/intl/uconv/ucvja/MANIFEST deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvja/Makefile.in b/intl/uconv/ucvja/Makefile.in index 0e849ae76c1..c117b1f4939 100644 --- a/intl/uconv/ucvja/Makefile.in +++ b/intl/uconv/ucvja/Makefile.in @@ -27,9 +27,10 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = ucvja -LIBRARY_NAME = ucvja -EXPORT_LIBRARY = 1 -IS_COMPONENT = 1 +LIBRARY_NAME = ucvja_s +#EXPORT_LIBRARY = 1 +#IS_COMPONENT = 1 +FORCE_STATIC_LIB = 1 MODULE_NAME = nsUCvJAModule REQUIRES = xpcom \ string \ @@ -41,8 +42,6 @@ CPPSRCS = \ nsUnicodeToSJIS.cpp \ nsCP932ToUnicode.cpp \ nsUnicodeToCP932.cpp \ - nsUCvJaSupport.cpp \ - nsUCvJaModule.cpp \ nsUnicodeToEUCJP.cpp \ nsUnicodeToISO2022JP.cpp \ nsUnicodeToJISx0201.cpp \ @@ -55,6 +54,11 @@ EXPORTS = \ nsUCVJA2CID.h \ $(NULL) +#SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)ucvutil_s.$(LIB_SUFFIX) + +LOCAL_INCLUDES = -I$(srcdir)/../util + + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvja/nsJapaneseToUnicode.cpp b/intl/uconv/ucvja/nsJapaneseToUnicode.cpp index 807527795f7..8806f50698d 100644 --- a/intl/uconv/ucvja/nsJapaneseToUnicode.cpp +++ b/intl/uconv/ucvja/nsJapaneseToUnicode.cpp @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsJapaneseToUnicode.h" -#include "nsUCvJaSupport.h" +#include "nsUCSupport.h" static const PRUint16 gJis0208map[] = { #include "jis0208.ump" diff --git a/intl/uconv/ucvja/nsJapaneseToUnicode.h b/intl/uconv/ucvja/nsJapaneseToUnicode.h index 8eb01e8f34b..51c0cfbcbd3 100644 --- a/intl/uconv/ucvja/nsJapaneseToUnicode.h +++ b/intl/uconv/ucvja/nsJapaneseToUnicode.h @@ -38,7 +38,7 @@ #ifndef nsShiftJISToUnicode_h__ #define nsShiftJISToUnicode_h__ #include "nsISupports.h" -#include "nsUCvJaSupport.h" +#include "nsUCSupport.h" class nsShiftJISToUnicode : public nsBasicDecoderSupport diff --git a/intl/uconv/ucvja/nsUCvJaSupport.cpp b/intl/uconv/ucvja/nsUCvJaSupport.cpp deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvja/nsUCvJaSupport.h b/intl/uconv/ucvja/nsUCvJaSupport.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvja/nsUnicodeToEUCJP.cpp b/intl/uconv/ucvja/nsUnicodeToEUCJP.cpp index e5de5416e44..c66eda58ab2 100644 --- a/intl/uconv/ucvja/nsUnicodeToEUCJP.cpp +++ b/intl/uconv/ucvja/nsUnicodeToEUCJP.cpp @@ -79,28 +79,9 @@ static const PRUint16 *gMappingTables[SIZE_OF_TABLES] = { nsUnicodeToEUCJP::nsUnicodeToEUCJP() : nsMultiTableEncoderSupport(SIZE_OF_TABLES, - (uShiftTable**) gShiftTables, - (uMappingTable**) gMappingTables) + (uShiftTable**) gShiftTables, + (uMappingTable**) gMappingTables, + 3 /* max length = src * 3 */) { } -nsresult nsUnicodeToEUCJP::CreateInstance(nsISupports ** aResult) -{ - nsIUnicodeEncoder *p = new nsUnicodeToEUCJP(); - if(p) { - *aResult = p; - return NS_OK; - } - return NS_ERROR_OUT_OF_MEMORY; -} - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToEUCJP::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 3*aSrcLength; - return NS_OK; -} diff --git a/intl/uconv/ucvja/nsUnicodeToEUCJP.h b/intl/uconv/ucvja/nsUnicodeToEUCJP.h index 1ee3ef1ba95..f940d5aa69b 100644 --- a/intl/uconv/ucvja/nsUnicodeToEUCJP.h +++ b/intl/uconv/ucvja/nsUnicodeToEUCJP.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToEUCJP_h___ #define nsUnicodeToEUCJP_h___ -#include "nsUCvJaSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToEUCJP [declaration] @@ -59,18 +59,8 @@ public: */ nsUnicodeToEUCJP(); - /** - * Static class constructor. - */ - static nsresult CreateInstance(nsISupports **aResult); - protected: - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToEUCJP_h___ */ diff --git a/intl/uconv/ucvja/nsUnicodeToISO2022JP.cpp b/intl/uconv/ucvja/nsUnicodeToISO2022JP.cpp index e766b29ab5e..217c65c9926 100644 --- a/intl/uconv/ucvja/nsUnicodeToISO2022JP.cpp +++ b/intl/uconv/ucvja/nsUnicodeToISO2022JP.cpp @@ -87,8 +87,11 @@ static const PRInt16 * g_ufShiftTables[SIZE_OF_TABLES] = { //---------------------------------------------------------------------- // Class nsUnicodeToISO2022JP [implementation] +// worst case max length: +// 1 2 3 4 5 6 7 8 +// ESC $ B XX XX ESC ( B nsUnicodeToISO2022JP::nsUnicodeToISO2022JP() -: nsEncoderSupport() +: nsEncoderSupport(8) { mHelper = NULL; Reset(); @@ -99,16 +102,6 @@ nsUnicodeToISO2022JP::~nsUnicodeToISO2022JP() NS_IF_RELEASE(mHelper); } -nsresult nsUnicodeToISO2022JP::CreateInstance(nsISupports ** aResult) -{ - nsIUnicodeEncoder *p = new nsUnicodeToISO2022JP(); - if(p) { - *aResult = p; - return NS_OK; - } - return NS_ERROR_OUT_OF_MEMORY; -} - nsresult nsUnicodeToISO2022JP::ChangeCharset(PRInt32 aCharset, char * aDest, PRInt32 * aDestLength) @@ -249,17 +242,6 @@ NS_IMETHODIMP nsUnicodeToISO2022JP::FinishNoBuff(char * aDest, return NS_OK; } -NS_IMETHODIMP nsUnicodeToISO2022JP::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - // worst case - // 1 2 3 4 5 6 7 8 - // ESC $ B XX XX ESC ( B - *aDestLength = 8*aSrcLength; - return NS_OK; -} - NS_IMETHODIMP nsUnicodeToISO2022JP::Reset() { mCharset = 0; diff --git a/intl/uconv/ucvja/nsUnicodeToISO2022JP.h b/intl/uconv/ucvja/nsUnicodeToISO2022JP.h index fb9454a8c4d..f0e6bf22fa3 100644 --- a/intl/uconv/ucvja/nsUnicodeToISO2022JP.h +++ b/intl/uconv/ucvja/nsUnicodeToISO2022JP.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO2022JP_h___ #define nsUnicodeToISO2022JP_h___ -#include "nsUCvJaSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO2022JP [declaration] @@ -64,11 +64,6 @@ public: */ virtual ~nsUnicodeToISO2022JP(); - /** - * Static class constructor. - */ - static nsresult CreateInstance(nsISupports **aResult); - protected: PRInt32 mCharset; // current character set @@ -83,8 +78,6 @@ protected: NS_IMETHOD ConvertNoBuffNoErr(const PRUnichar * aSrc, PRInt32 * aSrcLength, char * aDest, PRInt32 * aDestLength); NS_IMETHOD FinishNoBuff(char * aDest, PRInt32 * aDestLength); - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); NS_IMETHOD Reset(); NS_IMETHOD FillInfo(PRUint32 *aInfo); }; diff --git a/intl/uconv/ucvja/nsUnicodeToJISx0201.cpp b/intl/uconv/ucvja/nsUnicodeToJISx0201.cpp index 339b1cfb9fb..d4d78eb7f53 100644 --- a/intl/uconv/ucvja/nsUnicodeToJISx0201.cpp +++ b/intl/uconv/ucvja/nsUnicodeToJISx0201.cpp @@ -50,27 +50,7 @@ static PRInt16 g0201ShiftTable[] = { nsUnicodeToJISx0201::nsUnicodeToJISx0201() : nsTableEncoderSupport((uShiftTable*) g0201ShiftTable, - (uMappingTable*) g_uf0201Mapping) + (uMappingTable*) g_uf0201Mapping, 1) { } -nsresult nsUnicodeToJISx0201::CreateInstance(nsISupports ** aResult) -{ - nsIUnicodeEncoder *p = new nsUnicodeToJISx0201(); - if(p) { - *aResult = p; - return NS_OK; - } - return NS_ERROR_OUT_OF_MEMORY; -} - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToJISx0201::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvja/nsUnicodeToJISx0201.h b/intl/uconv/ucvja/nsUnicodeToJISx0201.h index 1c6f24824fa..2f84900a329 100644 --- a/intl/uconv/ucvja/nsUnicodeToJISx0201.h +++ b/intl/uconv/ucvja/nsUnicodeToJISx0201.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToJISx0201_h___ #define nsUnicodeToJISx0201_h___ -#include "nsUCvJaSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToJISx0201 [declaration] @@ -59,18 +59,8 @@ public: */ nsUnicodeToJISx0201(); - /** - * Static class constructor. - */ - static nsresult CreateInstance(nsISupports **aResult); - protected: - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToJISx0201_h___ */ diff --git a/intl/uconv/ucvja/nsUnicodeToJISx0208.cpp b/intl/uconv/ucvja/nsUnicodeToJISx0208.cpp index 6311d57b5ee..9b940bd38ff 100644 --- a/intl/uconv/ucvja/nsUnicodeToJISx0208.cpp +++ b/intl/uconv/ucvja/nsUnicodeToJISx0208.cpp @@ -51,27 +51,8 @@ static PRInt16 g0208ShiftTable[] = { nsUnicodeToJISx0208::nsUnicodeToJISx0208() : nsTableEncoderSupport( (uShiftTable*) g0208ShiftTable, - (uMappingTable*) g_uf0208Mapping) + (uMappingTable*) g_uf0208Mapping, + 2 /* max length = src * 2 */) { } -nsresult nsUnicodeToJISx0208::CreateInstance(nsISupports ** aResult) -{ - nsIUnicodeEncoder *p = new nsUnicodeToJISx0208(); - if(p) { - *aResult = p; - return NS_OK; - } - return NS_ERROR_OUT_OF_MEMORY; -} - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToJISx0208::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2*aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvja/nsUnicodeToJISx0208.h b/intl/uconv/ucvja/nsUnicodeToJISx0208.h index fc73158ac39..6ddedcd215d 100644 --- a/intl/uconv/ucvja/nsUnicodeToJISx0208.h +++ b/intl/uconv/ucvja/nsUnicodeToJISx0208.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToJISx0208_h___ #define nsUnicodeToJISx0208_h___ -#include "nsUCvJaSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToJISx0208 [declaration] @@ -59,18 +59,8 @@ public: */ nsUnicodeToJISx0208(); - /** - * Static class constructor. - */ - static nsresult CreateInstance(nsISupports **aResult); - protected: - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToJISx0208_h___ */ diff --git a/intl/uconv/ucvja/nsUnicodeToJISx0212.cpp b/intl/uconv/ucvja/nsUnicodeToJISx0212.cpp index 2421e3e9363..7cda2323c2f 100644 --- a/intl/uconv/ucvja/nsUnicodeToJISx0212.cpp +++ b/intl/uconv/ucvja/nsUnicodeToJISx0212.cpp @@ -51,27 +51,8 @@ static PRInt16 g0212ShiftTable[] = { nsUnicodeToJISx0212::nsUnicodeToJISx0212() : nsTableEncoderSupport((uShiftTable*) g0212ShiftTable, - (uMappingTable*) g_uf0212Mapping) + (uMappingTable*) g_uf0212Mapping, + 2 /* max len = src * 2 */) { } -nsresult nsUnicodeToJISx0212::CreateInstance(nsISupports ** aResult) -{ - nsIUnicodeEncoder *p = new nsUnicodeToJISx0212(); - if(p) { - *aResult = p; - return NS_OK; - } - return NS_ERROR_OUT_OF_MEMORY; -} - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToJISx0212::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2*aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvja/nsUnicodeToJISx0212.h b/intl/uconv/ucvja/nsUnicodeToJISx0212.h index 16cab09bcc3..bb90cfb4795 100644 --- a/intl/uconv/ucvja/nsUnicodeToJISx0212.h +++ b/intl/uconv/ucvja/nsUnicodeToJISx0212.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToJISx0212_h___ #define nsUnicodeToJISx0212_h___ -#include "nsUCvJaSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToJISx0212 [declaration] @@ -59,18 +59,8 @@ public: */ nsUnicodeToJISx0212(); - /** - * Static class constructor. - */ - static nsresult CreateInstance(nsISupports **aResult); - protected: - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToJISx0212_h___ */ diff --git a/intl/uconv/ucvja/nsUnicodeToSJIS.cpp b/intl/uconv/ucvja/nsUnicodeToSJIS.cpp index 99d827dbcf9..3a5d5361c70 100644 --- a/intl/uconv/ucvja/nsUnicodeToSJIS.cpp +++ b/intl/uconv/ucvja/nsUnicodeToSJIS.cpp @@ -58,27 +58,8 @@ static const PRInt16 g_SJISShiftTable[] = { nsUnicodeToSJIS::nsUnicodeToSJIS() : nsTableEncoderSupport((uShiftTable*) &g_SJISShiftTable, - (uMappingTable*) &g_SJISMappingTable) + (uMappingTable*) &g_SJISMappingTable, + 2 /* max length = src * 2 */) { } -nsresult nsUnicodeToSJIS::CreateInstance(nsISupports ** aResult) -{ - nsIUnicodeEncoder *p = new nsUnicodeToSJIS(); - if(p) { - *aResult = p; - return NS_OK; - } - return NS_ERROR_OUT_OF_MEMORY; -} - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToSJIS::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2*aSrcLength; - return NS_OK; -} diff --git a/intl/uconv/ucvja/nsUnicodeToSJIS.h b/intl/uconv/ucvja/nsUnicodeToSJIS.h index fd427fda7ef..f580977ad75 100644 --- a/intl/uconv/ucvja/nsUnicodeToSJIS.h +++ b/intl/uconv/ucvja/nsUnicodeToSJIS.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToSJIS_h___ #define nsUnicodeToSJIS_h___ -#include "nsUCvJaSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToSJIS [declaration] @@ -59,18 +59,8 @@ public: */ nsUnicodeToSJIS(); - /** - * Static class constructor. - */ - static nsresult CreateInstance(nsISupports **aResult); - protected: - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToSJIS_h___ */ diff --git a/intl/uconv/ucvko/MANIFEST b/intl/uconv/ucvko/MANIFEST deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvko/Makefile.in b/intl/uconv/ucvko/Makefile.in index 21843c352d4..75449f427bf 100644 --- a/intl/uconv/ucvko/Makefile.in +++ b/intl/uconv/ucvko/Makefile.in @@ -27,9 +27,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = ucvko -LIBRARY_NAME = ucvko -EXPORT_LIBRARY = 1 -IS_COMPONENT = 1 +LIBRARY_NAME = ucvko_s +FORCE_STATIC_LIB=1 MODULE_NAME = nsUCvKoModule REQUIRES = xpcom \ string \ @@ -48,16 +47,15 @@ CPPSRCS = \ nsUnicodeToJohab.cpp \ nsJohabToUnicode.cpp \ nsUnicodeToJohabNoAscii.cpp \ - nsUCvKOSupport.cpp \ - nsUCvKoModule.cpp \ $(NULL) EXPORTS = nsUCvKOCID.h -EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) +LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk +DEFINES += -D_IMPL_NS_INTL ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/intl/uconv/ucvko/nsCP949ToUnicode.cpp b/intl/uconv/ucvko/nsCP949ToUnicode.cpp index 55bfdb86204..f2be95ee543 100644 --- a/intl/uconv/ucvko/nsCP949ToUnicode.cpp +++ b/intl/uconv/ucvko/nsCP949ToUnicode.cpp @@ -95,7 +95,7 @@ static const PRUint16 *g_CP949ShiftTableSet [] = { }; static const PRUint16 *g_CP949MappingTableSet [] ={ - g_AsciiMapping, + g_ucvko_AsciiMapping, g_HangulNullMapping, g_utKSC5601Mapping, g_utCP949NoKSCHangulMapping, @@ -112,19 +112,7 @@ nsCP949ToUnicode::nsCP949ToUnicode() : nsMultiTableDecoderSupport(sizeof(g_CP949Ranges) / sizeof(g_CP949Ranges[0]), (uRange*) &g_CP949Ranges, (uShiftTable**) &g_CP949ShiftTableSet, - (uMappingTable**) &g_CP949MappingTableSet) + (uMappingTable**) &g_CP949MappingTableSet, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTablesDecoderSupport class [implementation] - -NS_IMETHODIMP nsCP949ToUnicode::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - // we are a single byte to Unicode converter, so... - *aDestLength = aSrcLength; - return NS_OK_UDEC_EXACTLENGTH; -} - diff --git a/intl/uconv/ucvko/nsCP949ToUnicode.h b/intl/uconv/ucvko/nsCP949ToUnicode.h index 11eff3150ad..fa6a6dc228c 100644 --- a/intl/uconv/ucvko/nsCP949ToUnicode.h +++ b/intl/uconv/ucvko/nsCP949ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsCP949ToUnicode_h___ #define nsCP949ToUnicode_h___ -#include "nsUCvKOSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP949ToUnicode [declaration] @@ -60,12 +60,6 @@ public: nsCP949ToUnicode(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsDecoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsCP949ToUnicode_h___ */ diff --git a/intl/uconv/ucvko/nsEUCKRToUnicode.h b/intl/uconv/ucvko/nsEUCKRToUnicode.h index 5fb27091c22..531881b1d55 100644 --- a/intl/uconv/ucvko/nsEUCKRToUnicode.h +++ b/intl/uconv/ucvko/nsEUCKRToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsEUCKRToUnicode_h___ #define nsEUCKRToUnicode_h___ -#include "nsUCvKOSupport.h" +#include "nsUCSupport.h" #include "nsCP949ToUnicode.h" //---------------------------------------------------------------------- diff --git a/intl/uconv/ucvko/nsISO2022KRToUnicode.cpp b/intl/uconv/ucvko/nsISO2022KRToUnicode.cpp index 964431b373b..5c7d827c7c2 100644 --- a/intl/uconv/ucvko/nsISO2022KRToUnicode.cpp +++ b/intl/uconv/ucvko/nsISO2022KRToUnicode.cpp @@ -36,7 +36,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsISO2022KRToUnicode.h" -#include "nsUCvKOSupport.h" +#include "nsUCSupport.h" #include "nsICharsetConverterManager.h" #include "nsIServiceManager.h" diff --git a/intl/uconv/ucvko/nsISO2022KRToUnicode.h b/intl/uconv/ucvko/nsISO2022KRToUnicode.h index 0568aa0d9ca..82bc0294857 100644 --- a/intl/uconv/ucvko/nsISO2022KRToUnicode.h +++ b/intl/uconv/ucvko/nsISO2022KRToUnicode.h @@ -38,7 +38,7 @@ #ifndef nsISO2022KRToUnicode_h__ #define nsISO2022KRToUnicode_h__ #include "nsISupports.h" -#include "nsUCvKOSupport.h" +#include "nsUCSupport.h" diff --git a/intl/uconv/ucvko/nsJohabToUnicode.cpp b/intl/uconv/ucvko/nsJohabToUnicode.cpp index 449097ff574..31e998aa881 100644 --- a/intl/uconv/ucvko/nsJohabToUnicode.cpp +++ b/intl/uconv/ucvko/nsJohabToUnicode.cpp @@ -82,7 +82,7 @@ static const PRUint16 *g_JOHABShiftTableSet [] = { }; static const PRUint16 *g_JOHABMappingTableSet [] ={ - g_AsciiMapping, + g_ucvko_AsciiMapping, g_HangulNullMapping, g_utJohabJamoMapping, g_utKSC5601Mapping, @@ -97,18 +97,7 @@ nsJohabToUnicode::nsJohabToUnicode() : nsMultiTableDecoderSupport(sizeof(g_JOHABRanges) / sizeof(g_JOHABRanges[0]), (uRange*) &g_JOHABRanges, (uShiftTable**) &g_JOHABShiftTableSet, - (uMappingTable**) &g_JOHABMappingTableSet) + (uMappingTable**) &g_JOHABMappingTableSet, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTablesDecoderSupport class [implementation] - -NS_IMETHODIMP nsJohabToUnicode::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - // we are a single byte to Unicode converter, so... - *aDestLength = aSrcLength; - return NS_OK_UDEC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvko/nsJohabToUnicode.h b/intl/uconv/ucvko/nsJohabToUnicode.h index 46c81310cf9..c820efa0fa4 100644 --- a/intl/uconv/ucvko/nsJohabToUnicode.h +++ b/intl/uconv/ucvko/nsJohabToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsJohabToUnicode_h___ #define nsJohabToUnicode_h___ -#include "nsUCvKOSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsJohabToUnicode [declaration] @@ -60,12 +60,6 @@ public: nsJohabToUnicode(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsDecoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsJohabToUnicode_h___ */ diff --git a/intl/uconv/ucvko/nsUCvKODll.h b/intl/uconv/ucvko/nsUCvKODll.h index c0cace436a8..c5222a4bee2 100644 --- a/intl/uconv/ucvko/nsUCvKODll.h +++ b/intl/uconv/ucvko/nsUCvKODll.h @@ -43,8 +43,7 @@ extern "C" PRUint16 g_utKSC5601Mapping[]; extern "C" PRUint16 g_ufKSC5601Mapping[]; -#define g_AsciiMapping ucvko_g_AsciiMapping -extern "C" PRUint16 g_AsciiMapping[]; +extern "C" PRUint16 g_ucvko_AsciiMapping[]; extern "C" PRUint16 g_HangulNullMapping[]; extern "C" PRUint16 g_ufJohabJamoMapping[]; diff --git a/intl/uconv/ucvko/nsUCvKOSupport.cpp b/intl/uconv/ucvko/nsUCvKOSupport.cpp deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvko/nsUCvKOSupport.h b/intl/uconv/ucvko/nsUCvKOSupport.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvko/nsUnicodeToCP949.cpp b/intl/uconv/ucvko/nsUnicodeToCP949.cpp index d3d5129b579..1c65cadd4fd 100644 --- a/intl/uconv/ucvko/nsUnicodeToCP949.cpp +++ b/intl/uconv/ucvko/nsUnicodeToCP949.cpp @@ -66,7 +66,7 @@ static const PRUint16 g_ufCP949NoKSCHangulMapping[] = { static const PRUint16 *g_CP949MappingTable[3] = { - g_AsciiMapping, + g_ucvko_AsciiMapping, g_ufKSC5601Mapping, g_ufCP949NoKSCHangulMapping }; @@ -83,17 +83,8 @@ static const PRUint16 *g_CP949ShiftTable[3] = { nsUnicodeToCP949::nsUnicodeToCP949() : nsMultiTableEncoderSupport(3, (uShiftTable**) g_CP949ShiftTable, - (uMappingTable**) g_CP949MappingTable) + (uMappingTable**) g_CP949MappingTable, + 2 /* max len = src * 2 */) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP949::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength * 2; - return NS_OK; -} diff --git a/intl/uconv/ucvko/nsUnicodeToCP949.h b/intl/uconv/ucvko/nsUnicodeToCP949.h index 43658568427..bd442163e7e 100644 --- a/intl/uconv/ucvko/nsUnicodeToCP949.h +++ b/intl/uconv/ucvko/nsUnicodeToCP949.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCP949_h___ #define nsUnicodeToCP949_h___ -#include "nsUCvKOSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP949 [declaration] @@ -60,12 +60,6 @@ public: nsUnicodeToCP949(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP949_h___ */ diff --git a/intl/uconv/ucvko/nsUnicodeToEUCKR.cpp b/intl/uconv/ucvko/nsUnicodeToEUCKR.cpp index 128b7875f15..fb03473d867 100644 --- a/intl/uconv/ucvko/nsUnicodeToEUCKR.cpp +++ b/intl/uconv/ucvko/nsUnicodeToEUCKR.cpp @@ -58,7 +58,7 @@ static const PRUint16 gDecomposedHangulShiftTable[] = { }; static const PRUint16 *g_EUCKRMappingTable[3] = { - g_AsciiMapping, + g_ucvko_AsciiMapping, g_ufKSC5601Mapping, g_HangulNullMapping }; @@ -75,17 +75,9 @@ static const PRUint16 *g_EUCKRShiftTable[3] = { nsUnicodeToEUCKR::nsUnicodeToEUCKR() : nsMultiTableEncoderSupport(3, (uShiftTable**) g_EUCKRShiftTable, - (uMappingTable**) g_EUCKRMappingTable) + (uMappingTable**) g_EUCKRMappingTable, + // change from 2 to 8 because of composed jamo + 8 /* max length = src * 8 */) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToEUCKR::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength * 8; // change from 2 to 8 because of composed jamo - return NS_OK; -} diff --git a/intl/uconv/ucvko/nsUnicodeToEUCKR.h b/intl/uconv/ucvko/nsUnicodeToEUCKR.h index b0a069856a7..c143fad70c1 100644 --- a/intl/uconv/ucvko/nsUnicodeToEUCKR.h +++ b/intl/uconv/ucvko/nsUnicodeToEUCKR.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToEUCKR_h___ #define nsUnicodeToEUCKR_h___ -#include "nsUCvKOSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToEUCKR [declaration] @@ -60,12 +60,6 @@ public: nsUnicodeToEUCKR(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToEUCKR_h___ */ diff --git a/intl/uconv/ucvko/nsUnicodeToJohab.cpp b/intl/uconv/ucvko/nsUnicodeToJohab.cpp index 8cd4d3deb5a..7300713f865 100644 --- a/intl/uconv/ucvko/nsUnicodeToJohab.cpp +++ b/intl/uconv/ucvko/nsUnicodeToJohab.cpp @@ -62,7 +62,7 @@ static const PRUint16 gJohabHangulCompatJamoShiftTable[] = { }; static const PRUint16 *g_JohabMappingTable[4] = { - g_AsciiMapping, + g_ucvko_AsciiMapping, g_HangulNullMapping, g_ufJohabJamoMapping, g_ufKSC5601Mapping @@ -81,13 +81,7 @@ static const PRUint16 *g_JohabShiftTable[4] = { nsUnicodeToJohab::nsUnicodeToJohab() : nsMultiTableEncoderSupport(sizeof(g_JohabShiftTable) / sizeof(g_JohabShiftTable[0]), (uShiftTable**) g_JohabShiftTable, - (uMappingTable**) g_JohabMappingTable) + (uMappingTable**) g_JohabMappingTable, + 2 /* max length = src * 2*/) { } -NS_IMETHODIMP nsUnicodeToJohab::GetMaxLength(const PRUnichar* aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK; -} diff --git a/intl/uconv/ucvko/nsUnicodeToJohab.h b/intl/uconv/ucvko/nsUnicodeToJohab.h index 6dc0f8ece86..e89c75faeed 100644 --- a/intl/uconv/ucvko/nsUnicodeToJohab.h +++ b/intl/uconv/ucvko/nsUnicodeToJohab.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToJohab_h___ #define nsUnicodeToJohab_h___ -#include "nsUCvKOSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToJohab [declaration] @@ -57,8 +57,6 @@ public: */ nsUnicodeToJohab(); - NS_IMETHOD GetMaxLength( const PRUnichar* aSrc, PRInt32 aSrcLength, - PRInt32* aDestLength); }; #endif /* nsUnicodeToJohab_h___ */ diff --git a/intl/uconv/ucvko/nsUnicodeToJohabNoAscii.cpp b/intl/uconv/ucvko/nsUnicodeToJohabNoAscii.cpp index 454eb8e57af..96192986ccf 100644 --- a/intl/uconv/ucvko/nsUnicodeToJohabNoAscii.cpp +++ b/intl/uconv/ucvko/nsUnicodeToJohabNoAscii.cpp @@ -76,13 +76,7 @@ static const PRUint16 *g_JohabShiftTable[3] = { nsUnicodeToJohabNoAscii::nsUnicodeToJohabNoAscii() : nsMultiTableEncoderSupport(sizeof(g_JohabShiftTable) / sizeof(g_JohabShiftTable[0]), (uShiftTable**) g_JohabShiftTable, - (uMappingTable**) g_JohabMappingTable) + (uMappingTable**) g_JohabMappingTable, + 2 /* max length = src * 2 */) { } -NS_IMETHODIMP nsUnicodeToJohabNoAscii::GetMaxLength(const PRUnichar* aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK; -} diff --git a/intl/uconv/ucvko/nsUnicodeToJohabNoAscii.h b/intl/uconv/ucvko/nsUnicodeToJohabNoAscii.h index ff853cd39cc..ec59bc5f5df 100644 --- a/intl/uconv/ucvko/nsUnicodeToJohabNoAscii.h +++ b/intl/uconv/ucvko/nsUnicodeToJohabNoAscii.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToJohabNoAscii_h___ #define nsUnicodeToJohabNoAscii_h___ -#include "nsUCvKOSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToJohabNoAscii [declaration] @@ -57,8 +57,6 @@ public: */ nsUnicodeToJohabNoAscii(); - NS_IMETHOD GetMaxLength( const PRUnichar* aSrc, PRInt32 aSrcLength, - PRInt32* aDestLength); }; #endif /* nsUnicodeToJohabNoAscii_h___ */ diff --git a/intl/uconv/ucvko/nsUnicodeToKSC5601.cpp b/intl/uconv/ucvko/nsUnicodeToKSC5601.cpp index 7c4bb3a1f37..81d4bdb4773 100644 --- a/intl/uconv/ucvko/nsUnicodeToKSC5601.cpp +++ b/intl/uconv/ucvko/nsUnicodeToKSC5601.cpp @@ -67,17 +67,8 @@ static const PRUint16 *g_ShiftTable[3] = { nsUnicodeToKSC5601::nsUnicodeToKSC5601() : nsMultiTableEncoderSupport(2, (uShiftTable**) g_ShiftTable, - (uMappingTable**) g_MappingTable) + (uMappingTable**) g_MappingTable, + 8 /* max length = src * 8 */) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToKSC5601::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength * 8; - return NS_OK; -} diff --git a/intl/uconv/ucvko/nsUnicodeToKSC5601.h b/intl/uconv/ucvko/nsUnicodeToKSC5601.h index 3f5e8342592..4b5a25f4ae7 100644 --- a/intl/uconv/ucvko/nsUnicodeToKSC5601.h +++ b/intl/uconv/ucvko/nsUnicodeToKSC5601.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToKSC5601_h___ #define nsUnicodeToKSC5601_h___ -#include "nsUCvKOSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToKSC5601 [declaration] @@ -61,11 +61,6 @@ public: protected: - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToKSC5601_h___ */ diff --git a/intl/uconv/ucvko/nsUnicodeToX11Johab.h b/intl/uconv/ucvko/nsUnicodeToX11Johab.h index 7de62b58e50..50979e9d236 100644 --- a/intl/uconv/ucvko/nsUnicodeToX11Johab.h +++ b/intl/uconv/ucvko/nsUnicodeToX11Johab.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToX11Johab_h___ #define nsUnicodeToX11Johab_h___ -#include "nsUCvKOSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToX11Johab [declaration] diff --git a/intl/uconv/ucvlatin/MANIFEST b/intl/uconv/ucvlatin/MANIFEST deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvlatin/Makefile.in b/intl/uconv/ucvlatin/Makefile.in index fbfa8b81d69..68f305b94af 100644 --- a/intl/uconv/ucvlatin/Makefile.in +++ b/intl/uconv/ucvlatin/Makefile.in @@ -27,9 +27,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = ucvlatin -LIBRARY_NAME = ucvlatin -EXPORT_LIBRARY = 1 -IS_COMPONENT = 1 +LIBRARY_NAME = ucvlatin_s +FORCE_STATIC_LIB = 1 MODULE_NAME = nsUCvLatinModule REQUIRES = xpcom \ string \ @@ -161,16 +160,15 @@ CPPSRCS = \ nsUnicodeToUserDefined.cpp \ nsUnicodeToSymbol.cpp \ nsUnicodeToZapfDingbat.cpp \ - nsUCvLatinSupport.cpp \ - nsUCvLatinModule.cpp \ $(NULL) EXPORTS = nsUCvLatinCID.h -EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) +LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk +DEFINES += -D_IMPL_NS_INTL ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/intl/uconv/ucvlatin/nsARMSCII8ToUnicode.h b/intl/uconv/ucvlatin/nsARMSCII8ToUnicode.h index 1e6820ae7c7..f4e3248ab26 100644 --- a/intl/uconv/ucvlatin/nsARMSCII8ToUnicode.h +++ b/intl/uconv/ucvlatin/nsARMSCII8ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsARMSCII8ToUnicode_h___ #define nsARMSCII8ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsARMSCII8ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsAsciiToUnicode.h b/intl/uconv/ucvlatin/nsAsciiToUnicode.h index 7b09be4e661..a8b4b39ad6f 100644 --- a/intl/uconv/ucvlatin/nsAsciiToUnicode.h +++ b/intl/uconv/ucvlatin/nsAsciiToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsAsciiToUnicode_h___ #define nsAsciiToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsAsciiToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsCP1250ToUnicode.h b/intl/uconv/ucvlatin/nsCP1250ToUnicode.h index 083d75fa484..f2ed1b98b89 100644 --- a/intl/uconv/ucvlatin/nsCP1250ToUnicode.h +++ b/intl/uconv/ucvlatin/nsCP1250ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsCP1250ToUnicode_h___ #define nsCP1250ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP1250ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsCP1251ToUnicode.h b/intl/uconv/ucvlatin/nsCP1251ToUnicode.h index 3db253d6854..db064c36420 100644 --- a/intl/uconv/ucvlatin/nsCP1251ToUnicode.h +++ b/intl/uconv/ucvlatin/nsCP1251ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsCP1251ToUnicode_h___ #define nsCP1251ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP1251ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsCP1253ToUnicode.h b/intl/uconv/ucvlatin/nsCP1253ToUnicode.h index 061c60c448c..ec443db70da 100644 --- a/intl/uconv/ucvlatin/nsCP1253ToUnicode.h +++ b/intl/uconv/ucvlatin/nsCP1253ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsCP1253ToUnicode_h___ #define nsCP1253ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP1253ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsCP1254ToUnicode.h b/intl/uconv/ucvlatin/nsCP1254ToUnicode.h index 35ee691518b..4b712a7bcc3 100644 --- a/intl/uconv/ucvlatin/nsCP1254ToUnicode.h +++ b/intl/uconv/ucvlatin/nsCP1254ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsCP1254ToUnicode_h___ #define nsCP1254ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP1254ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsCP1255ToUnicode.h b/intl/uconv/ucvlatin/nsCP1255ToUnicode.h index ddafeb810c4..473cbef5c0d 100644 --- a/intl/uconv/ucvlatin/nsCP1255ToUnicode.h +++ b/intl/uconv/ucvlatin/nsCP1255ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsCP1255ToUnicode_h___ #define nsCP1255ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP1255ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsCP1256ToUnicode.h b/intl/uconv/ucvlatin/nsCP1256ToUnicode.h index 45aeb4d07f0..8de0537ebeb 100644 --- a/intl/uconv/ucvlatin/nsCP1256ToUnicode.h +++ b/intl/uconv/ucvlatin/nsCP1256ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsCP1256ToUnicode_h___ #define nsCP1256ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP1256ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsCP1257ToUnicode.h b/intl/uconv/ucvlatin/nsCP1257ToUnicode.h index 649bdef2759..cc49e438937 100644 --- a/intl/uconv/ucvlatin/nsCP1257ToUnicode.h +++ b/intl/uconv/ucvlatin/nsCP1257ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsCP1257ToUnicode_h___ #define nsCP1257ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP1257ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsCP1258ToUnicode.h b/intl/uconv/ucvlatin/nsCP1258ToUnicode.h index 677d883f431..cbc50dd0746 100644 --- a/intl/uconv/ucvlatin/nsCP1258ToUnicode.h +++ b/intl/uconv/ucvlatin/nsCP1258ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsCP1258ToUnicode_h___ #define nsCP1258ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP1258ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsCP866ToUnicode.h b/intl/uconv/ucvlatin/nsCP866ToUnicode.h index 4f58e792658..bafd4dacdbe 100644 --- a/intl/uconv/ucvlatin/nsCP866ToUnicode.h +++ b/intl/uconv/ucvlatin/nsCP866ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsCP866ToUnicode_h___ #define nsCP866ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP866ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsCP874ToUnicode.h b/intl/uconv/ucvlatin/nsCP874ToUnicode.h index 2119a88a2fd..c65583d87aa 100644 --- a/intl/uconv/ucvlatin/nsCP874ToUnicode.h +++ b/intl/uconv/ucvlatin/nsCP874ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsCP874ToUnicode_h___ #define nsCP874ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsCP874ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsGEOSTD8ToUnicode.h b/intl/uconv/ucvlatin/nsGEOSTD8ToUnicode.h index 2be53a352fc..ff5e4ae39a7 100644 --- a/intl/uconv/ucvlatin/nsGEOSTD8ToUnicode.h +++ b/intl/uconv/ucvlatin/nsGEOSTD8ToUnicode.h @@ -23,7 +23,7 @@ #ifndef nsGEOSTD8ToUnicode_h___ #define nsGEOSTD8ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsGEOSTD8ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO885910ToUnicode.h b/intl/uconv/ucvlatin/nsISO885910ToUnicode.h index b02daf32ffc..cf7ca4d7b94 100644 --- a/intl/uconv/ucvlatin/nsISO885910ToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO885910ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO885910ToUnicode_h___ #define nsISO885910ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO885910ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO885913ToUnicode.h b/intl/uconv/ucvlatin/nsISO885913ToUnicode.h index 1cc6379ae54..758d46c98b0 100644 --- a/intl/uconv/ucvlatin/nsISO885913ToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO885913ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO885913ToUnicode_h___ #define nsISO885913ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO885913ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO885914ToUnicode.h b/intl/uconv/ucvlatin/nsISO885914ToUnicode.h index a39794b0a9e..80485ccb235 100644 --- a/intl/uconv/ucvlatin/nsISO885914ToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO885914ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO885914ToUnicode_h___ #define nsISO885914ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO885914ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO885915ToUnicode.h b/intl/uconv/ucvlatin/nsISO885915ToUnicode.h index ddaf1c03c30..3524d6e6e01 100644 --- a/intl/uconv/ucvlatin/nsISO885915ToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO885915ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO885915ToUnicode_h___ #define nsISO885915ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO885915ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO885916ToUnicode.h b/intl/uconv/ucvlatin/nsISO885916ToUnicode.h index 9a6c448f599..fb90e242186 100644 --- a/intl/uconv/ucvlatin/nsISO885916ToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO885916ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO885916ToUnicode_h___ #define nsISO885916ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO885916ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO88592ToUnicode.h b/intl/uconv/ucvlatin/nsISO88592ToUnicode.h index b5b0384e5b0..9e599af0cae 100644 --- a/intl/uconv/ucvlatin/nsISO88592ToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO88592ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO88592ToUnicode_h___ #define nsISO88592ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO88592ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO88593ToUnicode.h b/intl/uconv/ucvlatin/nsISO88593ToUnicode.h index f898cb93ab7..3777f1b2ff6 100644 --- a/intl/uconv/ucvlatin/nsISO88593ToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO88593ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO88593ToUnicode_h___ #define nsISO88593ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO88593ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO88594ToUnicode.h b/intl/uconv/ucvlatin/nsISO88594ToUnicode.h index a07146e4f7c..9ff1b3c7014 100644 --- a/intl/uconv/ucvlatin/nsISO88594ToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO88594ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO88594ToUnicode_h___ #define nsISO88594ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO88594ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO88595ToUnicode.h b/intl/uconv/ucvlatin/nsISO88595ToUnicode.h index 85b7f78d407..bf4a2c571a5 100644 --- a/intl/uconv/ucvlatin/nsISO88595ToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO88595ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO88595ToUnicode_h___ #define nsISO88595ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO88595ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO88596EToUnicode.h b/intl/uconv/ucvlatin/nsISO88596EToUnicode.h index b849e6ef27d..be06ca48a17 100644 --- a/intl/uconv/ucvlatin/nsISO88596EToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO88596EToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO88596EToUnicode_h___ #define nsISO88596EToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO88596EToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO88596IToUnicode.h b/intl/uconv/ucvlatin/nsISO88596IToUnicode.h index 16dd8ad5916..ebe49ecd0db 100644 --- a/intl/uconv/ucvlatin/nsISO88596IToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO88596IToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO88596IToUnicode_h___ #define nsISO88596IToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO88596IToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO88596ToUnicode.h b/intl/uconv/ucvlatin/nsISO88596ToUnicode.h index 8dd97fa0188..0e4556cc8b2 100644 --- a/intl/uconv/ucvlatin/nsISO88596ToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO88596ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO88596ToUnicode_h___ #define nsISO88596ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO88596ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO88597ToUnicode.h b/intl/uconv/ucvlatin/nsISO88597ToUnicode.h index 12b56cb0d06..9785620089e 100644 --- a/intl/uconv/ucvlatin/nsISO88597ToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO88597ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO88597ToUnicode_h___ #define nsISO88597ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO88597ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO88598EToUnicode.h b/intl/uconv/ucvlatin/nsISO88598EToUnicode.h index 6b2481ec479..b3a6cf8542e 100644 --- a/intl/uconv/ucvlatin/nsISO88598EToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO88598EToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO88598EToUnicode_h___ #define nsISO88598EToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO88598EToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO88598IToUnicode.h b/intl/uconv/ucvlatin/nsISO88598IToUnicode.h index 3916e89cd79..42b6e888eeb 100644 --- a/intl/uconv/ucvlatin/nsISO88598IToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO88598IToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO88598IToUnicode_h___ #define nsISO88598IToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO88598IToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO88598ToUnicode.h b/intl/uconv/ucvlatin/nsISO88598ToUnicode.h index 439294127a2..bda24a5f61a 100644 --- a/intl/uconv/ucvlatin/nsISO88598ToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO88598ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO88598ToUnicode_h___ #define nsISO88598ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO88598ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISO88599ToUnicode.h b/intl/uconv/ucvlatin/nsISO88599ToUnicode.h index 846e79bf627..4c47d1ac61d 100644 --- a/intl/uconv/ucvlatin/nsISO88599ToUnicode.h +++ b/intl/uconv/ucvlatin/nsISO88599ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISO88599ToUnicode_h___ #define nsISO88599ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISO88599ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsISOIR111ToUnicode.h b/intl/uconv/ucvlatin/nsISOIR111ToUnicode.h index 5e6c524d977..b7321fa30af 100644 --- a/intl/uconv/ucvlatin/nsISOIR111ToUnicode.h +++ b/intl/uconv/ucvlatin/nsISOIR111ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsISOIR111ToUnicode_h___ #define nsISOIR111ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsISOIR111ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsKOI8RToUnicode.h b/intl/uconv/ucvlatin/nsKOI8RToUnicode.h index 172a7be85cf..16b5037d586 100644 --- a/intl/uconv/ucvlatin/nsKOI8RToUnicode.h +++ b/intl/uconv/ucvlatin/nsKOI8RToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsKOI8RToUnicode_h___ #define nsKOI8RToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsKOI8RToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsKOI8UToUnicode.h b/intl/uconv/ucvlatin/nsKOI8UToUnicode.h index 553c5e01612..c120ebfcd6b 100644 --- a/intl/uconv/ucvlatin/nsKOI8UToUnicode.h +++ b/intl/uconv/ucvlatin/nsKOI8UToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsKOI8UToUnicode_h___ #define nsKOI8UToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsKOI8UToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsMacArabicToUnicode.h b/intl/uconv/ucvlatin/nsMacArabicToUnicode.h index 1489055c998..5e73df2f3bc 100644 --- a/intl/uconv/ucvlatin/nsMacArabicToUnicode.h +++ b/intl/uconv/ucvlatin/nsMacArabicToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsMacArabicToUnicode_h___ #define nsMacArabicToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsMacArabicToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsMacCEToUnicode.cpp b/intl/uconv/ucvlatin/nsMacCEToUnicode.cpp index 7d41ae22021..6c4f6ce2b10 100644 --- a/intl/uconv/ucvlatin/nsMacCEToUnicode.cpp +++ b/intl/uconv/ucvlatin/nsMacCEToUnicode.cpp @@ -55,18 +55,7 @@ static const PRInt16 g_MacCEShiftTable[] = { nsMacCEToUnicode::nsMacCEToUnicode() : nsTableDecoderSupport((uShiftTable*) &g_MacCEShiftTable, - (uMappingTable*) &g_MacCEMappingTable) + (uMappingTable*) &g_MacCEMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableDecoderSupport class [implementation] - -NS_IMETHODIMP nsMacCEToUnicode::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - // we are a single byte to Unicode converter, so... - *aDestLength = aSrcLength; - return NS_OK_UDEC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsMacCEToUnicode.h b/intl/uconv/ucvlatin/nsMacCEToUnicode.h index ef5c3a8900a..7647dcbd985 100644 --- a/intl/uconv/ucvlatin/nsMacCEToUnicode.h +++ b/intl/uconv/ucvlatin/nsMacCEToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsMacCEToUnicode_h___ #define nsMacCEToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsMacCEToUnicode [declaration] @@ -59,13 +59,6 @@ public: */ nsMacCEToUnicode(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsDecoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsMacCEToUnicode_h___ */ diff --git a/intl/uconv/ucvlatin/nsMacCroatianToUnicode.h b/intl/uconv/ucvlatin/nsMacCroatianToUnicode.h index ee4c5691822..756d1f3245b 100644 --- a/intl/uconv/ucvlatin/nsMacCroatianToUnicode.h +++ b/intl/uconv/ucvlatin/nsMacCroatianToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsMacCroatianToUnicode_h___ #define nsMacCroatianToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsMacCroatianToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsMacCyrillicToUnicode.h b/intl/uconv/ucvlatin/nsMacCyrillicToUnicode.h index 3c6e4ad5041..b7d34d05439 100644 --- a/intl/uconv/ucvlatin/nsMacCyrillicToUnicode.h +++ b/intl/uconv/ucvlatin/nsMacCyrillicToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsMacCyrillicToUnicode_h___ #define nsMacCyrillicToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsMacCyrillicToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsMacDevanagariToUnicode.h b/intl/uconv/ucvlatin/nsMacDevanagariToUnicode.h index 73bdac7906f..f3e306d05e0 100644 --- a/intl/uconv/ucvlatin/nsMacDevanagariToUnicode.h +++ b/intl/uconv/ucvlatin/nsMacDevanagariToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsMacDevanagariToUnicode_h___ #define nsMacDevanagariToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsMacDevanagariToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsMacFarsiToUnicode.h b/intl/uconv/ucvlatin/nsMacFarsiToUnicode.h index 7d0a64405d8..5de1e3d3d1c 100644 --- a/intl/uconv/ucvlatin/nsMacFarsiToUnicode.h +++ b/intl/uconv/ucvlatin/nsMacFarsiToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsMacFarsiToUnicode_h___ #define nsMacFarsiToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsMacFarsiToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsMacGreekToUnicode.cpp b/intl/uconv/ucvlatin/nsMacGreekToUnicode.cpp index b87eb613301..392aba01b6f 100644 --- a/intl/uconv/ucvlatin/nsMacGreekToUnicode.cpp +++ b/intl/uconv/ucvlatin/nsMacGreekToUnicode.cpp @@ -55,18 +55,7 @@ static const PRInt16 g_MacGreekShiftTable[] = { nsMacGreekToUnicode::nsMacGreekToUnicode() : nsTableDecoderSupport((uShiftTable*) &g_MacGreekShiftTable, - (uMappingTable*) &g_MacGreekMappingTable) + (uMappingTable*) &g_MacGreekMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableDecoderSupport class [implementation] - -NS_IMETHODIMP nsMacGreekToUnicode::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - // we are a single byte to Unicode converter, so... - *aDestLength = aSrcLength; - return NS_OK_UDEC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsMacGreekToUnicode.h b/intl/uconv/ucvlatin/nsMacGreekToUnicode.h index b5457e6f1a8..7931db90c19 100644 --- a/intl/uconv/ucvlatin/nsMacGreekToUnicode.h +++ b/intl/uconv/ucvlatin/nsMacGreekToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsMacGreekToUnicode_h___ #define nsMacGreekToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsMacGreekToUnicode [declaration] @@ -59,13 +59,6 @@ public: */ nsMacGreekToUnicode(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsDecoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsMacGreekToUnicode_h___ */ diff --git a/intl/uconv/ucvlatin/nsMacGujaratiToUnicode.h b/intl/uconv/ucvlatin/nsMacGujaratiToUnicode.h index f7472e67b11..df20222d699 100644 --- a/intl/uconv/ucvlatin/nsMacGujaratiToUnicode.h +++ b/intl/uconv/ucvlatin/nsMacGujaratiToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsMacGujaratiToUnicode_h___ #define nsMacGujaratiToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsMacGujaratiToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsMacGurmukhiToUnicode.h b/intl/uconv/ucvlatin/nsMacGurmukhiToUnicode.h index 925f9da3542..1d7e68efbf3 100644 --- a/intl/uconv/ucvlatin/nsMacGurmukhiToUnicode.h +++ b/intl/uconv/ucvlatin/nsMacGurmukhiToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsMacGurmukhiToUnicode_h___ #define nsMacGurmukhiToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsMacGurmukhiToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsMacHebrewToUnicode.h b/intl/uconv/ucvlatin/nsMacHebrewToUnicode.h index 6310f064fc2..2f71bcc8008 100644 --- a/intl/uconv/ucvlatin/nsMacHebrewToUnicode.h +++ b/intl/uconv/ucvlatin/nsMacHebrewToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsMacHebrewToUnicode_h___ #define nsMacHebrewToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsMacHebrewToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsMacIcelandicToUnicode.h b/intl/uconv/ucvlatin/nsMacIcelandicToUnicode.h index a6ad929dacb..098a9365a57 100644 --- a/intl/uconv/ucvlatin/nsMacIcelandicToUnicode.h +++ b/intl/uconv/ucvlatin/nsMacIcelandicToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsMacIcelandicToUnicode_h___ #define nsMacIcelandicToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsMacIcelandicToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsMacRomanianToUnicode.h b/intl/uconv/ucvlatin/nsMacRomanianToUnicode.h index 0f40c3142eb..5d3a67454cc 100644 --- a/intl/uconv/ucvlatin/nsMacRomanianToUnicode.h +++ b/intl/uconv/ucvlatin/nsMacRomanianToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsMacRomanianToUnicode_h___ #define nsMacRomanianToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsMacRomanianToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsMacTurkishToUnicode.cpp b/intl/uconv/ucvlatin/nsMacTurkishToUnicode.cpp index b467f54088e..6661b1dd1c0 100644 --- a/intl/uconv/ucvlatin/nsMacTurkishToUnicode.cpp +++ b/intl/uconv/ucvlatin/nsMacTurkishToUnicode.cpp @@ -55,18 +55,6 @@ static const PRInt16 g_MacTurkishShiftTable[] = { nsMacTurkishToUnicode::nsMacTurkishToUnicode() : nsTableDecoderSupport((uShiftTable*) &g_MacTurkishShiftTable, - (uMappingTable*) &g_MacTurkishMappingTable) + (uMappingTable*) &g_MacTurkishMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableDecoderSupport class [implementation] - -NS_IMETHODIMP nsMacTurkishToUnicode::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - // we are a single byte to Unicode converter, so... - *aDestLength = aSrcLength; - return NS_OK_UDEC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsMacTurkishToUnicode.h b/intl/uconv/ucvlatin/nsMacTurkishToUnicode.h index 65ecf45b0ff..3eff47ff7de 100644 --- a/intl/uconv/ucvlatin/nsMacTurkishToUnicode.h +++ b/intl/uconv/ucvlatin/nsMacTurkishToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsMacTurkishToUnicode_h___ #define nsMacTurkishToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsMacTurkishToUnicode [declaration] @@ -59,13 +59,6 @@ public: */ nsMacTurkishToUnicode(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsDecoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsMacTurkishToUnicode_h___ */ diff --git a/intl/uconv/ucvlatin/nsMacUkrainianToUnicode.h b/intl/uconv/ucvlatin/nsMacUkrainianToUnicode.h index 7c6752f5e99..6b5dc310dd1 100644 --- a/intl/uconv/ucvlatin/nsMacUkrainianToUnicode.h +++ b/intl/uconv/ucvlatin/nsMacUkrainianToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsMacUkrainianToUnicode_h___ #define nsMacUkrainianToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsMacUkrainianToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsT61ToUnicode.cpp b/intl/uconv/ucvlatin/nsT61ToUnicode.cpp index f93b52bffb8..8bdac7f5285 100644 --- a/intl/uconv/ucvlatin/nsT61ToUnicode.cpp +++ b/intl/uconv/ucvlatin/nsT61ToUnicode.cpp @@ -58,17 +58,7 @@ static const PRInt16 g_T61ShiftTable[] = { nsT61ToUnicode::nsT61ToUnicode() : nsTableDecoderSupport((uShiftTable*) &g_T61ShiftTable, - (uMappingTable*) &g_T61MappingTable) + (uMappingTable*) &g_T61MappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableDecoderSupport class [implementation] - -NS_IMETHODIMP nsT61ToUnicode::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK; -} diff --git a/intl/uconv/ucvlatin/nsT61ToUnicode.h b/intl/uconv/ucvlatin/nsT61ToUnicode.h index 880258fbb75..1bec274b399 100644 --- a/intl/uconv/ucvlatin/nsT61ToUnicode.h +++ b/intl/uconv/ucvlatin/nsT61ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsT61ToUnicode_h___ #define nsT61ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsT61ToUnicode [declaration] @@ -59,13 +59,6 @@ public: */ nsT61ToUnicode(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsDecoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsT61ToUnicode_h___ */ diff --git a/intl/uconv/ucvlatin/nsTCVN5712ToUnicode.h b/intl/uconv/ucvlatin/nsTCVN5712ToUnicode.h index 3f07f9dd312..014c6dd489c 100644 --- a/intl/uconv/ucvlatin/nsTCVN5712ToUnicode.h +++ b/intl/uconv/ucvlatin/nsTCVN5712ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsTCVN5712ToUnicode_h___ #define nsTCVN5712ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsTCVN5712ToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp b/intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp index fd11d01f125..a907a93c091 100644 --- a/intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp +++ b/intl/uconv/ucvlatin/nsUCS2BEToUnicode.cpp @@ -39,6 +39,7 @@ #include "nsUCS2BEToUnicode.h" #include "nsUCvLatinDll.h" #include +#include "prtypes.h" //---------------------------------------------------------------------- // Global functions and data [declaration] @@ -56,16 +57,10 @@ static const PRInt16 g_UCS2BEShiftTable[] = { nsUCS2BEToUnicode::nsUCS2BEToUnicode() : nsTableDecoderSupport((uShiftTable*) &g_UCS2BEShiftTable, - (uMappingTable*) &g_UCS2BEMappingTable) + (uMappingTable*) &g_UCS2BEMappingTable, 0) { } -nsresult nsUCS2BEToUnicode::CreateInstance(nsISupports ** aResult) -{ - *aResult = new nsUCS2BEToUnicode(); - return (*aResult == NULL)? NS_ERROR_OUT_OF_MEMORY : NS_OK; -} - //---------------------------------------------------------------------- // Subclassing of nsTableDecoderSupport class [implementation] @@ -228,29 +223,6 @@ NS_IMETHODIMP nsUTF16DiffEndianToUnicode::Convert( return res; } -static char BOM[] = {(char)0xfe, (char)0xff}; -#define IsBigEndian() (0xFEFF == *((PRUint16*)BOM)) -nsresult NEW_UTF16BEToUnicode(nsISupports **aResult) -{ - if(IsBigEndian()) { - *aResult = new nsUTF16SameEndianToUnicode(); - } else { - *aResult = new nsUTF16DiffEndianToUnicode(); - } - return (NULL == *aResult) ? NS_ERROR_OUT_OF_MEMORY : NS_OK; -} -nsresult NEW_UTF16LEToUnicode(nsISupports **aResult) -{ - if(IsBigEndian()) { - *aResult = new nsUTF16DiffEndianToUnicode(); - } else { - *aResult = new nsUTF16SameEndianToUnicode(); - } - return (NULL == *aResult) ? NS_ERROR_OUT_OF_MEMORY : NS_OK; -} - -//============== above code is obsolete ============================== - nsresult UTF16ConvertToUnicode(PRUint8& aState, PRUint8& aData, const char * aSrc, PRInt32 * aSrcLength, PRUnichar * aDest, PRInt32 * aDestLength) { const char* src = aSrc; @@ -321,7 +293,7 @@ NS_IMETHODIMP nsUTF16BEToUnicode::Reset() NS_IMETHODIMP nsUTF16BEToUnicode::Convert(const char * aSrc, PRInt32 * aSrcLength, PRUnichar * aDest, PRInt32 * aDestLength) { - if (!IsBigEndian()) { +#ifdef IS_LITTLE_ENDIAN // process nsUTF16DiffEndianToUnicode if(2 == mState) // first time called { @@ -336,11 +308,11 @@ NS_IMETHODIMP nsUTF16BEToUnicode::Convert(const char * aSrc, PRInt32 * aSrcLengt } mState=0; } - } +#endif nsresult res = UTF16ConvertToUnicode(mState, mData, aSrc, aSrcLength, aDest, aDestLength); - if (!IsBigEndian()) { +#ifdef IS_LITTLE_ENDIAN // process nsUTF16DiffEndianToUnicode PRInt32 i; @@ -353,7 +325,7 @@ NS_IMETHODIMP nsUTF16BEToUnicode::Convert(const char * aSrc, PRInt32 * aSrcLengt *(p+1) = *p; *(p)= tmp; } - } +#endif return res; } @@ -374,7 +346,7 @@ NS_IMETHODIMP nsUTF16LEToUnicode::Reset() NS_IMETHODIMP nsUTF16LEToUnicode::Convert(const char * aSrc, PRInt32 * aSrcLength, PRUnichar * aDest, PRInt32 * aDestLength) { - if (IsBigEndian()) { +#ifdef IS_BIG_ENDIAN // process nsUTF16DiffEndianToUnicode if(2 == mState) // first time called { @@ -389,11 +361,11 @@ NS_IMETHODIMP nsUTF16LEToUnicode::Convert(const char * aSrc, PRInt32 * aSrcLengt } mState=0; } - } - +#endif + nsresult res = UTF16ConvertToUnicode(mState, mData, aSrc, aSrcLength, aDest, aDestLength); - if (IsBigEndian()) { +#ifdef IS_BIG_ENDIAN // process nsUTF16DiffEndianToUnicode PRInt32 i; @@ -406,7 +378,7 @@ NS_IMETHODIMP nsUTF16LEToUnicode::Convert(const char * aSrc, PRInt32 * aSrcLengt *(p+1) = *p; *(p)= tmp; } - } +#endif return res; } diff --git a/intl/uconv/ucvlatin/nsUCS2BEToUnicode.h b/intl/uconv/ucvlatin/nsUCS2BEToUnicode.h index de6b6dfd990..b9963a9176d 100644 --- a/intl/uconv/ucvlatin/nsUCS2BEToUnicode.h +++ b/intl/uconv/ucvlatin/nsUCS2BEToUnicode.h @@ -40,7 +40,7 @@ #define nsUCS2BEToUnicode_h___ #include "nsISupports.h" -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUCS2BEToUnicode [declaration] @@ -60,11 +60,6 @@ public: */ nsUCS2BEToUnicode(); - /** - * Static class constructor. - */ - static nsresult CreateInstance(nsISupports **aResult); - protected: //-------------------------------------------------------------------- @@ -73,8 +68,6 @@ protected: NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, PRInt32 * aDestLength); }; -nsresult NEW_UTF16BEToUnicode(nsISupports **Result); -nsresult NEW_UTF16LEToUnicode(nsISupports **Result); //============== above code is obsolete ============================== diff --git a/intl/uconv/ucvlatin/nsUCS2LEToUnicode.cpp b/intl/uconv/ucvlatin/nsUCS2LEToUnicode.cpp index dfc413782aa..e69de29bb2d 100644 --- a/intl/uconv/ucvlatin/nsUCS2LEToUnicode.cpp +++ b/intl/uconv/ucvlatin/nsUCS2LEToUnicode.cpp @@ -1,83 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsUCS2LEToUnicode.h" - -//---------------------------------------------------------------------- -// Global functions and data [declaration] - -static const PRUint16 g_UCS2LEMappingTable[] = { - 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0000 -}; - -static const PRInt16 g_UCS2LEShiftTable[] = { - 0, u2BytesSwapCharset, - ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), -}; - -//---------------------------------------------------------------------- -// Class nsUCS2LEToUnicode [implementation] - -nsUCS2LEToUnicode::nsUCS2LEToUnicode() -: nsTableDecoderSupport((uShiftTable*) &g_UCS2LEShiftTable, - (uMappingTable*) &g_UCS2LEMappingTable) -{ -} - -nsresult nsUCS2LEToUnicode::CreateInstance(nsISupports ** aResult) -{ - *aResult = new nsUCS2LEToUnicode(); - return (*aResult == NULL)? NS_ERROR_OUT_OF_MEMORY : NS_OK; -} - -//---------------------------------------------------------------------- -// Subclassing of nsTableDecoderSupport class [implementation] - -NS_IMETHODIMP nsUCS2LEToUnicode::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - if(0 == (aSrcLength % 2)) - { - *aDestLength = aSrcLength / 2; - return NS_OK_UENC_EXACTLENGTH; - } else { - *aDestLength = (aSrcLength + 1) / 2; - return NS_OK; - } -} diff --git a/intl/uconv/ucvlatin/nsUCS2LEToUnicode.h b/intl/uconv/ucvlatin/nsUCS2LEToUnicode.h index ac1d8dec370..e69de29bb2d 100644 --- a/intl/uconv/ucvlatin/nsUCS2LEToUnicode.h +++ b/intl/uconv/ucvlatin/nsUCS2LEToUnicode.h @@ -1,76 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef nsUCS2LEToUnicode_h___ -#define nsUCS2LEToUnicode_h___ - -#include "nsUCvLatinSupport.h" - -//---------------------------------------------------------------------- -// Class nsUCS2LEToUnicode [declaration] - -/** - * A character set converter from UCS2LE to Unicode. - * - * @created 18/Mar/1998 - * @author Catalin Rotaru [CATA] - */ -class nsUCS2LEToUnicode : public nsTableDecoderSupport -{ -public: - - /** - * Class constructor. - */ - nsUCS2LEToUnicode(); - - /** - * Static class constructor. - */ - static nsresult CreateInstance(nsISupports **aResult); - -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsDecoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); -}; - -#endif /* nsUCS2LEToUnicode_h___ */ diff --git a/intl/uconv/ucvlatin/nsUCS4BEToUnicode.cpp b/intl/uconv/ucvlatin/nsUCS4BEToUnicode.cpp index b4bd7e263f3..e69de29bb2d 100644 --- a/intl/uconv/ucvlatin/nsUCS4BEToUnicode.cpp +++ b/intl/uconv/ucvlatin/nsUCS4BEToUnicode.cpp @@ -1,83 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsUCS4BEToUnicode.h" - -//---------------------------------------------------------------------- -// Global functions and data [declaration] - -static const PRUint16 g_UCS4BEMappingTable[] = { - 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0000 -}; - -static const PRInt16 g_UCS4BEShiftTable[] = { - 0, u4BytesCharset, - ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), -}; - -//---------------------------------------------------------------------- -// Class nsUCS4BEToUnicode [implementation] - -nsUCS4BEToUnicode::nsUCS4BEToUnicode() -: nsTableDecoderSupport((uShiftTable*) &g_UCS4BEShiftTable, - (uMappingTable*) &g_UCS4BEMappingTable) -{ -} - -nsresult nsUCS4BEToUnicode::CreateInstance(nsISupports ** aResult) -{ - *aResult = new nsUCS4BEToUnicode(); - return (*aResult == NULL)? NS_ERROR_OUT_OF_MEMORY : NS_OK; -} - -//---------------------------------------------------------------------- -// Subclassing of nsTableDecoderSupport class [implementation] - -NS_IMETHODIMP nsUCS4BEToUnicode::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - if(0 == (aSrcLength % 4)) - { - *aDestLength = aSrcLength / 4; - return NS_OK_UENC_EXACTLENGTH; - } else { - *aDestLength = (aSrcLength / 4) + 1; - return NS_OK; - } -} diff --git a/intl/uconv/ucvlatin/nsUCS4BEToUnicode.h b/intl/uconv/ucvlatin/nsUCS4BEToUnicode.h index 19b8fc11198..e69de29bb2d 100644 --- a/intl/uconv/ucvlatin/nsUCS4BEToUnicode.h +++ b/intl/uconv/ucvlatin/nsUCS4BEToUnicode.h @@ -1,75 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef nsUCS4BEToUnicode_h___ -#define nsUCS4BEToUnicode_h___ - -#include "nsUCvLatinSupport.h" - -//---------------------------------------------------------------------- -// Class nsUCS4BEToUnicode [declaration] - -/** - * A character set converter from UCS4BE to Unicode. - * - * @created 18/Mar/1998 - */ -class nsUCS4BEToUnicode : public nsTableDecoderSupport -{ -public: - - /** - * Class constructor. - */ - nsUCS4BEToUnicode(); - - /** - * Static class constructor. - */ - static nsresult CreateInstance(nsISupports **aResult); - -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsDecoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); -}; - -#endif /* nsUCS4BEToUnicode_h___ */ diff --git a/intl/uconv/ucvlatin/nsUCS4LEToUnicode.cpp b/intl/uconv/ucvlatin/nsUCS4LEToUnicode.cpp index c50d180ac36..e69de29bb2d 100644 --- a/intl/uconv/ucvlatin/nsUCS4LEToUnicode.cpp +++ b/intl/uconv/ucvlatin/nsUCS4LEToUnicode.cpp @@ -1,83 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsUCS4LEToUnicode.h" - -//---------------------------------------------------------------------- -// Global functions and data [declaration] - -static const PRUint16 g_UCS4LEMappingTable[] = { - 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0000 -}; - -static const PRInt16 g_UCS4LEShiftTable[] = { - 0, u4BytesSwapCharset, - ShiftCell(0, 0, 0, 0, 0, 0, 0, 0), -}; - -//---------------------------------------------------------------------- -// Class nsUCS4LEToUnicode [implementation] - -nsUCS4LEToUnicode::nsUCS4LEToUnicode() -: nsTableDecoderSupport((uShiftTable*) &g_UCS4LEShiftTable, - (uMappingTable*) &g_UCS4LEMappingTable) -{ -} - -nsresult nsUCS4LEToUnicode::CreateInstance(nsISupports ** aResult) -{ - *aResult = new nsUCS4LEToUnicode(); - return (*aResult == NULL)? NS_ERROR_OUT_OF_MEMORY : NS_OK; -} - -//---------------------------------------------------------------------- -// Subclassing of nsTableDecoderSupport class [implementation] - -NS_IMETHODIMP nsUCS4LEToUnicode::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - if(0 == (aSrcLength % 4)) - { - *aDestLength = aSrcLength / 4; - return NS_OK_UENC_EXACTLENGTH; - } else { - *aDestLength = (aSrcLength / 4) + 1; - return NS_OK; - } -} diff --git a/intl/uconv/ucvlatin/nsUCS4LEToUnicode.h b/intl/uconv/ucvlatin/nsUCS4LEToUnicode.h index 3e7317bfbb2..e69de29bb2d 100644 --- a/intl/uconv/ucvlatin/nsUCS4LEToUnicode.h +++ b/intl/uconv/ucvlatin/nsUCS4LEToUnicode.h @@ -1,76 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef nsUCS4LEToUnicode_h___ -#define nsUCS4LEToUnicode_h___ - -#include "nsUCvLatinSupport.h" - -//---------------------------------------------------------------------- -// Class nsUCS4LEToUnicode [declaration] - -/** - * A character set converter from UCS4LE to Unicode. - * - * @created 18/Mar/1998 - * @author Catalin Rotaru [CATA] - */ -class nsUCS4LEToUnicode : public nsTableDecoderSupport -{ -public: - - /** - * Class constructor. - */ - nsUCS4LEToUnicode(); - - /** - * Static class constructor. - */ - static nsresult CreateInstance(nsISupports **aResult); - -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsDecoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); -}; - -#endif /* nsUCS4LEToUnicode_h___ */ diff --git a/intl/uconv/ucvlatin/nsUCvLatinSupport.cpp b/intl/uconv/ucvlatin/nsUCvLatinSupport.cpp deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvlatin/nsUCvLatinSupport.h b/intl/uconv/ucvlatin/nsUCvLatinSupport.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvlatin/nsUEscapeToUnicode.cpp b/intl/uconv/ucvlatin/nsUEscapeToUnicode.cpp index a2afcfdd0f7..6738070ca4c 100644 --- a/intl/uconv/ucvlatin/nsUEscapeToUnicode.cpp +++ b/intl/uconv/ucvlatin/nsUEscapeToUnicode.cpp @@ -151,9 +151,3 @@ NS_IMETHODIMP nsUEscapeToUnicode::Reset() return NS_OK; } - -nsresult NEW_UEscapeToUnicode(nsISupports **aResult) -{ - *aResult = new nsUEscapeToUnicode(); - return (NULL == *aResult) ? NS_ERROR_OUT_OF_MEMORY : NS_OK; -} diff --git a/intl/uconv/ucvlatin/nsUEscapeToUnicode.h b/intl/uconv/ucvlatin/nsUEscapeToUnicode.h index 770f8665e6a..6762e7acbd5 100644 --- a/intl/uconv/ucvlatin/nsUEscapeToUnicode.h +++ b/intl/uconv/ucvlatin/nsUEscapeToUnicode.h @@ -41,7 +41,7 @@ #include "nsISupports.h" #include "nsUEscapeToUnicode.h" -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUEscapeToUnicode [declaration] @@ -53,7 +53,7 @@ public: /** * Class constructor. */ - nsUEscapeToUnicode() { Reset();}; + nsUEscapeToUnicode() : nsBasicDecoderSupport() { Reset();}; NS_IMETHOD Convert(const char * aSrc, PRInt32 * aSrcLength, PRUnichar * aDest, PRInt32 * aDestLength); @@ -72,7 +72,4 @@ private: PRUint32 mBufferLen; }; -nsresult NEW_UEscapeToUnicode(nsISupports **Result); - - #endif /* nsUEscapeToUnicode_h___ */ diff --git a/intl/uconv/ucvlatin/nsUTF7ToUnicode.cpp b/intl/uconv/ucvlatin/nsUTF7ToUnicode.cpp index 98fb8f154ff..c896e69f28d 100644 --- a/intl/uconv/ucvlatin/nsUTF7ToUnicode.cpp +++ b/intl/uconv/ucvlatin/nsUTF7ToUnicode.cpp @@ -45,7 +45,7 @@ // Class nsBasicUTF7Decoder [implementation] nsBasicUTF7Decoder::nsBasicUTF7Decoder(char aLastChar, char aEscChar) -: nsBufferDecoderSupport() +: nsBufferDecoderSupport(1) { mLastChar = aLastChar; mEscChar = aEscChar; @@ -246,15 +246,6 @@ NS_IMETHODIMP nsBasicUTF7Decoder::ConvertNoBuff(const char * aSrc, return res; } -NS_IMETHODIMP nsBasicUTF7Decoder::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - // worst case - *aDestLength = aSrcLength; - return NS_OK; -} - NS_IMETHODIMP nsBasicUTF7Decoder::Reset() { mEncoding = ENC_DIRECT; diff --git a/intl/uconv/ucvlatin/nsUTF7ToUnicode.h b/intl/uconv/ucvlatin/nsUTF7ToUnicode.h index b0320cf7379..1c1789dd1c7 100644 --- a/intl/uconv/ucvlatin/nsUTF7ToUnicode.h +++ b/intl/uconv/ucvlatin/nsUTF7ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsUTF7ToUnicode_h___ #define nsUTF7ToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsBasicUTF7Decoder [declaration] @@ -79,8 +79,6 @@ protected: NS_IMETHOD ConvertNoBuff(const char * aSrc, PRInt32 * aSrcLength, PRUnichar * aDest, PRInt32 * aDestLength); - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); NS_IMETHOD Reset(); }; diff --git a/intl/uconv/ucvlatin/nsUnicodeToARMSCII8.cpp b/intl/uconv/ucvlatin/nsUnicodeToARMSCII8.cpp index 3d0e56030ca..616e8685feb 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToARMSCII8.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToARMSCII8.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToARMSCII8::nsUnicodeToARMSCII8() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToARMSCII8::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToARMSCII8.h b/intl/uconv/ucvlatin/nsUnicodeToARMSCII8.h index f5bdfc86300..8fb49cfc059 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToARMSCII8.h +++ b/intl/uconv/ucvlatin/nsUnicodeToARMSCII8.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToARMSCII8_h___ #define nsUnicodeToARMSCII8_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToARMSCII8 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToARMSCII8(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToARMSCII8_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToAscii.cpp b/intl/uconv/ucvlatin/nsUnicodeToAscii.cpp index 26e64304f5d..c80d7768fd5 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToAscii.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToAscii.cpp @@ -55,18 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToAscii::nsUnicodeToAscii() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToAscii::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} - diff --git a/intl/uconv/ucvlatin/nsUnicodeToAscii.h b/intl/uconv/ucvlatin/nsUnicodeToAscii.h index a85b449cb54..47ad7781dce 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToAscii.h +++ b/intl/uconv/ucvlatin/nsUnicodeToAscii.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToAscii_h___ #define nsUnicodeToAscii_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToAscii [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToAscii(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToAscii_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1250.cpp b/intl/uconv/ucvlatin/nsUnicodeToCP1250.cpp index 53a8805b153..479b8af565a 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1250.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1250.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP1250::nsUnicodeToCP1250() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP1250::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1250.h b/intl/uconv/ucvlatin/nsUnicodeToCP1250.h index 1bb8b6db82e..1276483fb25 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1250.h +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1250.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCP1250_h___ #define nsUnicodeToCP1250_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP1250 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToCP1250(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP1250_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1251.cpp b/intl/uconv/ucvlatin/nsUnicodeToCP1251.cpp index eb18f207c13..d094f32da0b 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1251.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1251.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP1251::nsUnicodeToCP1251() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP1251::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1251.h b/intl/uconv/ucvlatin/nsUnicodeToCP1251.h index 545e1b332c5..565a519d39a 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1251.h +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1251.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCP1251_h___ #define nsUnicodeToCP1251_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP1251 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToCP1251(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP1251_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1253.cpp b/intl/uconv/ucvlatin/nsUnicodeToCP1253.cpp index 1811596c972..fcce5ddb807 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1253.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1253.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP1253::nsUnicodeToCP1253() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP1253::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1253.h b/intl/uconv/ucvlatin/nsUnicodeToCP1253.h index cb1b88d9593..f6e54450f42 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1253.h +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1253.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCP1253_h___ #define nsUnicodeToCP1253_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP1253 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToCP1253(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP1253_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1254.cpp b/intl/uconv/ucvlatin/nsUnicodeToCP1254.cpp index ff4f1324bb5..d7fb705e9da 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1254.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1254.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP1254::nsUnicodeToCP1254() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP1254::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1254.h b/intl/uconv/ucvlatin/nsUnicodeToCP1254.h index e505bc8858f..ed6a7246811 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1254.h +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1254.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCP1254_h___ #define nsUnicodeToCP1254_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP1254 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToCP1254(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP1254_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1255.cpp b/intl/uconv/ucvlatin/nsUnicodeToCP1255.cpp index 280a4be8c7d..b7965e6050a 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1255.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1255.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP1255::nsUnicodeToCP1255() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP1255::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1255.h b/intl/uconv/ucvlatin/nsUnicodeToCP1255.h index 846bd647aa4..4222aa8623d 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1255.h +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1255.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCP1255_h___ #define nsUnicodeToCP1255_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP1255 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToCP1255(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP1255_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1256.cpp b/intl/uconv/ucvlatin/nsUnicodeToCP1256.cpp index 4d4cc9a309f..73b8dac7e6a 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1256.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1256.cpp @@ -55,18 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP1256::nsUnicodeToCP1256() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP1256::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1256.h b/intl/uconv/ucvlatin/nsUnicodeToCP1256.h index eba4f658a01..2549993c22a 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1256.h +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1256.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCP1256_h___ #define nsUnicodeToCP1256_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP1256 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToCP1256(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP1256_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1257.cpp b/intl/uconv/ucvlatin/nsUnicodeToCP1257.cpp index f4529011e9d..538633ecabb 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1257.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1257.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP1257::nsUnicodeToCP1257() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP1257::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1257.h b/intl/uconv/ucvlatin/nsUnicodeToCP1257.h index 39da5a701d8..d7b49600e23 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1257.h +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1257.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCP1257_h___ #define nsUnicodeToCP1257_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP1257 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToCP1257(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP1257_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1258.cpp b/intl/uconv/ucvlatin/nsUnicodeToCP1258.cpp index 66f00b8cb29..c95d4b0cd62 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1258.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1258.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP1258::nsUnicodeToCP1258() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP1258::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP1258.h b/intl/uconv/ucvlatin/nsUnicodeToCP1258.h index e43fbae6244..013d22e0cb8 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP1258.h +++ b/intl/uconv/ucvlatin/nsUnicodeToCP1258.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCP1258_h___ #define nsUnicodeToCP1258_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP1258 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToCP1258(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP1258_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP866.cpp b/intl/uconv/ucvlatin/nsUnicodeToCP866.cpp index 2c8c773468e..4c48ed43139 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP866.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToCP866.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP866::nsUnicodeToCP866() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP866::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP866.h b/intl/uconv/ucvlatin/nsUnicodeToCP866.h index f7a8fea3ec6..87dba556e76 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP866.h +++ b/intl/uconv/ucvlatin/nsUnicodeToCP866.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCP866_h___ #define nsUnicodeToCP866_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP866 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToCP866(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP866_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP874.cpp b/intl/uconv/ucvlatin/nsUnicodeToCP874.cpp index 701faa6f60b..14037bef127 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP874.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToCP874.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToCP874::nsUnicodeToCP874() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCP874::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToCP874.h b/intl/uconv/ucvlatin/nsUnicodeToCP874.h index f79fb0a92cf..8aa5f62dc4f 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToCP874.h +++ b/intl/uconv/ucvlatin/nsUnicodeToCP874.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCP874_h___ #define nsUnicodeToCP874_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCP874 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToCP874(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCP874_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToGEOSTD8.cpp b/intl/uconv/ucvlatin/nsUnicodeToGEOSTD8.cpp index f7c27c0d98e..4b3e6985d97 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToGEOSTD8.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToGEOSTD8.cpp @@ -39,17 +39,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToGEOSTD8::nsUnicodeToGEOSTD8() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToGEOSTD8::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToGEOSTD8.h b/intl/uconv/ucvlatin/nsUnicodeToGEOSTD8.h index 15190caa1e3..93795845b27 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToGEOSTD8.h +++ b/intl/uconv/ucvlatin/nsUnicodeToGEOSTD8.h @@ -23,7 +23,7 @@ #ifndef nsUnicodeToGEOSTD8_h___ #define nsUnicodeToGEOSTD8_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToGEOSTD8 [declaration] @@ -41,13 +41,6 @@ public: */ nsUnicodeToGEOSTD8(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToGEOSTD8_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO885910.cpp b/intl/uconv/ucvlatin/nsUnicodeToISO885910.cpp index 8dff5be166a..1eae3a5b88f 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO885910.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToISO885910.cpp @@ -55,18 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToISO885910::nsUnicodeToISO885910() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToISO885910::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} - diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO885910.h b/intl/uconv/ucvlatin/nsUnicodeToISO885910.h index 5c816455da1..9010170e286 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO885910.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO885910.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO885910_h___ #define nsUnicodeToISO885910_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO885910 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToISO885910(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToISO885910_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO885913.cpp b/intl/uconv/ucvlatin/nsUnicodeToISO885913.cpp index a9cc47d051a..b88e9ab7f7d 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO885913.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToISO885913.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToISO885913::nsUnicodeToISO885913() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToISO885913::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO885913.h b/intl/uconv/ucvlatin/nsUnicodeToISO885913.h index 90fef6039e7..8f5532b85ae 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO885913.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO885913.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO885913_h___ #define nsUnicodeToISO885913_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO885913 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToISO885913(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToISO885913_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO885914.cpp b/intl/uconv/ucvlatin/nsUnicodeToISO885914.cpp index 938e7f6782c..9fe7e10ce2b 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO885914.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToISO885914.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToISO885914::nsUnicodeToISO885914() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToISO885914::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO885914.h b/intl/uconv/ucvlatin/nsUnicodeToISO885914.h index 5d576518bdf..253407185b1 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO885914.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO885914.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO885914_h___ #define nsUnicodeToISO885914_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO885914 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToISO885914(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToISO885914_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO885915.cpp b/intl/uconv/ucvlatin/nsUnicodeToISO885915.cpp index 5489011c5d0..f823128c5f1 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO885915.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToISO885915.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToISO885915::nsUnicodeToISO885915() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToISO885915::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO885915.h b/intl/uconv/ucvlatin/nsUnicodeToISO885915.h index 643b6470a9e..54f2d6b01ab 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO885915.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO885915.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO885915_h___ #define nsUnicodeToISO885915_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO885915 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToISO885915(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToISO885915_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO885916.cpp b/intl/uconv/ucvlatin/nsUnicodeToISO885916.cpp index d04d59ff512..97e3eee991c 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO885916.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToISO885916.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToISO885916::nsUnicodeToISO885916() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToISO885916::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO885916.h b/intl/uconv/ucvlatin/nsUnicodeToISO885916.h index 30d3fe813eb..a86533599b7 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO885916.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO885916.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO885916_h___ #define nsUnicodeToISO885916_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO885916 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToISO885916(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToISO885916_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88592.cpp b/intl/uconv/ucvlatin/nsUnicodeToISO88592.cpp index cb8260c0afd..35e1c8700b0 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88592.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88592.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToISO88592::nsUnicodeToISO88592() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToISO88592::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88592.h b/intl/uconv/ucvlatin/nsUnicodeToISO88592.h index 9a2e4acc061..862e604bf98 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88592.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88592.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO88592_h___ #define nsUnicodeToISO88592_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO88592 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToISO88592(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToISO88592_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88593.cpp b/intl/uconv/ucvlatin/nsUnicodeToISO88593.cpp index 1e7b4b3f45d..9207856229e 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88593.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88593.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToISO88593::nsUnicodeToISO88593() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToISO88593::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88593.h b/intl/uconv/ucvlatin/nsUnicodeToISO88593.h index 4dac3f37f8d..baf6281a3b5 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88593.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88593.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO88593_h___ #define nsUnicodeToISO88593_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO88593 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToISO88593(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToISO88593_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88594.cpp b/intl/uconv/ucvlatin/nsUnicodeToISO88594.cpp index f2622112720..cedd9b1e46b 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88594.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88594.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToISO88594::nsUnicodeToISO88594() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToISO88594::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88594.h b/intl/uconv/ucvlatin/nsUnicodeToISO88594.h index 30ddb82d9b6..87aa019e899 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88594.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88594.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO88594_h___ #define nsUnicodeToISO88594_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO88594 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToISO88594(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToISO88594_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88595.cpp b/intl/uconv/ucvlatin/nsUnicodeToISO88595.cpp index 504f58a5c61..a66e7b4dc0b 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88595.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88595.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToISO88595::nsUnicodeToISO88595() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToISO88595::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88595.h b/intl/uconv/ucvlatin/nsUnicodeToISO88595.h index 69b33ff8d88..9b665a8c5a9 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88595.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88595.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO88595_h___ #define nsUnicodeToISO88595_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO88595 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToISO88595(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToISO88595_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88596.cpp b/intl/uconv/ucvlatin/nsUnicodeToISO88596.cpp index 53a23b020f0..9fd28f98b86 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88596.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88596.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToISO88596::nsUnicodeToISO88596() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToISO88596::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88596.h b/intl/uconv/ucvlatin/nsUnicodeToISO88596.h index c02ee9d4260..83e05802967 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88596.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88596.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO88596_h___ #define nsUnicodeToISO88596_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO88596 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToISO88596(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToISO88596_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88596E.h b/intl/uconv/ucvlatin/nsUnicodeToISO88596E.h index cd548dd66ba..0ce0e6c0ac9 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88596E.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88596E.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO88596E_h___ #define nsUnicodeToISO88596E_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO88596E [declaration] diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88596I.h b/intl/uconv/ucvlatin/nsUnicodeToISO88596I.h index d8d05418f4c..0b2e0587574 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88596I.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88596I.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO88596I_h___ #define nsUnicodeToISO88596I_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO88596I [declaration] diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88597.cpp b/intl/uconv/ucvlatin/nsUnicodeToISO88597.cpp index 8197b800783..101ca1cda99 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88597.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88597.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToISO88597::nsUnicodeToISO88597() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToISO88597::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88597.h b/intl/uconv/ucvlatin/nsUnicodeToISO88597.h index f5cd87eada0..91aa8943ca8 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88597.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88597.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO88597_h___ #define nsUnicodeToISO88597_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO88597 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToISO88597(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToISO88597_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88598.cpp b/intl/uconv/ucvlatin/nsUnicodeToISO88598.cpp index 67fbc393143..3a861401b2e 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88598.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88598.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToISO88598::nsUnicodeToISO88598() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToISO88598::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88598.h b/intl/uconv/ucvlatin/nsUnicodeToISO88598.h index c3ecdb8976d..35656cabc7f 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88598.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88598.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO88598_h___ #define nsUnicodeToISO88598_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO88598 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToISO88598(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToISO88598_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88598E.h b/intl/uconv/ucvlatin/nsUnicodeToISO88598E.h index 180bd79b06b..d3329e541fe 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88598E.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88598E.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO88598E_h___ #define nsUnicodeToISO88598E_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO88598E [declaration] diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88598I.h b/intl/uconv/ucvlatin/nsUnicodeToISO88598I.h index a1d1b5e680b..4b375b85c8d 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88598I.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88598I.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO88598I_h___ #define nsUnicodeToISO88598I_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO88598I [declaration] diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88599.cpp b/intl/uconv/ucvlatin/nsUnicodeToISO88599.cpp index 178778b03d5..60625c488fc 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88599.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88599.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToISO88599::nsUnicodeToISO88599() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToISO88599::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToISO88599.h b/intl/uconv/ucvlatin/nsUnicodeToISO88599.h index 69dab31f60d..218da7894c6 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISO88599.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISO88599.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISO88599_h___ #define nsUnicodeToISO88599_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISO88599 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToISO88599(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToISO88599_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToISOIR111.cpp b/intl/uconv/ucvlatin/nsUnicodeToISOIR111.cpp index 199a00e7c73..cf49caa44fe 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISOIR111.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToISOIR111.cpp @@ -55,18 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToISOIR111::nsUnicodeToISOIR111() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToISOIR111::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} - diff --git a/intl/uconv/ucvlatin/nsUnicodeToISOIR111.h b/intl/uconv/ucvlatin/nsUnicodeToISOIR111.h index a98a8271fa0..9244a0ef4b4 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToISOIR111.h +++ b/intl/uconv/ucvlatin/nsUnicodeToISOIR111.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToISOIR111_h___ #define nsUnicodeToISOIR111_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToISOIR111 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToISOIR111(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToISOIR111_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToKOI8R.cpp b/intl/uconv/ucvlatin/nsUnicodeToKOI8R.cpp index c7deeb1d051..be56292c9ff 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToKOI8R.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToKOI8R.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToKOI8R::nsUnicodeToKOI8R() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToKOI8R::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToKOI8R.h b/intl/uconv/ucvlatin/nsUnicodeToKOI8R.h index 4e9340061b6..f52c78fdf51 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToKOI8R.h +++ b/intl/uconv/ucvlatin/nsUnicodeToKOI8R.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToKOI8R_h___ #define nsUnicodeToKOI8R_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToKOI8R [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToKOI8R(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToKOI8R_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToKOI8U.cpp b/intl/uconv/ucvlatin/nsUnicodeToKOI8U.cpp index 21a40a14c89..05abaf6dba9 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToKOI8U.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToKOI8U.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToKOI8U::nsUnicodeToKOI8U() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToKOI8U::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToKOI8U.h b/intl/uconv/ucvlatin/nsUnicodeToKOI8U.h index b4c32da5249..903edbaef99 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToKOI8U.h +++ b/intl/uconv/ucvlatin/nsUnicodeToKOI8U.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToKOI8U_h___ #define nsUnicodeToKOI8U_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToKOI8U [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToKOI8U(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToKOI8U_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic8.cpp b/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic8.cpp index 842ee90acb3..d724452b291 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic8.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToLangBoxArabic8.cpp @@ -39,7 +39,7 @@ #include "nsUnicodeToLangBoxArabic8.h" -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToLangBoxArabic8 [declaration] @@ -52,7 +52,7 @@ public: /** * Class constructor. */ - nsUnicodeToLangBoxArabic8() {}; + nsUnicodeToLangBoxArabic8() : nsBasicEncoder(1) {}; virtual ~nsUnicodeToLangBoxArabic8() {}; NS_IMETHOD Convert( @@ -62,10 +62,6 @@ public: NS_IMETHOD Finish( char * aDest, PRInt32 * aDestLength); - NS_IMETHOD GetMaxLength( - const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); - NS_IMETHOD Reset(); NS_IMETHOD SetOutputErrorBehavior( @@ -151,14 +147,6 @@ NS_IMETHODIMP nsUnicodeToLangBoxArabic8::Finish( return NS_OK; } -NS_IMETHODIMP nsUnicodeToLangBoxArabic8::GetMaxLength( - const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK; -} - NS_IMETHODIMP nsUnicodeToLangBoxArabic8::Reset() { return NS_OK; diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacArabic.cpp b/intl/uconv/ucvlatin/nsUnicodeToMacArabic.cpp index d25d08c40a6..de4d35c7969 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacArabic.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToMacArabic.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToMacArabic::nsUnicodeToMacArabic() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToMacArabic::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacArabic.h b/intl/uconv/ucvlatin/nsUnicodeToMacArabic.h index 4ff19fb3d83..671b1dcd6c1 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacArabic.h +++ b/intl/uconv/ucvlatin/nsUnicodeToMacArabic.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToMacArabic_h___ #define nsUnicodeToMacArabic_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToMacArabic [declaration] @@ -56,13 +56,6 @@ public: */ nsUnicodeToMacArabic(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToMacArabic_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacCE.cpp b/intl/uconv/ucvlatin/nsUnicodeToMacCE.cpp index 781da96f8ab..9fb57d4808a 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacCE.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToMacCE.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_MacCEShiftTable[] = { nsUnicodeToMacCE::nsUnicodeToMacCE() : nsTableEncoderSupport((uShiftTable*) &g_MacCEShiftTable, - (uMappingTable*) &g_MacCEMappingTable) + (uMappingTable*) &g_MacCEMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToMacCE::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacCE.h b/intl/uconv/ucvlatin/nsUnicodeToMacCE.h index 137e8c31fd3..86fef16af96 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacCE.h +++ b/intl/uconv/ucvlatin/nsUnicodeToMacCE.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToMacCE_h___ #define nsUnicodeToMacCE_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToMacCE [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToMacCE(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToMacCE_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacCroatian.cpp b/intl/uconv/ucvlatin/nsUnicodeToMacCroatian.cpp index 152d7c5c9a1..11bc83957d5 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacCroatian.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToMacCroatian.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToMacCroatian::nsUnicodeToMacCroatian() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToMacCroatian::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacCroatian.h b/intl/uconv/ucvlatin/nsUnicodeToMacCroatian.h index 85d9fe04b48..27da04de4c2 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacCroatian.h +++ b/intl/uconv/ucvlatin/nsUnicodeToMacCroatian.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToMacCroatian_h___ #define nsUnicodeToMacCroatian_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToMacCroatian [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToMacCroatian(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToMacCroatian_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacCyrillic.cpp b/intl/uconv/ucvlatin/nsUnicodeToMacCyrillic.cpp index 3aaadc042e0..aefd3b33dd6 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacCyrillic.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToMacCyrillic.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToMacCyrillic::nsUnicodeToMacCyrillic() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToMacCyrillic::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacCyrillic.h b/intl/uconv/ucvlatin/nsUnicodeToMacCyrillic.h index b3af84335a2..a7423223036 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacCyrillic.h +++ b/intl/uconv/ucvlatin/nsUnicodeToMacCyrillic.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToMacCyrillic_h___ #define nsUnicodeToMacCyrillic_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToMacCyrillic [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToMacCyrillic(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToMacCyrillic_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacDevanagari.cpp b/intl/uconv/ucvlatin/nsUnicodeToMacDevanagari.cpp index 0ee9969f064..a4fb74d4049 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacDevanagari.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToMacDevanagari.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToMacDevanagari::nsUnicodeToMacDevanagari() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToMacDevanagari::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacDevanagari.h b/intl/uconv/ucvlatin/nsUnicodeToMacDevanagari.h index 5070ee43b34..42f621dd0ba 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacDevanagari.h +++ b/intl/uconv/ucvlatin/nsUnicodeToMacDevanagari.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToMacDevanagari_h___ #define nsUnicodeToMacDevanagari_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToMacDevanagari [declaration] @@ -56,13 +56,6 @@ public: */ nsUnicodeToMacDevanagari(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToMacDevanagari_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacFarsi.cpp b/intl/uconv/ucvlatin/nsUnicodeToMacFarsi.cpp index 305991f3913..5014a7103ed 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacFarsi.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToMacFarsi.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToMacFarsi::nsUnicodeToMacFarsi() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToMacFarsi::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacFarsi.h b/intl/uconv/ucvlatin/nsUnicodeToMacFarsi.h index 95b1542b514..f39aaeac72b 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacFarsi.h +++ b/intl/uconv/ucvlatin/nsUnicodeToMacFarsi.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToMacFarsi_h___ #define nsUnicodeToMacFarsi_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToMacFarsi [declaration] @@ -56,13 +56,6 @@ public: */ nsUnicodeToMacFarsi(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToMacFarsi_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacGreek.cpp b/intl/uconv/ucvlatin/nsUnicodeToMacGreek.cpp index effb74db23e..207710e8e74 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacGreek.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToMacGreek.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_MacGreekShiftTable[] = { nsUnicodeToMacGreek::nsUnicodeToMacGreek() : nsTableEncoderSupport((uShiftTable*) &g_MacGreekShiftTable, - (uMappingTable*) &g_MacGreekMappingTable) + (uMappingTable*) &g_MacGreekMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToMacGreek::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacGreek.h b/intl/uconv/ucvlatin/nsUnicodeToMacGreek.h index 1bf6d986820..6ba8e2dcea7 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacGreek.h +++ b/intl/uconv/ucvlatin/nsUnicodeToMacGreek.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToMacGreek_h___ #define nsUnicodeToMacGreek_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToMacGreek [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToMacGreek(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToMacGreek_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacGujarati.cpp b/intl/uconv/ucvlatin/nsUnicodeToMacGujarati.cpp index be8a2e080b6..38e67a56530 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacGujarati.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToMacGujarati.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToMacGujarati::nsUnicodeToMacGujarati() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToMacGujarati::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacGujarati.h b/intl/uconv/ucvlatin/nsUnicodeToMacGujarati.h index bf5f2b1256e..18336ddd1ac 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacGujarati.h +++ b/intl/uconv/ucvlatin/nsUnicodeToMacGujarati.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToMacGujarati_h___ #define nsUnicodeToMacGujarati_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToMacGujarati [declaration] @@ -56,13 +56,6 @@ public: */ nsUnicodeToMacGujarati(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToMacGujarati_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacGurmukhi.cpp b/intl/uconv/ucvlatin/nsUnicodeToMacGurmukhi.cpp index 18200c570e5..fb2df23bf5b 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacGurmukhi.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToMacGurmukhi.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToMacGurmukhi::nsUnicodeToMacGurmukhi() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToMacGurmukhi::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacGurmukhi.h b/intl/uconv/ucvlatin/nsUnicodeToMacGurmukhi.h index ff6725e34e9..93f5b1972f3 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacGurmukhi.h +++ b/intl/uconv/ucvlatin/nsUnicodeToMacGurmukhi.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToMacGurmukhi_h___ #define nsUnicodeToMacGurmukhi_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToMacGurmukhi [declaration] @@ -56,13 +56,6 @@ public: */ nsUnicodeToMacGurmukhi(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToMacGurmukhi_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacHebrew.cpp b/intl/uconv/ucvlatin/nsUnicodeToMacHebrew.cpp index 542567a95d0..17d4a637b4c 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacHebrew.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToMacHebrew.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToMacHebrew::nsUnicodeToMacHebrew() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToMacHebrew::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacHebrew.h b/intl/uconv/ucvlatin/nsUnicodeToMacHebrew.h index 46643fee2f5..ba59021424f 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacHebrew.h +++ b/intl/uconv/ucvlatin/nsUnicodeToMacHebrew.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToMacHebrew_h___ #define nsUnicodeToMacHebrew_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToMacHebrew [declaration] @@ -56,13 +56,6 @@ public: */ nsUnicodeToMacHebrew(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToMacHebrew_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacIcelandic.cpp b/intl/uconv/ucvlatin/nsUnicodeToMacIcelandic.cpp index 2a163c0ee79..c96fb63a915 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacIcelandic.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToMacIcelandic.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToMacIcelandic::nsUnicodeToMacIcelandic() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToMacIcelandic::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacIcelandic.h b/intl/uconv/ucvlatin/nsUnicodeToMacIcelandic.h index ce479d61b4b..103e1365594 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacIcelandic.h +++ b/intl/uconv/ucvlatin/nsUnicodeToMacIcelandic.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToMacIcelandic_h___ #define nsUnicodeToMacIcelandic_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToMacIcelandic [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToMacIcelandic(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToMacIcelandic_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacRomanian.cpp b/intl/uconv/ucvlatin/nsUnicodeToMacRomanian.cpp index 252ec39035a..5acaf974b3d 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacRomanian.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToMacRomanian.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToMacRomanian::nsUnicodeToMacRomanian() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToMacRomanian::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacRomanian.h b/intl/uconv/ucvlatin/nsUnicodeToMacRomanian.h index 4fe3dbd50f4..2f371c10424 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacRomanian.h +++ b/intl/uconv/ucvlatin/nsUnicodeToMacRomanian.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToMacRomanian_h___ #define nsUnicodeToMacRomanian_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToMacRomanian [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToMacRomanian(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToMacRomanian_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacTurkish.cpp b/intl/uconv/ucvlatin/nsUnicodeToMacTurkish.cpp index 00177b40e84..177c79e2581 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacTurkish.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToMacTurkish.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_MacTurkishShiftTable[] = { nsUnicodeToMacTurkish::nsUnicodeToMacTurkish() : nsTableEncoderSupport((uShiftTable*) &g_MacTurkishShiftTable, - (uMappingTable*) &g_MacTurkishMappingTable) + (uMappingTable*) &g_MacTurkishMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToMacTurkish::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacTurkish.h b/intl/uconv/ucvlatin/nsUnicodeToMacTurkish.h index ba0b89834e0..d86297091ec 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacTurkish.h +++ b/intl/uconv/ucvlatin/nsUnicodeToMacTurkish.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToMacTurkish_h___ #define nsUnicodeToMacTurkish_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToMacTurkish [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToMacTurkish(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToMacTurkish_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacUkrainian.cpp b/intl/uconv/ucvlatin/nsUnicodeToMacUkrainian.cpp index be8280b034c..785cfc962bb 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacUkrainian.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToMacUkrainian.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToMacUkrainian::nsUnicodeToMacUkrainian() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToMacUkrainian::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToMacUkrainian.h b/intl/uconv/ucvlatin/nsUnicodeToMacUkrainian.h index 7c0ff929479..fd5c288b936 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToMacUkrainian.h +++ b/intl/uconv/ucvlatin/nsUnicodeToMacUkrainian.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToMacUkrainian_h___ #define nsUnicodeToMacUkrainian_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToMacUkrainian [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToMacUkrainian(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToMacUkrainian_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToSymbol.cpp b/intl/uconv/ucvlatin/nsUnicodeToSymbol.cpp index 5b22107a45f..208b6b2efd1 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToSymbol.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToSymbol.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToSymbol::nsUnicodeToSymbol() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToSymbol::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToSymbol.h b/intl/uconv/ucvlatin/nsUnicodeToSymbol.h index 70dd68aefda..f69a5441811 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToSymbol.h +++ b/intl/uconv/ucvlatin/nsUnicodeToSymbol.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToSymbol_h___ #define nsUnicodeToSymbol_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToSymbol [declaration] @@ -57,13 +57,6 @@ public: */ nsUnicodeToSymbol(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToSymbol_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToT61.cpp b/intl/uconv/ucvlatin/nsUnicodeToT61.cpp index 88b94cbaf74..27fa7540461 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToT61.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToT61.cpp @@ -56,17 +56,6 @@ static const PRInt16 g_T61ShiftTable[] = { nsUnicodeToT61::nsUnicodeToT61() : nsTableEncoderSupport((uShiftTable*) &g_T61ShiftTable, - (uMappingTable*) &g_T61MappingTable) + (uMappingTable*) &g_T61MappingTable, 2) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToT61::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2*aSrcLength; - return NS_OK; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToT61.h b/intl/uconv/ucvlatin/nsUnicodeToT61.h index 8e95a2dc19c..fe49580068b 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToT61.h +++ b/intl/uconv/ucvlatin/nsUnicodeToT61.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToT61_h___ #define nsUnicodeToT61_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToT61 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToT61(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToT61_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToTCVN5712.cpp b/intl/uconv/ucvlatin/nsUnicodeToTCVN5712.cpp index af569506c66..8ec3c6ce044 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToTCVN5712.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToTCVN5712.cpp @@ -55,17 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToTCVN5712::nsUnicodeToTCVN5712() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToTCVN5712::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToTCVN5712.h b/intl/uconv/ucvlatin/nsUnicodeToTCVN5712.h index 59c150ace61..453673f1b6d 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToTCVN5712.h +++ b/intl/uconv/ucvlatin/nsUnicodeToTCVN5712.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToTCVN5712_h___ #define nsUnicodeToTCVN5712_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToTCVN5712 [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToTCVN5712(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToTCVN5712_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp b/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp index 8bafbe0636d..9bf3b0f8d72 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.cpp @@ -56,20 +56,13 @@ static const PRInt16 g_UCS2BEShiftTable[] = { nsUnicodeToUCS2BE::nsUnicodeToUCS2BE() : nsTableEncoderSupport((uShiftTable*) &g_UCS2BEShiftTable, - (uMappingTable*) &g_UCS2BEMappingTable) + (uMappingTable*) &g_UCS2BEMappingTable, 2) { } //---------------------------------------------------------------------- // Subclassing of nsTableEncoderSupport class [implementation] -NS_IMETHODIMP nsUnicodeToUCS2BE::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2*aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} NS_IMETHODIMP nsUnicodeToUCS2BE::FillInfo(PRUint32 *aInfo) { memset(aInfo, 0xFF, (0x10000L >> 3)); diff --git a/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h b/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h index f958a70d172..5e22938f54b 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h +++ b/intl/uconv/ucvlatin/nsUnicodeToUCS2BE.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToUCS2BE_h___ #define nsUnicodeToUCS2BE_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToUCS2BE [declaration] @@ -61,13 +61,6 @@ public: NS_IMETHOD FillInfo(PRUint32* aInfo); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; nsresult NEW_UnicodeToUTF16BE(nsISupports **Result); diff --git a/intl/uconv/ucvlatin/nsUnicodeToUCS2LE.cpp b/intl/uconv/ucvlatin/nsUnicodeToUCS2LE.cpp index 4a05b1457af..e69de29bb2d 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUCS2LE.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToUCS2LE.cpp @@ -1,77 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsUnicodeToUCS2LE.h" -#include - -//---------------------------------------------------------------------- -// Global functions and data [declaration] - -static const PRUint16 g_UCS2LEMappingTable[] = { - 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0000 -}; - -static const PRInt16 g_UCS2LEShiftTable[] = { - 0, u2BytesSwapCharset, - ShiftCell(0, 0, 0, 0, 0, 0, 0, 0) -}; - -//---------------------------------------------------------------------- -// Class nsUnicodeToUCS2LE [implementation] - -nsUnicodeToUCS2LE::nsUnicodeToUCS2LE() -: nsTableEncoderSupport((uShiftTable*) &g_UCS2LEShiftTable, - (uMappingTable*) &g_UCS2LEMappingTable) -{ -} - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToUCS2LE::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2*aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} -NS_IMETHODIMP nsUnicodeToUCS2LE::FillInfo(PRUint32 *aInfo) -{ - memset(aInfo, 0xFF, (0x10000L >> 3)); - return NS_OK; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToUCS2LE.h b/intl/uconv/ucvlatin/nsUnicodeToUCS2LE.h index 5e9e93fa351..e69de29bb2d 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUCS2LE.h +++ b/intl/uconv/ucvlatin/nsUnicodeToUCS2LE.h @@ -1,73 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef nsUnicodeToUCS2LE_h___ -#define nsUnicodeToUCS2LE_h___ - -#include "nsUCvLatinSupport.h" - -//---------------------------------------------------------------------- -// Class nsUnicodeToUCS2LE [declaration] - -/** - * A character set converter from Unicode to UCS2LE. - * - * @created 05/Apr/1999 - * @author Catalin Rotaru [CATA] - */ -class nsUnicodeToUCS2LE : public nsTableEncoderSupport -{ -public: - - /** - * Class constructor. - */ - nsUnicodeToUCS2LE(); - - NS_IMETHOD FillInfo(PRUint32* aInfo); - -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); -}; - -#endif /* nsUnicodeToUCS2LE_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToUCS4BE.cpp b/intl/uconv/ucvlatin/nsUnicodeToUCS4BE.cpp index 993138ba6f9..e69de29bb2d 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUCS4BE.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToUCS4BE.cpp @@ -1,77 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsUnicodeToUCS4BE.h" -#include - -//---------------------------------------------------------------------- -// Global functions and data [declaration] - -static const PRUint16 g_UCS4BEMappingTable[] = { - 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0000 -}; - -static const PRInt16 g_UCS4BEShiftTable[] = { - 0, u4BytesCharset, - ShiftCell(0, 0, 0, 0, 0, 0, 0, 0) -}; - -//---------------------------------------------------------------------- -// Class nsUnicodeToUCS4BE [implementation] - -nsUnicodeToUCS4BE::nsUnicodeToUCS4BE() -: nsTableEncoderSupport((uShiftTable*) &g_UCS4BEShiftTable, - (uMappingTable*) &g_UCS4BEMappingTable) -{ -} - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToUCS4BE::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 4*aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} -NS_IMETHODIMP nsUnicodeToUCS4BE::FillInfo(PRUint32 *aInfo) -{ - memset(aInfo, 0xFF, (0x10000L >> 3)); - return NS_OK; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToUCS4BE.h b/intl/uconv/ucvlatin/nsUnicodeToUCS4BE.h index b448be870aa..e69de29bb2d 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUCS4BE.h +++ b/intl/uconv/ucvlatin/nsUnicodeToUCS4BE.h @@ -1,72 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef nsUnicodeToUCS4BE_h___ -#define nsUnicodeToUCS4BE_h___ - -#include "nsUCvLatinSupport.h" - -//---------------------------------------------------------------------- -// Class nsUnicodeToUCS4BE [declaration] - -/** - * A character set converter from Unicode to UCS4BE. - * - * @created 05/Apr/1999 - */ -class nsUnicodeToUCS4BE : public nsTableEncoderSupport -{ -public: - - /** - * Class constructor. - */ - nsUnicodeToUCS4BE(); - - NS_IMETHOD FillInfo(PRUint32* aInfo); - -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); -}; - -#endif /* nsUnicodeToUCS4BE_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToUCS4LE.cpp b/intl/uconv/ucvlatin/nsUnicodeToUCS4LE.cpp index 0adcbea062d..e69de29bb2d 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUCS4LE.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToUCS4LE.cpp @@ -1,77 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#include "nsUnicodeToUCS4LE.h" -#include - -//---------------------------------------------------------------------- -// Global functions and data [declaration] - -static const PRUint16 g_UCS4LEMappingTable[] = { - 0x0001, 0x0004, 0x0005, 0x0008, 0x0000, 0x0000, 0xFFFF, 0x0000 -}; - -static const PRInt16 g_UCS4LEShiftTable[] = { - 0, u4BytesSwapCharset, - ShiftCell(0, 0, 0, 0, 0, 0, 0, 0) -}; - -//---------------------------------------------------------------------- -// Class nsUnicodeToUCS4LE [implementation] - -nsUnicodeToUCS4LE::nsUnicodeToUCS4LE() -: nsTableEncoderSupport((uShiftTable*) &g_UCS4LEShiftTable, - (uMappingTable*) &g_UCS4LEMappingTable) -{ -} - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToUCS4LE::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 4*aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} -NS_IMETHODIMP nsUnicodeToUCS4LE::FillInfo(PRUint32 *aInfo) -{ - memset(aInfo, 0xFF, (0x10000L >> 3)); - return NS_OK; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToUCS4LE.h b/intl/uconv/ucvlatin/nsUnicodeToUCS4LE.h index 108232dfc48..e69de29bb2d 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUCS4LE.h +++ b/intl/uconv/ucvlatin/nsUnicodeToUCS4LE.h @@ -1,73 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is Mozilla Communicator client code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -#ifndef nsUnicodeToUCS4LE_h___ -#define nsUnicodeToUCS4LE_h___ - -#include "nsUCvLatinSupport.h" - -//---------------------------------------------------------------------- -// Class nsUnicodeToUCS4LE [declaration] - -/** - * A character set converter from Unicode to UCS4LE. - * - * @created 05/Apr/1999 - * @author Catalin Rotaru [CATA] - */ -class nsUnicodeToUCS4LE : public nsTableEncoderSupport -{ -public: - - /** - * Class constructor. - */ - nsUnicodeToUCS4LE(); - - NS_IMETHOD FillInfo(PRUint32* aInfo); - -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); -}; - -#endif /* nsUnicodeToUCS4LE_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToUEscape.cpp b/intl/uconv/ucvlatin/nsUnicodeToUEscape.cpp index 7fa81255e44..e1aa753bd24 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUEscape.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToUEscape.cpp @@ -38,7 +38,7 @@ #include "nsUnicodeToUEscape.h" -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" #include char hexarray[]="0123456789ABCDEF"; diff --git a/intl/uconv/ucvlatin/nsUnicodeToUEscape.h b/intl/uconv/ucvlatin/nsUnicodeToUEscape.h index 8d7f505771b..0a3fe20b7af 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUEscape.h +++ b/intl/uconv/ucvlatin/nsUnicodeToUEscape.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToUEscape_h___ #define nsUnicodeToUEscape_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" #include "nsISupports.h" // XXX should we inherited from nsEncoderSupprt ? We don't want the buffer stuff there @@ -50,7 +50,7 @@ public: /** * Class constructor. */ - nsUnicodeToUEscape() {}; + nsUnicodeToUEscape() : nsEncoderSupport(6) {}; NS_IMETHOD FillInfo(PRUint32* aInfo) { @@ -74,13 +74,6 @@ protected: //-------------------------------------------------------------------- // Subclassing of nsEncoderSupport class [declaration] - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength) - { - *aDestLength = 6*aSrcLength; - return NS_OK; - }; - NS_IMETHOD ConvertNoBuffNoErr(const PRUnichar * aSrc, PRInt32 * aSrcLength, char * aDest, PRInt32 * aDestLength) { diff --git a/intl/uconv/ucvlatin/nsUnicodeToUTF7.cpp b/intl/uconv/ucvlatin/nsUnicodeToUTF7.cpp index b7fff352ba8..ae93cff7c8b 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUTF7.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToUTF7.cpp @@ -49,7 +49,7 @@ // Class nsBasicUTF7Encoder [implementation] nsBasicUTF7Encoder::nsBasicUTF7Encoder(char aLastChar, char aEscChar) -: nsEncoderSupport() +: nsEncoderSupport(5) { mLastChar = aLastChar; mEscChar = aEscChar; @@ -296,15 +296,6 @@ NS_IMETHODIMP nsBasicUTF7Encoder::FinishNoBuff(char * aDest, return ShiftEncoding(ENC_DIRECT, aDest, aDestLength); } -NS_IMETHODIMP nsBasicUTF7Encoder::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - // worst case - *aDestLength = 5*aSrcLength; - return NS_OK; -} - NS_IMETHODIMP nsBasicUTF7Encoder::Reset() { mEncoding = ENC_DIRECT; diff --git a/intl/uconv/ucvlatin/nsUnicodeToUTF7.h b/intl/uconv/ucvlatin/nsUnicodeToUTF7.h index 9415388526c..f9fa862e0fb 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUTF7.h +++ b/intl/uconv/ucvlatin/nsUnicodeToUTF7.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToUTF7_h___ #define nsUnicodeToUTF7_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsBasicUTF7Encoder [declaration] @@ -84,8 +84,6 @@ protected: NS_IMETHOD ConvertNoBuffNoErr(const PRUnichar * aSrc, PRInt32 * aSrcLength, char * aDest, PRInt32 * aDestLength); NS_IMETHOD FinishNoBuff(char * aDest, PRInt32 * aDestLength); - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); NS_IMETHOD Reset(); }; diff --git a/intl/uconv/ucvlatin/nsUnicodeToUserDefined.cpp b/intl/uconv/ucvlatin/nsUnicodeToUserDefined.cpp index eb2b27cff85..7b4b9118289 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUserDefined.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToUserDefined.cpp @@ -55,18 +55,6 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToUserDefined::nsUnicodeToUserDefined() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToUserDefined::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} - diff --git a/intl/uconv/ucvlatin/nsUnicodeToUserDefined.h b/intl/uconv/ucvlatin/nsUnicodeToUserDefined.h index 75012f8f7f0..20e37311d22 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToUserDefined.h +++ b/intl/uconv/ucvlatin/nsUnicodeToUserDefined.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToUserDefined_h___ #define nsUnicodeToUserDefined_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToUserDefined [declaration] @@ -58,13 +58,6 @@ public: */ nsUnicodeToUserDefined(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToUserDefined_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToVISCII.cpp b/intl/uconv/ucvlatin/nsUnicodeToVISCII.cpp index 1695214c22b..4e1580122d7 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToVISCII.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToVISCII.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToVISCII::nsUnicodeToVISCII() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToVISCII::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToVISCII.h b/intl/uconv/ucvlatin/nsUnicodeToVISCII.h index f5b086e416c..d4c4b5997b9 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToVISCII.h +++ b/intl/uconv/ucvlatin/nsUnicodeToVISCII.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToVISCII_h___ #define nsUnicodeToVISCII_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToVISCII [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToVISCII(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToVISCII_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToVPS.cpp b/intl/uconv/ucvlatin/nsUnicodeToVPS.cpp index 7df18d6c49b..bf5fd94f22a 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToVPS.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToVPS.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToVPS::nsUnicodeToVPS() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToVPS::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToVPS.h b/intl/uconv/ucvlatin/nsUnicodeToVPS.h index 60314381482..775db9b9f74 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToVPS.h +++ b/intl/uconv/ucvlatin/nsUnicodeToVPS.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToVPS_h___ #define nsUnicodeToVPS_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToVPS [declaration] @@ -59,13 +59,6 @@ public: */ nsUnicodeToVPS(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToVPS_h___ */ diff --git a/intl/uconv/ucvlatin/nsUnicodeToZapfDingbat.cpp b/intl/uconv/ucvlatin/nsUnicodeToZapfDingbat.cpp index 66c42e0693f..b872eda183c 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToZapfDingbat.cpp +++ b/intl/uconv/ucvlatin/nsUnicodeToZapfDingbat.cpp @@ -55,17 +55,7 @@ static const PRInt16 g_ufShiftTable[] = { nsUnicodeToZapfDingbat::nsUnicodeToZapfDingbat() : nsTableEncoderSupport((uShiftTable*) &g_ufShiftTable, - (uMappingTable*) &g_ufMappingTable) + (uMappingTable*) &g_ufMappingTable, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToZapfDingbat::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvlatin/nsUnicodeToZapfDingbat.h b/intl/uconv/ucvlatin/nsUnicodeToZapfDingbat.h index 7e017dd6d49..8f0408a056f 100644 --- a/intl/uconv/ucvlatin/nsUnicodeToZapfDingbat.h +++ b/intl/uconv/ucvlatin/nsUnicodeToZapfDingbat.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToZapfDingbat_h___ #define nsUnicodeToZapfDingbat_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToZapfDingbat [declaration] @@ -57,13 +57,6 @@ public: */ nsUnicodeToZapfDingbat(); -protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToZapfDingbat_h___ */ diff --git a/intl/uconv/ucvlatin/nsUserDefinedToUnicode.h b/intl/uconv/ucvlatin/nsUserDefinedToUnicode.h index aa7ac4e1c9d..eb6cf1bccff 100644 --- a/intl/uconv/ucvlatin/nsUserDefinedToUnicode.h +++ b/intl/uconv/ucvlatin/nsUserDefinedToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsUserDefinedToUnicode_h___ #define nsUserDefinedToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUserDefinedToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsVISCIIToUnicode.h b/intl/uconv/ucvlatin/nsVISCIIToUnicode.h index ca2df1ff3aa..3580782c816 100644 --- a/intl/uconv/ucvlatin/nsVISCIIToUnicode.h +++ b/intl/uconv/ucvlatin/nsVISCIIToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsVISCIIToUnicode_h___ #define nsVISCIIToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsVISCIIToUnicode [declaration] diff --git a/intl/uconv/ucvlatin/nsVPSToUnicode.h b/intl/uconv/ucvlatin/nsVPSToUnicode.h index fc0686336fe..9e07dc2a171 100644 --- a/intl/uconv/ucvlatin/nsVPSToUnicode.h +++ b/intl/uconv/ucvlatin/nsVPSToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsVPSToUnicode_h___ #define nsVPSToUnicode_h___ -#include "nsUCvLatinSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsVPSToUnicode [declaration] diff --git a/intl/uconv/ucvmath/MANIFEST b/intl/uconv/ucvmath/MANIFEST deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvmath/Makefile.in b/intl/uconv/ucvmath/Makefile.in index 7b5f2e05fae..ca67376cacb 100644 --- a/intl/uconv/ucvmath/Makefile.in +++ b/intl/uconv/ucvmath/Makefile.in @@ -69,6 +69,7 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) include $(topsrcdir)/config/rules.mk +DEFINES += -D_IMPL_NS_INTL ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/intl/uconv/ucvtw/MANIFEST b/intl/uconv/ucvtw/MANIFEST deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvtw/Makefile.in b/intl/uconv/ucvtw/Makefile.in index 958dc786d00..fdf6d8ab6fc 100644 --- a/intl/uconv/ucvtw/Makefile.in +++ b/intl/uconv/ucvtw/Makefile.in @@ -27,10 +27,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = ucvtw -LIBRARY_NAME = ucvtw -EXPORT_LIBRARY = 1 -IS_COMPONENT = 1 +LIBRARY_NAME = ucvtw_s MODULE_NAME = nsUCvTWModule +FORCE_STATIC_LIB=1 REQUIRES = xpcom \ string \ uconv \ @@ -45,16 +44,15 @@ CPPSRCS = \ nsCP950ToUnicode.cpp \ nsUnicodeToCP950.cpp \ nsUnicodeToBIG5NoAscii.cpp \ - nsUCvTWSupport.cpp \ - nsUCvTwModule.cpp \ $(NULL) EXPORTS = nsUCvTWCID.h -EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) +LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk +DEFINES += -D_IMPL_NS_INTL ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/intl/uconv/ucvtw/nsBIG5HKSCSToUnicode.cpp b/intl/uconv/ucvtw/nsBIG5HKSCSToUnicode.cpp index c628dd2dab9..240b31a494c 100644 --- a/intl/uconv/ucvtw/nsBIG5HKSCSToUnicode.cpp +++ b/intl/uconv/ucvtw/nsBIG5HKSCSToUnicode.cpp @@ -88,19 +88,9 @@ nsBIG5HKSCSToUnicode::nsBIG5HKSCSToUnicode() : nsMultiTableDecoderSupport(6, (uRange* ) &g_BIG5HKSCSRanges, (uShiftTable**) &g_BIG5HKSCSShiftTableSet, - (uMappingTable**) &g_BIG5HKSCSMappingTableSet) + (uMappingTable**) &g_BIG5HKSCSMappingTableSet, + 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsMultiTableDecoderSupport class [implementation] - -NS_IMETHODIMP nsBIG5HKSCSToUnicode::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - // we are a single byte to Unicode converter, so... - *aDestLength = aSrcLength; - return NS_OK_UDEC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvtw/nsBIG5HKSCSToUnicode.h b/intl/uconv/ucvtw/nsBIG5HKSCSToUnicode.h index 5d3340a96b8..45dc38b2955 100644 --- a/intl/uconv/ucvtw/nsBIG5HKSCSToUnicode.h +++ b/intl/uconv/ucvtw/nsBIG5HKSCSToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsBIG5HKSCSToUnicode_h___ #define nsBIG5HKSCSToUnicode_h___ -#include "nsUCvTWSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsBIG5HKSCSToUnicode [declaration] @@ -60,12 +60,6 @@ public: nsBIG5HKSCSToUnicode(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsDecoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsBIG5HKSCSToUnicode_h___ */ diff --git a/intl/uconv/ucvtw/nsBIG5ToUnicode.cpp b/intl/uconv/ucvtw/nsBIG5ToUnicode.cpp index 34257bd3cad..b0f9ee4b394 100644 --- a/intl/uconv/ucvtw/nsBIG5ToUnicode.cpp +++ b/intl/uconv/ucvtw/nsBIG5ToUnicode.cpp @@ -75,19 +75,8 @@ nsBIG5ToUnicode::nsBIG5ToUnicode() : nsMultiTableDecoderSupport(2, (uRange* ) &g_BIG5Ranges, (uShiftTable**) &g_BIG5ShiftTableSet, - (uMappingTable**) &g_BIG5MappingTableSet) + (uMappingTable**) &g_BIG5MappingTableSet, 1) { } -//---------------------------------------------------------------------- -// Subclassing of nsMultiTableDecoderSupport class [implementation] - -NS_IMETHODIMP nsBIG5ToUnicode::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - // we are a single byte to Unicode converter, so... - *aDestLength = aSrcLength; - return NS_OK_UDEC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvtw/nsBIG5ToUnicode.h b/intl/uconv/ucvtw/nsBIG5ToUnicode.h index 99e631c6a33..e49d72f8af9 100644 --- a/intl/uconv/ucvtw/nsBIG5ToUnicode.h +++ b/intl/uconv/ucvtw/nsBIG5ToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsBIG5ToUnicode_h___ #define nsBIG5ToUnicode_h___ -#include "nsUCvTWSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsBIG5ToUnicode [declaration] @@ -61,11 +61,6 @@ public: protected: - //-------------------------------------------------------------------- - // Subclassing of nsDecoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsBIG5ToUnicode_h___ */ diff --git a/intl/uconv/ucvtw/nsUCvTWSupport.cpp b/intl/uconv/ucvtw/nsUCvTWSupport.cpp deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvtw/nsUCvTWSupport.h b/intl/uconv/ucvtw/nsUCvTWSupport.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvtw/nsUnicodeToBIG5.cpp b/intl/uconv/ucvtw/nsUnicodeToBIG5.cpp index 677b9efede8..9e5ebf39bb6 100644 --- a/intl/uconv/ucvtw/nsUnicodeToBIG5.cpp +++ b/intl/uconv/ucvtw/nsUnicodeToBIG5.cpp @@ -69,19 +69,9 @@ static const PRUint16 *g_Big5ShiftTable[2] = { nsUnicodeToBIG5::nsUnicodeToBIG5() : nsMultiTableEncoderSupport(2, - (uShiftTable**) &g_Big5ShiftTable, - (uMappingTable**) &g_Big5MappingTable) + (uShiftTable**) &g_Big5ShiftTable, + (uMappingTable**) &g_Big5MappingTable, + 2 /* max length = src * 2 */) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToBIG5::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK; -} diff --git a/intl/uconv/ucvtw/nsUnicodeToBIG5.h b/intl/uconv/ucvtw/nsUnicodeToBIG5.h index f4776af0f93..357fa31d038 100644 --- a/intl/uconv/ucvtw/nsUnicodeToBIG5.h +++ b/intl/uconv/ucvtw/nsUnicodeToBIG5.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToBIG5_h___ #define nsUnicodeToBIG5_h___ -#include "nsUCvTWSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToBIG5 [declaration] @@ -60,12 +60,6 @@ public: nsUnicodeToBIG5(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToBIG5_h___ */ diff --git a/intl/uconv/ucvtw/nsUnicodeToBIG5HKSCS.cpp b/intl/uconv/ucvtw/nsUnicodeToBIG5HKSCS.cpp index d9c0d9d63d5..cd2197a361f 100644 --- a/intl/uconv/ucvtw/nsUnicodeToBIG5HKSCS.cpp +++ b/intl/uconv/ucvtw/nsUnicodeToBIG5HKSCS.cpp @@ -71,19 +71,10 @@ static const PRUint16 *g_Big5HKSCSShiftTable[] = { nsUnicodeToBIG5HKSCS::nsUnicodeToBIG5HKSCS() : nsMultiTableEncoderSupport(3, - (uShiftTable**) &g_Big5HKSCSShiftTable, - (uMappingTable**) &g_Big5HKSCSMappingTable) + (uShiftTable**) &g_Big5HKSCSShiftTable, + (uMappingTable**) &g_Big5HKSCSMappingTable, + 2 /* max length = src * 2 */) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToBIG5HKSCS::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK; -} diff --git a/intl/uconv/ucvtw/nsUnicodeToBIG5HKSCS.h b/intl/uconv/ucvtw/nsUnicodeToBIG5HKSCS.h index b54b0344693..c25b0b36dbd 100644 --- a/intl/uconv/ucvtw/nsUnicodeToBIG5HKSCS.h +++ b/intl/uconv/ucvtw/nsUnicodeToBIG5HKSCS.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToBIG5HKSCS_h___ #define nsUnicodeToBIG5HKSCS_h___ -#include "nsUCvTWSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToBIG5HKSCS [declaration] @@ -60,12 +60,6 @@ public: nsUnicodeToBIG5HKSCS(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToBIG5HKSCS_h___ */ diff --git a/intl/uconv/ucvtw/nsUnicodeToBIG5NoAscii.cpp b/intl/uconv/ucvtw/nsUnicodeToBIG5NoAscii.cpp index e20d27cb855..c632dc98b4a 100644 --- a/intl/uconv/ucvtw/nsUnicodeToBIG5NoAscii.cpp +++ b/intl/uconv/ucvtw/nsUnicodeToBIG5NoAscii.cpp @@ -53,21 +53,12 @@ static const PRUint16 gBig5ShiftTable[] = { nsUnicodeToBIG5NoAscii::nsUnicodeToBIG5NoAscii() : nsTableEncoderSupport( (uShiftTable*) &gBig5ShiftTable, - (uMappingTable*) &g_ufBig5Mapping) + (uMappingTable*) &g_ufBig5Mapping, + 2 /* max length = src * 2 */) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToBIG5NoAscii::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} NS_IMETHODIMP nsUnicodeToBIG5NoAscii::FillInfo(PRUint32 *aInfo) { nsresult rv = nsTableEncoderSupport::FillInfo(aInfo); // call the super class diff --git a/intl/uconv/ucvtw/nsUnicodeToBIG5NoAscii.h b/intl/uconv/ucvtw/nsUnicodeToBIG5NoAscii.h index 3dc46950ddd..9b7681d4ccf 100644 --- a/intl/uconv/ucvtw/nsUnicodeToBIG5NoAscii.h +++ b/intl/uconv/ucvtw/nsUnicodeToBIG5NoAscii.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToBIG5NoAscii_h___ #define nsUnicodeToBIG5NoAscii_h___ -#include "nsUCvTWSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToBIG5NoAscii [declaration] @@ -59,12 +59,6 @@ public: NS_IMETHOD FillInfo(PRUint32 *aInfo); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToBIG5NoAscii_h___ */ diff --git a/intl/uconv/ucvtw/nsUnicodeToHKSCS.cpp b/intl/uconv/ucvtw/nsUnicodeToHKSCS.cpp index 42bc41717af..f31f40a4c95 100644 --- a/intl/uconv/ucvtw/nsUnicodeToHKSCS.cpp +++ b/intl/uconv/ucvtw/nsUnicodeToHKSCS.cpp @@ -63,19 +63,9 @@ static const PRUint16 *g_Big5HKSCSShiftTable[] = { nsUnicodeToHKSCS::nsUnicodeToHKSCS() : nsMultiTableEncoderSupport(1, - (uShiftTable**) &g_Big5HKSCSShiftTable, - (uMappingTable**) &g_Big5HKSCSMappingTable) + (uShiftTable**) &g_Big5HKSCSShiftTable, + (uMappingTable**) &g_Big5HKSCSMappingTable, + 2 /* max length = src * 2 */) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToHKSCS::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK_UDEC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvtw/nsUnicodeToHKSCS.h b/intl/uconv/ucvtw/nsUnicodeToHKSCS.h index 97bc6d46585..e1be2a83aab 100644 --- a/intl/uconv/ucvtw/nsUnicodeToHKSCS.h +++ b/intl/uconv/ucvtw/nsUnicodeToHKSCS.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToHKSCS_h___ #define nsUnicodeToHKSCS_h___ -#include "nsUCvTWSupport.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToHKSCS [declaration] @@ -58,12 +58,6 @@ public: nsUnicodeToHKSCS(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToHKSCS_h___ */ diff --git a/intl/uconv/ucvtw2/MANIFEST b/intl/uconv/ucvtw2/MANIFEST deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvtw2/Makefile.in b/intl/uconv/ucvtw2/Makefile.in index 0996b03d6ea..b76b8b94bfa 100644 --- a/intl/uconv/ucvtw2/Makefile.in +++ b/intl/uconv/ucvtw2/Makefile.in @@ -27,9 +27,10 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = ucvtw2 -LIBRARY_NAME = ucvtw2 -EXPORT_LIBRARY = 1 -IS_COMPONENT = 1 +LIBRARY_NAME = ucvtw2_s +#EXPORT_LIBRARY = 1 +#IS_COMPONENT = 1 +FORCE_STATIC_LIB=1 MODULE_NAME = nsUCvTW2Module REQUIRES = xpcom \ string \ @@ -46,16 +47,20 @@ CPPSRCS = \ nsUnicodeToCNS11643p5.cpp \ nsUnicodeToCNS11643p6.cpp \ nsUnicodeToCNS11643p7.cpp \ - nsUCvTW2Support.cpp \ - nsUCvTw2Module.cpp \ +# nsUCvTw2Module.cpp \ $(NULL) +#SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)ucvutil_s.$(LIB_SUFFIX) + +LOCAL_INCLUDES = -I$(srcdir)/../util + EXPORTS = nsUCvTW2CID.h EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) include $(topsrcdir)/config/rules.mk +DEFINES += -D_IMPL_NS_INTL ifeq ($(OS_ARCH),WINNT) DEFINES += -DWIN32_LEAN_AND_MEAN endif diff --git a/intl/uconv/ucvtw2/nsEUCTWToUnicode.cpp b/intl/uconv/ucvtw2/nsEUCTWToUnicode.cpp index 155feb192eb..e9b1e96c4c3 100644 --- a/intl/uconv/ucvtw2/nsEUCTWToUnicode.cpp +++ b/intl/uconv/ucvtw2/nsEUCTWToUnicode.cpp @@ -119,20 +119,9 @@ static const uRange g_EUCTWRanges[] = { nsEUCTWToUnicode::nsEUCTWToUnicode() : nsMultiTableDecoderSupport(8, - (uRange*) &g_EUCTWRanges, - (uShiftTable**) &g_EUCTWShiftTableSet, - (uMappingTable**) &g_EUCTWMappingTableSet) + (uRange*) &g_EUCTWRanges, + (uShiftTable**) &g_EUCTWShiftTableSet, + (uMappingTable**) &g_EUCTWMappingTableSet, + 1) { } - -//---------------------------------------------------------------------- -// Subclassing of nsTablesDecoderSupport class [implementation] - -NS_IMETHODIMP nsEUCTWToUnicode::GetMaxLength(const char * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - // we are a single byte to Unicode converter, so... - *aDestLength = aSrcLength; - return NS_OK_UDEC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvtw2/nsEUCTWToUnicode.h b/intl/uconv/ucvtw2/nsEUCTWToUnicode.h index ef1860a84cb..131eff3903a 100644 --- a/intl/uconv/ucvtw2/nsEUCTWToUnicode.h +++ b/intl/uconv/ucvtw2/nsEUCTWToUnicode.h @@ -39,7 +39,7 @@ #ifndef nsEUCTWToUnicode_h___ #define nsEUCTWToUnicode_h___ -#include "nsUCvTW2Support.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsEUCTWToUnicode [declaration] @@ -61,11 +61,6 @@ public: protected: - //-------------------------------------------------------------------- - // Subclassing of nsDecoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const char * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsEUCTWToUnicode_h___ */ diff --git a/intl/uconv/ucvtw2/nsUCvTW2Support.cpp b/intl/uconv/ucvtw2/nsUCvTW2Support.cpp deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvtw2/nsUCvTW2Support.h b/intl/uconv/ucvtw2/nsUCvTW2Support.h deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p1.cpp b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p1.cpp index 202b4d70712..52af1945e6f 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p1.cpp +++ b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p1.cpp @@ -52,17 +52,8 @@ static PRInt16 g_ShiftTable[] = { nsUnicodeToCNS11643p1::nsUnicodeToCNS11643p1() : nsTableEncoderSupport((uShiftTable*) &g_ShiftTable, - (uMappingTable*) &g_ufCNS1MappingTable) + (uMappingTable*) &g_ufCNS1MappingTable, + 2 /* max length = src * 2 */) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCNS11643p1::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p1.h b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p1.h index a00b2df5109..fc8e5509c00 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p1.h +++ b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p1.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCNS11643p1_h___ #define nsUnicodeToCNS11643p1_h___ -#include "nsUCvTW2Support.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCNS11643p1 [declaration] @@ -60,12 +60,6 @@ public: nsUnicodeToCNS11643p1(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCNS11643p1_h___ */ diff --git a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p2.cpp b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p2.cpp index 21aa383648c..211a9e8072a 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p2.cpp +++ b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p2.cpp @@ -52,17 +52,8 @@ static PRInt16 g_ShiftTable[] = { nsUnicodeToCNS11643p2::nsUnicodeToCNS11643p2() : nsTableEncoderSupport((uShiftTable*) &g_ShiftTable, - (uMappingTable*) &g_ufCNS2MappingTable) + (uMappingTable*) &g_ufCNS2MappingTable, + 2 /* max length = src * 2 */) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCNS11643p2::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p2.h b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p2.h index b296762988f..72bc67eafcd 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p2.h +++ b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p2.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCNS11643p2_h___ #define nsUnicodeToCNS11643p2_h___ -#include "nsUCvTW2Support.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCNS11643p2 [declaration] @@ -60,12 +60,6 @@ public: nsUnicodeToCNS11643p2(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCNS11643p2_h___ */ diff --git a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p3.cpp b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p3.cpp index 94ecd2ee314..7b585b298a3 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p3.cpp +++ b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p3.cpp @@ -52,17 +52,8 @@ static PRInt16 g_ShiftTable[] = { nsUnicodeToCNS11643p3::nsUnicodeToCNS11643p3() : nsTableEncoderSupport((uShiftTable*) &g_ShiftTable, - (uMappingTable*) &g_ufCNS3MappingTable) + (uMappingTable*) &g_ufCNS3MappingTable, + 2 /* max length = src * 2 */) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCNS11643p3::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p3.h b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p3.h index 49ee1cc4bb9..561e10a7746 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p3.h +++ b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p3.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCNS11643p3_h___ #define nsUnicodeToCNS11643p3_h___ -#include "nsUCvTW2Support.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCNS11643p3 [declaration] @@ -60,12 +60,6 @@ public: nsUnicodeToCNS11643p3(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCNS11643p3_h___ */ diff --git a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p4.cpp b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p4.cpp index 3cc22479f61..a33426df73b 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p4.cpp +++ b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p4.cpp @@ -52,17 +52,8 @@ static PRInt16 g_ShiftTable[] = { nsUnicodeToCNS11643p4::nsUnicodeToCNS11643p4() : nsTableEncoderSupport((uShiftTable*) &g_ShiftTable, - (uMappingTable*) &g_ufCNS4MappingTable) + (uMappingTable*) &g_ufCNS4MappingTable, + 2 /* max length = src * 2 */) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCNS11643p4::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p4.h b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p4.h index cd887aa47d1..8d348826495 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p4.h +++ b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p4.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCNS11643p4_h___ #define nsUnicodeToCNS11643p4_h___ -#include "nsUCvTW2Support.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCNS11643p4 [declaration] @@ -60,12 +60,6 @@ public: nsUnicodeToCNS11643p4(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCNS11643p4_h___ */ diff --git a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p5.cpp b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p5.cpp index d20a33c819a..4014fb0fde7 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p5.cpp +++ b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p5.cpp @@ -52,17 +52,8 @@ static PRInt16 g_ShiftTable[] = { nsUnicodeToCNS11643p5::nsUnicodeToCNS11643p5() : nsTableEncoderSupport((uShiftTable*) &g_ShiftTable, - (uMappingTable*) &g_ufCNS5MappingTable) + (uMappingTable*) &g_ufCNS5MappingTable, + 2 /* max length = src * 2 */) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCNS11643p5::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p5.h b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p5.h index 2d2e9f9a753..96b60b5b0b4 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p5.h +++ b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p5.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCNS11643p5_h___ #define nsUnicodeToCNS11643p5_h___ -#include "nsUCvTW2Support.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCNS11643p5 [declaration] @@ -60,12 +60,6 @@ public: nsUnicodeToCNS11643p5(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCNS11643p5_h___ */ diff --git a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p6.cpp b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p6.cpp index f05ae40dd4a..9a351c0c808 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p6.cpp +++ b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p6.cpp @@ -52,17 +52,8 @@ static PRInt16 g_ShiftTable[] = { nsUnicodeToCNS11643p6::nsUnicodeToCNS11643p6() : nsTableEncoderSupport((uShiftTable*) &g_ShiftTable, - (uMappingTable*) &g_ufCNS6MappingTable) + (uMappingTable*) &g_ufCNS6MappingTable, + 2 /* max length = src * 2 */) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCNS11643p6::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p6.h b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p6.h index bfda8d986b7..dbdb5fbd863 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p6.h +++ b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p6.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCNS11643p6_h___ #define nsUnicodeToCNS11643p6_h___ -#include "nsUCvTW2Support.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCNS11643p6 [declaration] @@ -60,12 +60,6 @@ public: nsUnicodeToCNS11643p6(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCNS11643p6_h___ */ diff --git a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p7.cpp b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p7.cpp index 81a7c210583..de27edc4842 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p7.cpp +++ b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p7.cpp @@ -52,17 +52,8 @@ static PRInt16 g_ShiftTable[] = { nsUnicodeToCNS11643p7::nsUnicodeToCNS11643p7() : nsTableEncoderSupport((uShiftTable*) &g_ShiftTable, - (uMappingTable*) &g_ufCNS7MappingTable) + (uMappingTable*) &g_ufCNS7MappingTable, + 2 /* max length = src * 2 */) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToCNS11643p7::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 2 * aSrcLength; - return NS_OK_UENC_EXACTLENGTH; -} diff --git a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p7.h b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p7.h index e5472d24260..0a3126925da 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToCNS11643p7.h +++ b/intl/uconv/ucvtw2/nsUnicodeToCNS11643p7.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToCNS11643p7_h___ #define nsUnicodeToCNS11643p7_h___ -#include "nsUCvTW2Support.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToCNS11643p7 [declaration] @@ -60,12 +60,6 @@ public: nsUnicodeToCNS11643p7(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToCNS11643p7_h___ */ diff --git a/intl/uconv/ucvtw2/nsUnicodeToEUCTW.cpp b/intl/uconv/ucvtw2/nsUnicodeToEUCTW.cpp index 709f3e39c12..db0dbad7da3 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToEUCTW.cpp +++ b/intl/uconv/ucvtw2/nsUnicodeToEUCTW.cpp @@ -105,18 +105,9 @@ static const PRUint16 *g_EUCTWMappingTableSet [] ={ nsUnicodeToEUCTW::nsUnicodeToEUCTW() : nsMultiTableEncoderSupport( 8, - (uShiftTable**) &g_EUCTWShiftTableSet, - (uMappingTable**) &g_EUCTWMappingTableSet) + (uShiftTable**) &g_EUCTWShiftTableSet, + (uMappingTable**) &g_EUCTWMappingTableSet, + 4 /* max length = src * 4 */) { } -//---------------------------------------------------------------------- -// Subclassing of nsTableEncoderSupport class [implementation] - -NS_IMETHODIMP nsUnicodeToEUCTW::GetMaxLength(const PRUnichar * aSrc, - PRInt32 aSrcLength, - PRInt32 * aDestLength) -{ - *aDestLength = 4 * aSrcLength; - return NS_OK; -} diff --git a/intl/uconv/ucvtw2/nsUnicodeToEUCTW.h b/intl/uconv/ucvtw2/nsUnicodeToEUCTW.h index 39c95c5953b..3c7a7ec87a8 100644 --- a/intl/uconv/ucvtw2/nsUnicodeToEUCTW.h +++ b/intl/uconv/ucvtw2/nsUnicodeToEUCTW.h @@ -39,7 +39,7 @@ #ifndef nsUnicodeToEUCTW_h___ #define nsUnicodeToEUCTW_h___ -#include "nsUCvTW2Support.h" +#include "nsUCSupport.h" //---------------------------------------------------------------------- // Class nsUnicodeToEUCTW [declaration] @@ -60,12 +60,6 @@ public: nsUnicodeToEUCTW(); protected: - - //-------------------------------------------------------------------- - // Subclassing of nsEncoderSupport class [declaration] - - NS_IMETHOD GetMaxLength(const PRUnichar * aSrc, PRInt32 aSrcLength, - PRInt32 * aDestLength); }; #endif /* nsUnicodeToEUCTW_h___ */ diff --git a/xpinstall/packager/mac/browser.jst b/xpinstall/packager/mac/browser.jst index 5ee1cf49e70..93e374e09ae 100644 --- a/xpinstall/packager/mac/browser.jst +++ b/xpinstall/packager/mac/browser.jst @@ -5,6 +5,13 @@ function upgradeCleanup() deleteThisFile("Components", "DOMDataSource.shlb"); deleteThisFile("Components", "PSMGlue.shlb"); deleteThisFile("Components", "ucth.shlb"); + deleteThisFile("Components", "ucvja.shlb"); + deleteThisFile("Components", "ucvko.shlb"); + deleteThisFile("Components", "ucvtw.shlb"); + deleteThisFile("Components", "ucvtw2.shlb"); + deleteThisFile("Components", "ucvlatin.shlb"); + deleteThisFile("Components", "ucvcn.shlb"); + deleteThisFile("Components", "ucvibm.shlb"); deleteThisFile("Program", "defaults/pref/config.js"); deleteThisFile("Program", "defaults/pref/initpref.js"); deleteThisFile("Program", "defaults/pref/macxprefs.js"); diff --git a/xpinstall/packager/packages-mac b/xpinstall/packager/packages-mac index 27a87d23ebb..db7767af21a 100644 --- a/xpinstall/packager/packages-mac +++ b/xpinstall/packager/packages-mac @@ -181,13 +181,6 @@ viewer:Components:tmbm.xpt viewer:Components:txmgr.xpt viewer:Components:uconv.shlb viewer:Components:uconv.xpt -viewer:Components:ucvcn.shlb -viewer:Components:ucvibm.shlb -viewer:Components:ucvja.shlb -viewer:Components:ucvko.shlb -viewer:Components:ucvlatin.shlb -viewer:Components:ucvtw.shlb -viewer:Components:ucvtw2.shlb viewer:Components:unicharutil.xpt viewer:Components:uriloader.shlb viewer:Components:uriloader.xpt diff --git a/xpinstall/packager/packages-static-unix b/xpinstall/packager/packages-static-unix index 0ea6f1db0de..41d502b0787 100644 --- a/xpinstall/packager/packages-static-unix +++ b/xpinstall/packager/packages-static-unix @@ -102,7 +102,6 @@ bin/components/locale.xpt bin/components/mozbrwsr.xpt bin/components/mozcomps.xpt bin/components/mozfind.xpt -bin/components/mozucth.xpt bin/components/mozxfer.xpt bin/components/necko.xpt bin/components/mimetype.xpt diff --git a/xpinstall/packager/packages-unix b/xpinstall/packager/packages-unix index 9d56687a0cc..e50e436147e 100644 --- a/xpinstall/packager/packages-unix +++ b/xpinstall/packager/packages-unix @@ -149,13 +149,6 @@ bin/components/libstrres.so bin/components/libtxmgr.so bin/components/libtxtsvc.so bin/components/libuconv.so -bin/components/libucvcn.so -bin/components/libucvibm.so -bin/components/libucvja.so -bin/components/libucvko.so -bin/components/libucvlatin.so -bin/components/libucvtw.so -bin/components/libucvtw2.so bin/components/libucvmath.so bin/components/liburiloader.so bin/components/libwebbrwsr.so diff --git a/xpinstall/packager/packages-win b/xpinstall/packager/packages-win index d6e1fc249a9..5d3807051b5 100644 --- a/xpinstall/packager/packages-win +++ b/xpinstall/packager/packages-win @@ -204,13 +204,6 @@ bin\components\txmgr.xpt bin\components\txtsvc.dll bin\components\uconv.dll bin\components\uconv.xpt -bin\components\ucvcn.dll -bin\components\ucvibm.dll -bin\components\ucvja.dll -bin\components\ucvko.dll -bin\components\ucvlatin.dll -bin\components\ucvtw.dll -bin\components\ucvtw2.dll bin\components\ucvmath.dll bin\components\unicharutil.xpt bin\components\urildr.dll diff --git a/xpinstall/packager/unix/browser.jst b/xpinstall/packager/unix/browser.jst index c489d6a1892..6e94c0dc1cf 100644 --- a/xpinstall/packager/unix/browser.jst +++ b/xpinstall/packager/unix/browser.jst @@ -6,6 +6,13 @@ function upgradeCleanup() deleteThisFile("Components", "libpsmglue.so"); deleteThisFile("Components", "libsample.so"); deleteThisFile("Components", "nsSample.js"); + deleteThisFile("Components", "libucvja.so"); + deleteThisFile("Components", "libucvko.so"); + deleteThisFile("Components", "libucvtw.so"); + deleteThisFile("Components", "libucvtw2.so"); + deleteThisFile("Components", "libucvlatin.so"); + deleteThisFile("Components", "libucvcn.so"); + deleteThisFile("Components", "libucvibm.so"); deleteThisFile("Program", "defaults/pref/config.js"); deleteThisFile("Program", "defaults/pref/initpref.js"); deleteThisFile("Program", "defaults/wallet/URLFieldSchema.tbl"); diff --git a/xpinstall/packager/windows/browser.jst b/xpinstall/packager/windows/browser.jst index 2a0e3f35dd3..993a19ecb78 100644 --- a/xpinstall/packager/windows/browser.jst +++ b/xpinstall/packager/windows/browser.jst @@ -477,6 +477,13 @@ function upgradeCleanup() deleteThisFile("Components", "evntloop.dll"); deleteThisFile("Components", "nativapp.dll"); deleteThisFile("Components", "universalchardet.dll"); + deleteThisFile("Components", "ucvja.dll"); + deleteThisFile("Components", "ucvko.dll"); + deleteThisFile("Components", "ucvtw.dll"); + deleteThisFile("Components", "ucvtw2.dll"); + deleteThisFile("Components", "ucvlatin.dll"); + deleteThisFile("Components", "ucvcn.dll"); + deleteThisFile("Components", "ucvibm.dll"); deleteThisFile("Chrome", "chrome.rdf"); deleteThisFolder("Chrome", "overlayinfo"); }