rename CID for UCS2/UCS4 to UTF16/32. Add CID for UTF16/32

This commit is contained in:
ftang%netscape.com 1999-09-03 23:18:00 +00:00
Родитель 260f384c92
Коммит e49884b420
3 изменённых файлов: 44 добавлений и 32 удалений

Просмотреть файл

@ -80,10 +80,10 @@
mDecArray[i++].mCID = &kKOI8UToUnicodeCID;
mDecArray[i++].mCID = &kMUTF7ToUnicodeCID;
mDecArray[i++].mCID = &kUTF7ToUnicodeCID;
mDecArray[i++].mCID = &kUCS2BEToUnicodeCID;
mDecArray[i++].mCID = &kUCS2LEToUnicodeCID;
mDecArray[i++].mCID = &kUCS4BEToUnicodeCID;
mDecArray[i++].mCID = &kUCS4LEToUnicodeCID;
mDecArray[i++].mCID = &kUTF16BEToUnicodeCID;
mDecArray[i++].mCID = &kUTF16LEToUnicodeCID;
mDecArray[i++].mCID = &kUTF32BEToUnicodeCID;
mDecArray[i++].mCID = &kUTF32LEToUnicodeCID;
mDecArray[i++].mCID = &kT61ToUnicodeCID;
mDecArray[i++].mCID = &kUserDefinedToUnicodeCID;
mDecArray[i++].mCID = &kObsSJISToUnicodeCID;
@ -150,10 +150,10 @@
mEncArray[i++].mCID = &kUnicodeToKOI8UCID;
mEncArray[i++].mCID = &kUnicodeToMUTF7CID;
mEncArray[i++].mCID = &kUnicodeToUTF7CID;
mEncArray[i++].mCID = &kUnicodeToUCS2BECID;
mEncArray[i++].mCID = &kUnicodeToUCS2LECID;
mEncArray[i++].mCID = &kUnicodeToUCS4BECID;
mEncArray[i++].mCID = &kUnicodeToUCS4LECID;
mEncArray[i++].mCID = &kUnicodeToUTF16BECID;
mEncArray[i++].mCID = &kUnicodeToUTF16LECID;
mEncArray[i++].mCID = &kUnicodeToUTF32BECID;
mEncArray[i++].mCID = &kUnicodeToUTF32LECID;
mEncArray[i++].mCID = &kUnicodeToT61CID;
mEncArray[i++].mCID = &kUnicodeToUserDefinedCID;
mEncArray[i++].mCID = &kUnicodeToJISx0201CID;

Просмотреть файл

@ -452,14 +452,14 @@ NS_DECLARE_ID(kUnicodeToISO885910CID,
NS_DECLARE_ID(kUnicodeToISO885913CID,
0xba6151ac, 0x1dfa, 0x11d3, 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
// Class ID for our UnicodeToUCS2BE charset converter
// Class ID for our UnicodeToUTF16BE charset converter
// {BA6151AD-1DFA-11d3-B3BF-00805F8A6670}
NS_DECLARE_ID(kUnicodeToUCS2BECID,
NS_DECLARE_ID(kUnicodeToUTF16BECID,
0xba6151ad, 0x1dfa, 0x11d3, 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
// Class ID for our UnicodeToUCS4BE charset converter
// Class ID for our UnicodeToUTF32BE charset converter
// {BA6151AE-1DFA-11d3-B3BF-00805F8A6670}
NS_DECLARE_ID(kUnicodeToUCS4BECID,
NS_DECLARE_ID(kUnicodeToUTF32BECID,
0xba6151ae, 0x1dfa, 0x11d3, 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
// Class ID for our UnicodeToT61 charset converter
@ -477,14 +477,14 @@ NS_DECLARE_ID(kISO885910ToUnicodeCID,
NS_DECLARE_ID(kISO885913ToUnicodeCID,
0xba6151b1, 0x1dfa, 0x11d3, 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
// Class ID for our UCS2BEToUnicode charset converter
// Class ID for our UTF16BEToUnicode charset converter
// {BA6151B2-1DFA-11d3-B3BF-00805F8A6670}
NS_DECLARE_ID(kUCS2BEToUnicodeCID,
NS_DECLARE_ID(kUTF16BEToUnicodeCID,
0xba6151b2, 0x1dfa, 0x11d3, 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
// Class ID for our UCS4BEToUnicode charset converter
// Class ID for our UTF32BEToUnicode charset converter
// {BA6151B3-1DFA-11d3-B3BF-00805F8A6670}
NS_DECLARE_ID(kUCS4BEToUnicodeCID,
NS_DECLARE_ID(kUTF32BEToUnicodeCID,
0xba6151b3, 0x1dfa, 0x11d3, 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
// Class ID for our T61ToUnicode charset converter
@ -493,25 +493,25 @@ NS_DECLARE_ID(kT61ToUnicodeCID,
0xba6151b4, 0x1dfa, 0x11d3, 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
// Class ID for our UnicodeToUCS2LE charset converter
// Class ID for our UnicodeToUTF16LE charset converter
// {BA6151B5-1DFA-11d3-B3BF-00805F8A6670}
NS_DECLARE_ID(kUnicodeToUCS2LECID,
NS_DECLARE_ID(kUnicodeToUTF16LECID,
0xba6151b5, 0x1dfa, 0x11d3, 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
// Class ID for our UnicodeToUCS4LE charset converter
// Class ID for our UnicodeToUTF32LE charset converter
// {BA6151B6-1DFA-11d3-B3BF-00805F8A6670}
NS_DECLARE_ID(kUnicodeToUCS4LECID,
NS_DECLARE_ID(kUnicodeToUTF32LECID,
0xba6151b6, 0x1dfa, 0x11d3, 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
// Class ID for our UCS2LEToUnicode charset converter
// Class ID for our UTF16LEToUnicode charset converter
// {BA6151B7-1DFA-11d3-B3BF-00805F8A6670}
NS_DECLARE_ID(kUCS2LEToUnicodeCID,
NS_DECLARE_ID(kUTF16LEToUnicodeCID,
0xba6151b7, 0x1dfa, 0x11d3, 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
// Class ID for our UCS4LEToUnicode charset converter
// Class ID for our UTF32LEToUnicode charset converter
// {BA6151B8-1DFA-11d3-B3BF-00805F8A6670}
NS_DECLARE_ID(kUCS4LEToUnicodeCID,
NS_DECLARE_ID(kUTF32LEToUnicodeCID,
0xba6151b8, 0x1dfa, 0x11d3, 0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
// Class ID for our ISOIR111ToUnicode charset converter
@ -568,5 +568,17 @@ NS_DECLARE_ID(kUEscapeToUnicodeCID,
NS_DECLARE_ID(kUnicodeToUEscapeCID,
0x319ff9c3, 0x51d2, 0x11d3, 0xb3, 0xc3, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
// {49B38F11-6193-11d3-B3C5-00805F8A6670}
NS_DECLARE_ID(kUnicodeToLangBoxArabic8CID,
0x49b38f11, 0x6193, 0x11d3, 0xb3, 0xc5, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
// {49B38F12-6193-11d3-B3C5-00805F8A6670}
NS_DECLARE_ID(kUnicodeToUTF16CID,
0x49b38f12, 0x6193, 0x11d3, 0xb3, 0xc5, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
// {49B38F14-6193-11d3-B3C5-00805F8A6670}
NS_DECLARE_ID(kUnicodeToUTF32CID,
0x49b38f14, 0x6193, 0x11d3, 0xb3, 0xc5, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70);
#endif /* nsUCvLatinCID_h___ */

Просмотреть файл

@ -436,27 +436,27 @@ FactoryData g_FactoryData[] =
"Unicode"
},
{
&kUCS2BEToUnicodeCID,
&kUTF16BEToUnicodeCID,
//nsUCS2BEToUnicode::CreateInstance,
NEW_UTF16BEToUnicode,
"UTF-16BE",
"Unicode"
},
{
&kUCS2LEToUnicodeCID,
&kUTF32LEToUnicodeCID,
//nsUCS2LEToUnicode::CreateInstance,
NEW_UTF16LEToUnicode,
"UTF-16LE",
"Unicode"
},
{
&kUCS4BEToUnicodeCID,
&kUTF32BEToUnicodeCID,
nsUCS4BEToUnicode::CreateInstance,
"UTF-32BE",
"Unicode"
},
{
&kUCS4LEToUnicodeCID,
&kUTF32LEToUnicodeCID,
nsUCS4LEToUnicode::CreateInstance,
"UTF-32LE",
"Unicode"
@ -744,25 +744,25 @@ FactoryData g_FactoryData[] =
"x-imap4-modified-utf7"
},
{
&kUnicodeToUCS2BECID,
&kUnicodeToUTF16BECID,
nsUnicodeToUCS2BE::CreateInstance,
"Unicode",
"UTF-16BE"
},
{
&kUnicodeToUCS2LECID,
&kUnicodeToUTF16CID,
nsUnicodeToUCS2LE::CreateInstance,
"Unicode",
"UTF-16LE"
},
{
&kUnicodeToUCS4BECID,
&kUnicodeToUTF32BECID,
nsUnicodeToUCS4BE::CreateInstance,
"Unicode",
"UTF-32BE"
},
{
&kUnicodeToUCS4LECID,
&kUnicodeToUTF32LECID,
nsUnicodeToUCS4LE::CreateInstance,
"Unicode",
"UTF-32LE"