diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-10 14:09:55 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-09-10 18:13:57 +0200 |
commit | 98492e9d8169c080d224e6ee60feb3277c5b1a17 (patch) | |
tree | 6580753b973c7ea09e48bf5af9fcc61886d59924 /sal/textenc | |
parent | 57a1d8d2c3ce8741c0bfbaa66160f6091a1c7f68 (diff) |
clang:optin.performance.Padding in sal
warning: Excessive padding in 'struct ImplTextEncodingData' (8 padding
bytes, where 0 is optimal).
warning: Excessive padding in 'struct ImplByteConvertData' (10 padding
bytes, where 2 is optimal).
warning: Excessive padding in 'struct ImplDBCSConvertData' (10 padding
bytes, where 2 is optimal).
warning: Excessive padding in 'struct DirectoryItem_Impl' (11 padding
bytes, where 3 is optimal).
Change-Id: Ia19f192099c305734256103c7cdc0f64e398b6af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121902
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal/textenc')
-rw-r--r-- | sal/textenc/convertadobe.tab | 12 | ||||
-rw-r--r-- | sal/textenc/convertbig5hkscs.tab | 4 | ||||
-rw-r--r-- | sal/textenc/converteuctw.tab | 4 | ||||
-rw-r--r-- | sal/textenc/convertgb18030.tab | 4 | ||||
-rw-r--r-- | sal/textenc/convertisciidevangari.tab | 4 | ||||
-rw-r--r-- | sal/textenc/convertiso2022cn.tab | 4 | ||||
-rw-r--r-- | sal/textenc/convertiso2022jp.tab | 4 | ||||
-rw-r--r-- | sal/textenc/convertiso2022kr.tab | 4 | ||||
-rw-r--r-- | sal/textenc/tcvtarb1.tab | 48 | ||||
-rw-r--r-- | sal/textenc/tcvteas1.tab | 24 | ||||
-rw-r--r-- | sal/textenc/tcvtest1.tab | 240 | ||||
-rw-r--r-- | sal/textenc/tcvtjp6.tab | 52 | ||||
-rw-r--r-- | sal/textenc/tcvtkr6.tab | 28 | ||||
-rw-r--r-- | sal/textenc/tcvtlat1.tab | 80 | ||||
-rw-r--r-- | sal/textenc/tcvtscn6.tab | 44 | ||||
-rw-r--r-- | sal/textenc/tcvtsym1.tab | 4 | ||||
-rw-r--r-- | sal/textenc/tcvttcn6.tab | 24 | ||||
-rw-r--r-- | sal/textenc/tcvtuni1.tab | 4 | ||||
-rw-r--r-- | sal/textenc/tenchelp.hxx | 24 | ||||
-rw-r--r-- | sal/textenc/textenc.cxx | 32 |
20 files changed, 322 insertions, 322 deletions
diff --git a/sal/textenc/convertadobe.tab b/sal/textenc/convertadobe.tab index 1e67a84953b8..5ae3c2d63aba 100644 --- a/sal/textenc/convertadobe.tab +++ b/sal/textenc/convertadobe.tab @@ -291,8 +291,8 @@ ImplTextEncodingData const adobeStandardEncodingData nullptr, nullptr, nullptr, ImplCreateUnicodeToTextContext, ImplDestroyUnicodeToTextContext, ImplResetUnicodeToTextContext }, - 1, 1, 1, - 0, nullptr, "Adobe-Standard-Encoding", + nullptr, "Adobe-Standard-Encoding", + 1, 1, 1, 0, RTL_TEXTENCODING_INFO_MIME }; ImplTextEncodingData const adobeSymbolEncodingData @@ -302,8 +302,8 @@ ImplTextEncodingData const adobeSymbolEncodingData nullptr, nullptr, nullptr, ImplCreateUnicodeToTextContext, ImplDestroyUnicodeToTextContext, ImplResetUnicodeToTextContext }, - 1, 1, 1, - 0, nullptr, "Adobe-Symbol-Encoding", + nullptr, "Adobe-Symbol-Encoding", + 1, 1, 1, 0, RTL_TEXTENCODING_INFO_SYMBOL | RTL_TEXTENCODING_INFO_MIME }; ImplTextEncodingData const adobeDingbatsEncodingData @@ -313,8 +313,8 @@ ImplTextEncodingData const adobeDingbatsEncodingData nullptr, nullptr, nullptr, ImplCreateUnicodeToTextContext, ImplDestroyUnicodeToTextContext, ImplResetUnicodeToTextContext }, - 1, 1, 1, - 0, nullptr, "Adobe-ZapfDingbats-Encoding", + nullptr, "Adobe-ZapfDingbats-Encoding", + 1, 1, 1, 0, 0 }; // TODO: RTL_TEXTENCODING_INFO_DINGBATS } diff --git a/sal/textenc/convertbig5hkscs.tab b/sal/textenc/convertbig5hkscs.tab index 8aa45facf0e9..04d56b824bcd 100644 --- a/sal/textenc/convertbig5hkscs.tab +++ b/sal/textenc/convertbig5hkscs.tab @@ -47,11 +47,11 @@ ImplTextEncodingData const aImplBig5HkscsTextEncodingData &ImplCreateUnicodeToTextContext, &ImplDestroyUnicodeToTextContext, &ImplResetUnicodeToTextContext }, + "euc-tw", + "Big5-HKSCS", 1, 2, 2, 136, - "euc-tw", - "Big5-HKSCS", RTL_TEXTENCODING_INFO_MULTIBYTE | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_CHINESE_TRADITIONAL */ diff --git a/sal/textenc/converteuctw.tab b/sal/textenc/converteuctw.tab index 67982f7b4ed3..e1b553fb05b5 100644 --- a/sal/textenc/converteuctw.tab +++ b/sal/textenc/converteuctw.tab @@ -44,11 +44,11 @@ ImplTextEncodingData const aImplEucTwTextEncodingData &ImplCreateUnicodeToTextContext, &ImplDestroyUnicodeToTextContext, &ImplResetUnicodeToTextContext }, + "cns11643-1", + "Big5", 1, 4, 2, 136, - "cns11643-1", - "Big5", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MULTIBYTE }; /* SCRIPT_CHINESE_TRADITIONAL */ diff --git a/sal/textenc/convertgb18030.tab b/sal/textenc/convertgb18030.tab index d0a25c2a330a..04064d64d2b7 100644 --- a/sal/textenc/convertgb18030.tab +++ b/sal/textenc/convertgb18030.tab @@ -41,12 +41,12 @@ ImplTextEncodingData const aImplGb18030TextEncodingData &ImplCreateUnicodeToTextContext, &ImplDestroyUnicodeToTextContext, &ImplResetUnicodeToTextContext }, + "gbk-0", + "GB18030", 1, 4, 2, 134, - "gbk-0", - "GB18030", RTL_TEXTENCODING_INFO_UNICODE | RTL_TEXTENCODING_INFO_MULTIBYTE | RTL_TEXTENCODING_INFO_MIME }; diff --git a/sal/textenc/convertisciidevangari.tab b/sal/textenc/convertisciidevangari.tab index f66ad95bca97..c65dc333ec62 100644 --- a/sal/textenc/convertisciidevangari.tab +++ b/sal/textenc/convertisciidevangari.tab @@ -24,12 +24,12 @@ ImplTextEncodingData const aImplIsciiDevanagariTextEncodingData &ImplCreateUnicodeToIsciiDevanagariContext, &ImplDestroyUnicodeToIsciiDevanagariContext, &ImplResetUnicodeToIsciiDevanagariContext }, + nullptr, + "x-iscii-de ", 1, 2, 2, 1, - nullptr, - "x-iscii-de ", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MULTIBYTE }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/textenc/convertiso2022cn.tab b/sal/textenc/convertiso2022cn.tab index 3fd4bad21539..14522a658926 100644 --- a/sal/textenc/convertiso2022cn.tab +++ b/sal/textenc/convertiso2022cn.tab @@ -48,12 +48,12 @@ ImplTextEncodingData const aImplIso2022CnTextEncodingData &ImplCreateUnicodeToIso2022CnContext, &ImplDestroyUnicodeToIso2022CnContext, &ImplResetUnicodeToIso2022CnContext }, + "euc-cn", + "ISO-2022-CN", 1, 8, 2, 134, - "euc-cn", - "ISO-2022-CN", RTL_TEXTENCODING_INFO_CONTEXT | RTL_TEXTENCODING_INFO_MULTIBYTE | RTL_TEXTENCODING_INFO_MIME }; diff --git a/sal/textenc/convertiso2022jp.tab b/sal/textenc/convertiso2022jp.tab index 41093bfc1a7a..c455492b8530 100644 --- a/sal/textenc/convertiso2022jp.tab +++ b/sal/textenc/convertiso2022jp.tab @@ -38,12 +38,12 @@ ImplTextEncodingData const aImplIso2022JpTextEncodingData &ImplCreateUnicodeToIso2022JpContext, &ImplDestroyUnicodeToIso2022JpContext, &ImplResetUnicodeToIso2022JpContext }, + "euc-jp", + "ISO-2022-JP", 1, 8, 2, 128, - "euc-jp", - "ISO-2022-JP", RTL_TEXTENCODING_INFO_CONTEXT | RTL_TEXTENCODING_INFO_MULTIBYTE | RTL_TEXTENCODING_INFO_MIME }; diff --git a/sal/textenc/convertiso2022kr.tab b/sal/textenc/convertiso2022kr.tab index 6356aa3de4fb..8b139f6e8450 100644 --- a/sal/textenc/convertiso2022kr.tab +++ b/sal/textenc/convertiso2022kr.tab @@ -38,12 +38,12 @@ ImplTextEncodingData const aImplIso2022KrTextEncodingData &ImplCreateUnicodeToIso2022KrContext, &ImplDestroyUnicodeToIso2022KrContext, &ImplResetUnicodeToIso2022KrContext }, + "euc-kr", + "ISO-2022-KR", 1, 8, 2, 130, - "euc-kr", - "ISO-2022-KR", RTL_TEXTENCODING_INFO_CONTEXT | RTL_TEXTENCODING_INFO_MULTIBYTE | RTL_TEXTENCODING_INFO_MIME }; diff --git a/sal/textenc/tcvtarb1.tab b/sal/textenc/tcvtarb1.tab index 49c119f636c7..17edab61ed1a 100644 --- a/sal/textenc/tcvtarb1.tab +++ b/sal/textenc/tcvtarb1.tab @@ -188,11 +188,11 @@ ImplByteConvertData const aImplIBM862ByteCvtData = { aImplIBM862ToUniTab, nullptr, - IBM862UNI_START, IBM862UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplIBM862ToCharTab, nullptr, aImplIBM862ToCharTabEx, + IBM862UNI_START, IBM862UNI_END, + NOTABUNI_START, NOTABUNI_END, IBM862CHAR_START, IBM862CHAR_END, NOTABCHAR_START, NOTABCHAR_END, IBM862TOCHARTABEX_COUNT @@ -210,12 +210,12 @@ ImplTextEncodingData const aImplIBM862TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-8", + "IBM862", 1, 1, 1, 177, - "iso8859-8", - "IBM862", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME | RTL_TEXTENCODING_INFO_R2L }; @@ -346,11 +346,11 @@ ImplByteConvertData const aImplIBM864ByteCvtData = { aImplIBM864ToUniTab, nullptr, - IBM864UNI_START, IBM864UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplIBM864ToCharTab, nullptr, aImplIBM864ToCharTabEx, + IBM864UNI_START, IBM864UNI_END, + NOTABUNI_START, NOTABUNI_END, IBM864CHAR_START, IBM864CHAR_END, NOTABCHAR_START, NOTABCHAR_END, IBM864TOCHARTABEX_COUNT @@ -368,12 +368,12 @@ ImplTextEncodingData const aImplIBM864TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-6", + "IBM864", 1, 1, 1, 178, - "iso8859-6", - "IBM864", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME | RTL_TEXTENCODING_INFO_R2L }; @@ -499,11 +499,11 @@ ImplByteConvertData const aImplMS1255ByteCvtData = { aImplMS1255ToUniTab, nullptr, - MS1255UNI_START, MS1255UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplMS1255ToCharTab, nullptr, aImplMS1255ToCharTabEx, + MS1255UNI_START, MS1255UNI_END, + NOTABUNI_START, NOTABUNI_END, MS1255CHAR_START, MS1255CHAR_END, NOTABCHAR_START, NOTABCHAR_END, MS1255TOCHARTABEX_COUNT @@ -521,12 +521,12 @@ ImplTextEncodingData const aImplMS1255TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-8", + "windows-1255", 1, 1, 1, 177, - "iso8859-8", - "windows-1255", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME | RTL_TEXTENCODING_INFO_R2L }; @@ -677,11 +677,11 @@ ImplByteConvertData const aImplMS1256ByteCvtData = { aImplMS1256ToUniTab, nullptr, - MS1256UNI_START, MS1256UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplMS1256ToCharTab, nullptr, aImplMS1256ToCharTabEx, + MS1256UNI_START, MS1256UNI_END, + NOTABUNI_START, NOTABUNI_END, MS1256CHAR_START, MS1256CHAR_END, NOTABCHAR_START, NOTABCHAR_END, MS1256TOCHARTABEX_COUNT @@ -699,12 +699,12 @@ ImplTextEncodingData const aImplMS1256TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-6", + "windows-1256", 1, 1, 1, 178, - "iso8859-6", - "windows-1256", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME | RTL_TEXTENCODING_INFO_R2L }; @@ -777,11 +777,11 @@ ImplByteConvertData const aImplISO88596ByteCvtData = { aImplISO88596ToUniTab, aImpl8090SameToUniTab, - ISO88596UNI_START, ISO88596UNI_END, - SAME8090UNI_START, SAME8090UNI_END, aImplISO88596ToCharTab, aImpl8090SameToCharTab, aImplISO88596ToCharTabEx, + ISO88596UNI_START, ISO88596UNI_END, + SAME8090UNI_START, SAME8090UNI_END, ISO88596CHAR_START, ISO88596CHAR_END, SAME8090CHAR_START, SAME8090CHAR_END, ISO88596TOCHARTABEX_COUNT @@ -799,12 +799,12 @@ ImplTextEncodingData const aImplISO88596TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-6", + "ISO-8859-6", 1, 1, 1, 178, - "iso8859-6", - "ISO-8859-6", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_R2L | RTL_TEXTENCODING_INFO_MIME }; @@ -898,11 +898,11 @@ ImplByteConvertData const aImplISO88598ByteCvtData = { aImplISO88598ToUniTab, aImpl8090SameToUniTab, - ISO88598UNI_START, ISO88598UNI_END, - SAME8090UNI_START, SAME8090UNI_END, aImplISO88598ToCharTab, aImpl8090SameToCharTab, aImplISO88598ToCharTabEx, + ISO88598UNI_START, ISO88598UNI_END, + SAME8090UNI_START, SAME8090UNI_END, ISO88598CHAR_START, ISO88598CHAR_END, SAME8090CHAR_START, SAME8090CHAR_END, ISO88598TOCHARTABEX_COUNT @@ -920,12 +920,12 @@ ImplTextEncodingData const aImplISO88598TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-8", + "ISO-8859-8", 1, 1, 1, 177, - "iso8859-8", - "ISO-8859-8", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_R2L | RTL_TEXTENCODING_INFO_MIME }; diff --git a/sal/textenc/tcvteas1.tab b/sal/textenc/tcvteas1.tab index a168e4115545..636852991814 100644 --- a/sal/textenc/tcvteas1.tab +++ b/sal/textenc/tcvteas1.tab @@ -105,11 +105,11 @@ ImplByteConvertData const aImplMS874ByteCvtData = { aImplMS874ToUniTab, nullptr, - MS874UNI_START, MS874UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplMS874ToCharTab, nullptr, aImplMS874ToCharTabEx, + MS874UNI_START, MS874UNI_END, + NOTABUNI_START, NOTABUNI_END, MS874CHAR_START, MS874CHAR_END, NOTABCHAR_START, NOTABCHAR_END, MS874TOCHARTABEX_COUNT @@ -127,12 +127,12 @@ ImplTextEncodingData const aImplMS874TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-1", /* TODO! correct? */ + "windows-874", 1, 1, 1, 222, - "iso8859-1", /* TODO! correct? */ - "windows-874", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* WIN/DOS/OS2, SCRIPT_THAI, pc code page 874, mac encoding 21 */ @@ -159,11 +159,11 @@ ImplByteConvertData const aImplTis620ByteCvtData = { aImplMS874ToUniTab + (0xA0 - MS874UNI_START), aImpl8090SameToUniTab, - 0xA0, MS874UNI_END, - SAME8090UNI_START, SAME8090UNI_END, aImplMS874ToCharTab, aImpl8090SameToCharTab, aImplMS874ToCharTabEx, + 0xA0, MS874UNI_END, + SAME8090UNI_START, SAME8090UNI_END, MS874CHAR_START, MS874CHAR_END, SAME8090CHAR_START, SAME8090CHAR_END, 1 @@ -179,12 +179,12 @@ ImplTextEncodingData const aImplTis620TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-1", /* TODO! correct? */ + "TIS-620", 1, 1, 1, 222, - "iso8859-1", /* TODO! correct? */ - "TIS-620", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* ======================================================================= */ @@ -400,11 +400,11 @@ ImplByteConvertData const aImplMS1258ByteCvtData = { aImplMS1258ToUniTab, nullptr, - MS1258UNI_START, MS1258UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplMS1258ToCharTab, nullptr, aImplMS1258ToCharTabEx, + MS1258UNI_START, MS1258UNI_END, + NOTABUNI_START, NOTABUNI_END, MS1258CHAR_START, MS1258CHAR_END, NOTABCHAR_START, NOTABCHAR_END, MS1258TOCHARTABEX_COUNT @@ -422,11 +422,11 @@ ImplTextEncodingData const aImplMS1258TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-1", /* TODO! correct? */ + "windows-1258", 1, 2, 1, 163, - "iso8859-1", /* TODO! correct? */ - "windows-1258", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* WIN, SCRIPT_VIETNAMESE, mac encoding 30 */ diff --git a/sal/textenc/tcvtest1.tab b/sal/textenc/tcvtest1.tab index 96c1d090f5b5..b8661ab9c5e9 100644 --- a/sal/textenc/tcvtest1.tab +++ b/sal/textenc/tcvtest1.tab @@ -154,11 +154,11 @@ ImplByteConvertData const aImplIBM737ByteCvtData = { aImplIBM737ToUniTab, nullptr, - IBM737UNI_START, IBM737UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplIBM737ToCharTab, nullptr, aImplIBM737ToCharTabEx, + IBM737UNI_START, IBM737UNI_END, + NOTABUNI_START, NOTABUNI_END, IBM737CHAR_START, IBM737CHAR_END, NOTABCHAR_START, NOTABCHAR_END, IBM737TOCHARTABEX_COUNT @@ -176,12 +176,12 @@ ImplTextEncodingData const aImplIBM737TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-7", + "iso-8859-7", 1, 1, 1, 161, - "iso8859-7", - "iso-8859-7", RTL_TEXTENCODING_INFO_ASCII }; /* DOS/OS2, SCRIPT_GREEK, pc code page 737, mac encoding 6 */ @@ -360,11 +360,11 @@ ImplByteConvertData const aImplIBM775ByteCvtData = { aImplIBM775ToUniTab, nullptr, - IBM775UNI_START, IBM775UNI_END, - NOTABUNI_START, NOTABUNI_END, nullptr, nullptr, aImplIBM775ToCharTabEx, + IBM775UNI_START, IBM775UNI_END, + NOTABUNI_START, NOTABUNI_END, NOTABCHAR_START, NOTABCHAR_END, NOTABCHAR_START, NOTABCHAR_END, IBM775TOCHARTABEX_COUNT @@ -382,12 +382,12 @@ ImplTextEncodingData const aImplIBM775TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-4", + "iso-8859-4", 1, 1, 1, 186, - "iso8859-4", - "iso-8859-4", RTL_TEXTENCODING_INFO_ASCII }; /* DOS/OS2, SCRIPT_BALTIC, pc code page 775, mac encoding 29 (?) */ @@ -566,11 +566,11 @@ ImplByteConvertData const aImplIBM852ByteCvtData = { aImplIBM852ToUniTab, nullptr, - IBM852UNI_START, IBM852UNI_END, - NOTABUNI_START, NOTABUNI_END, nullptr, nullptr, aImplIBM852ToCharTabEx, + IBM852UNI_START, IBM852UNI_END, + NOTABUNI_START, NOTABUNI_END, NOTABCHAR_START, NOTABCHAR_END, NOTABCHAR_START, NOTABCHAR_END, IBM852TOCHARTABEX_COUNT @@ -588,12 +588,12 @@ ImplTextEncodingData const aImplIBM852TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-2", + "ibm852", 1, 1, 1, 238, - "iso8859-2", - "ibm852", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* DOS/OS2, SCRIPT_EASTEUROPE, pc code page 852, mac encoding 29 */ @@ -702,11 +702,11 @@ ImplByteConvertData const aImplIBM855ByteCvtData = { aImplIBM855ToUniTab, nullptr, - IBM855UNI_START, IBM855UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplIBM855ToCharTab, nullptr, aImplIBM855ToCharTabEx, + IBM855UNI_START, IBM855UNI_END, + NOTABUNI_START, NOTABUNI_END, IBM855CHAR_START, IBM855CHAR_END, NOTABCHAR_START, NOTABCHAR_END, IBM855TOCHARTABEX_COUNT @@ -724,12 +724,12 @@ ImplTextEncodingData const aImplIBM855TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-5", + "iso-8859-5", 1, 1, 1, 204, - "iso8859-5", - "iso-8859-5", RTL_TEXTENCODING_INFO_ASCII }; /* DOS/OS2, SCRIPT_CYRILLIC, pc code page 855, mac encoding 7 */ @@ -837,11 +837,11 @@ ImplByteConvertData const aImplIBM857ByteCvtData = { aImplIBM857ToUniTab, nullptr, - IBM857UNI_START, IBM857UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplIBM857ToCharTab, nullptr, aImplIBM857ToCharTabEx, + IBM857UNI_START, IBM857UNI_END, + NOTABUNI_START, NOTABUNI_END, IBM857CHAR_START, IBM857CHAR_END, NOTABCHAR_START, NOTABCHAR_END, IBM857TOCHARTABEX_COUNT @@ -859,12 +859,12 @@ ImplTextEncodingData const aImplIBM857TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-9", + "iso-8859-9", 1, 1, 1, 162, - "iso8859-9", - "iso-8859-9", RTL_TEXTENCODING_INFO_ASCII }; /* DOS/OS2, SCRIPT_TURKISH, pc code page 857, mac encoding 35 */ @@ -993,11 +993,11 @@ ImplByteConvertData const aImplIBM866ByteCvtData = { aImplIBM866ToUniTab, nullptr, - IBM866UNI_START, IBM866UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplIBM866ToCharTab, nullptr, aImplIBM866ToCharTabEx, + IBM866UNI_START, IBM866UNI_END, + NOTABUNI_START, NOTABUNI_END, IBM866CHAR_START, IBM866CHAR_END, NOTABCHAR_START, NOTABCHAR_END, IBM866TOCHARTABEX_COUNT @@ -1015,12 +1015,12 @@ ImplTextEncodingData const aImplIBM866TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-5", + "cp866", 1, 1, 1, 204, - "iso8859-5", - "cp866", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* DOS/OS2, SCRIPT_LATIN, pc code page 866, mac encoding 7 */ @@ -1139,11 +1139,11 @@ ImplByteConvertData const aImplIBM869ByteCvtData = { aImplIBM869ToUniTab, nullptr, - IBM869UNI_START, IBM869UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplIBM869ToCharTab, nullptr, aImplIBM869ToCharTabEx, + IBM869UNI_START, IBM869UNI_END, + NOTABUNI_START, NOTABUNI_END, IBM869CHAR_START, IBM869CHAR_END, NOTABCHAR_START, NOTABCHAR_END, IBM869TOCHARTABEX_COUNT @@ -1161,12 +1161,12 @@ ImplTextEncodingData const aImplIBM869TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-7", + "iso-8859-7", 1, 1, 1, 161, - "iso8859-7", - "iso-8859-7", RTL_TEXTENCODING_INFO_ASCII }; /* DOS/OS2, SCRIPT_LATIN, pc code page 869, mac encoding 6 */ @@ -1340,11 +1340,11 @@ ImplByteConvertData const aImplMS1250ByteCvtData = { aImplMS1250ToUniTab, nullptr, - MS1250UNI_START, MS1250UNI_END, - NOTABUNI_START, NOTABUNI_END, nullptr, nullptr, aImplMS1250ToCharTabEx, + MS1250UNI_START, MS1250UNI_END, + NOTABUNI_START, NOTABUNI_END, NOTABCHAR_START, NOTABCHAR_END, NOTABCHAR_START, NOTABCHAR_END, MS1250TOCHARTABEX_COUNT @@ -1362,12 +1362,12 @@ ImplTextEncodingData const aImplMS1250TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-2", + "windows-1250", 1, 1, 1, 238, - "iso8859-2", - "windows-1250", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* WIN, SCRIPT_EASTEUROPE, pc code page 852, mac encoding 29 */ @@ -1475,11 +1475,11 @@ ImplByteConvertData const aImplMS1251ByteCvtData = { aImplMS1251ToUniTab, nullptr, - MS1251UNI_START, MS1251UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplMS1251ToCharTab, nullptr, aImplMS1251ToCharTabEx, + MS1251UNI_START, MS1251UNI_END, + NOTABUNI_START, NOTABUNI_END, MS1251CHAR_START, MS1251CHAR_END, NOTABCHAR_START, NOTABCHAR_END, MS1251TOCHARTABEX_COUNT @@ -1497,12 +1497,12 @@ ImplTextEncodingData const aImplMS1251TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-5", + "windows-1251", 1, 1, 1, 204, - "iso8859-5", - "windows-1251", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* WIN, SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */ @@ -1613,11 +1613,11 @@ ImplByteConvertData const aImplMS1253ByteCvtData = { aImplMS1253ToUniTab, nullptr, - MS1253UNI_START, MS1253UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplMS1253ToCharTab, nullptr, aImplMS1253ToCharTabEx, + MS1253UNI_START, MS1253UNI_END, + NOTABUNI_START, NOTABUNI_END, MS1253CHAR_START, MS1253CHAR_END, NOTABCHAR_START, NOTABCHAR_END, MS1253TOCHARTABEX_COUNT @@ -1635,12 +1635,12 @@ ImplTextEncodingData const aImplMS1253TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-7", + "windows-1253", 1, 1, 1, 161, - "iso8859-7", - "windows-1253", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* WIN, SCRIPT_GREEK, pc code page 869, mac encoding 6 */ @@ -1744,11 +1744,11 @@ ImplByteConvertData const aImplMS1254ByteCvtData = { aImplMS1254ToUniTab, nullptr, - MS1254UNI_START, MS1254UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplMS1254ToCharTab, nullptr, aImplMS1254ToCharTabEx, + MS1254UNI_START, MS1254UNI_END, + NOTABUNI_START, NOTABUNI_END, MS1254CHAR_START, MS1254CHAR_END, NOTABCHAR_START, NOTABCHAR_END, MS1254TOCHARTABEX_COUNT, @@ -1766,12 +1766,12 @@ ImplTextEncodingData const aImplMS1254TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-9", + "windows-1254", 1, 1, 1, 162, - "iso8859-9", - "windows-1254", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* WIN, SCRIPT_TURKISH, pc code page 857, mac encoding 35 */ @@ -1880,11 +1880,11 @@ ImplByteConvertData const aImplMS1257ByteCvtData = { aImplMS1257ToUniTab, nullptr, - MS1257UNI_START, MS1257UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplMS1257ToCharTab, nullptr, aImplMS1257ToCharTabEx, + MS1257UNI_START, MS1257UNI_END, + NOTABUNI_START, NOTABUNI_END, MS1257CHAR_START, MS1257CHAR_END, NOTABCHAR_START, NOTABCHAR_END, MS1257TOCHARTABEX_COUNT, @@ -1902,12 +1902,12 @@ ImplTextEncodingData const aImplMS1257TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-4", + "windows-1257", 1, 1, 1, 186, - "iso8859-4", - "windows-1257", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* WIN, SCRIPT_BALTIC, pc code page 775, mac encoding 29 */ @@ -2048,11 +2048,11 @@ ImplByteConvertData const aImplISO88592ByteCvtData = { aImplISO88592ToUniTab, aImpl8090SameToUniTab, - ISO88592UNI_START, ISO88592UNI_END, - SAME8090UNI_START, SAME8090UNI_END, aImpl8090SameToCharTab, nullptr, aImplISO88592ToCharTabEx, + ISO88592UNI_START, ISO88592UNI_END, + SAME8090UNI_START, SAME8090UNI_END, SAME8090CHAR_START, SAME8090CHAR_END, NOTABCHAR_START, NOTABCHAR_END, ISO88592TOCHARTABEX_COUNT @@ -2070,12 +2070,12 @@ ImplTextEncodingData const aImplISO88592TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-2", + "iso-8859-2", 1, 1, 1, 238, - "iso8859-2", - "iso-8859-2", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_EASTEUROPE, pc code page 852, mac encoding 29 */ @@ -2209,11 +2209,11 @@ ImplByteConvertData const aImplISO88593ByteCvtData = { aImplISO88593ToUniTab, aImpl8090SameToUniTab, - ISO88593UNI_START, ISO88593UNI_END, - SAME8090UNI_START, SAME8090UNI_END, aImpl8090SameToCharTab, nullptr, aImplISO88593ToCharTabEx, + ISO88593UNI_START, ISO88593UNI_END, + SAME8090UNI_START, SAME8090UNI_END, SAME8090CHAR_START, SAME8090CHAR_END, NOTABCHAR_START, NOTABCHAR_END, ISO88593TOCHARTABEX_COUNT @@ -2231,12 +2231,12 @@ ImplTextEncodingData const aImplISO88593TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-3", + "iso-8859-3", 1, 1, 1, 0, - "iso8859-3", - "iso-8859-3", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_LATIN, pc code page 850 */ @@ -2377,11 +2377,11 @@ ImplByteConvertData const aImplISO88594ByteCvtData = { aImplISO88594ToUniTab, aImpl8090SameToUniTab, - ISO88594UNI_START, ISO88594UNI_END, - SAME8090UNI_START, SAME8090UNI_END, aImpl8090SameToCharTab, nullptr, aImplISO88594ToCharTabEx, + ISO88594UNI_START, ISO88594UNI_END, + SAME8090UNI_START, SAME8090UNI_END, SAME8090CHAR_START, SAME8090CHAR_END, NOTABCHAR_START, NOTABCHAR_END, ISO88594TOCHARTABEX_COUNT @@ -2399,12 +2399,12 @@ ImplTextEncodingData const aImplISO88594TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-4", + "iso-8859-4", 1, 1, 1, 186, - "iso8859-4", - "iso-8859-4", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_BALTIC, pc code page 775, mac encoding 29 (?) */ @@ -2475,11 +2475,11 @@ ImplByteConvertData const aImplISO88595ByteCvtData = { aImplISO88595ToUniTab, aImpl8090SameToUniTab, - ISO88595UNI_START, ISO88595UNI_END, - SAME8090UNI_START, SAME8090UNI_END, aImplISO88595ToCharTab, aImpl8090SameToCharTab, aImplISO88595ToCharTabEx, + ISO88595UNI_START, ISO88595UNI_END, + SAME8090UNI_START, SAME8090UNI_END, ISO88595CHAR_START, ISO88595CHAR_END, SAME8090CHAR_START, SAME8090CHAR_END, ISO88595TOCHARTABEX_COUNT @@ -2497,12 +2497,12 @@ ImplTextEncodingData const aImplISO88595TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-5", + "iso-8859-5", 1, 1, 1, 204, - "iso8859-5", - "iso-8859-5", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */ @@ -2586,11 +2586,11 @@ ImplByteConvertData const aImplISO88597ByteCvtData = { aImplISO88597ToUniTab, aImpl8090SameToUniTab, - ISO88597UNI_START, ISO88597UNI_END, - SAME8090UNI_START, SAME8090UNI_END, aImplISO88597ToCharTab, aImpl8090SameToCharTab, aImplISO88597ToCharTabEx, + ISO88597UNI_START, ISO88597UNI_END, + SAME8090UNI_START, SAME8090UNI_END, ISO88597CHAR_START, ISO88597CHAR_END, SAME8090CHAR_START, SAME8090CHAR_END, ISO88597TOCHARTABEX_COUNT @@ -2608,12 +2608,12 @@ ImplTextEncodingData const aImplISO88597TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-7", + "iso-8859-7", 1, 1, 1, 161, - "iso8859-7", - "iso-8859-7", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_GREEK, pc code page 869, mac encoding 6 */ @@ -2686,11 +2686,11 @@ ImplByteConvertData const aImplISO88599ByteCvtData = { aImplISO88599ToUniTab, aImpl8090SameToUniTab, - ISO88599UNI_START, ISO88599UNI_END, - SAME8090UNI_START, SAME8090UNI_END, aImplISO88599ToCharTab, aImpl8090SameToCharTab, aImplISO88599ToCharTabEx, + ISO88599UNI_START, ISO88599UNI_END, + SAME8090UNI_START, SAME8090UNI_END, ISO88599CHAR_START, ISO88599CHAR_END, SAME8090CHAR_START, SAME8090CHAR_END, ISO88599TOCHARTABEX_COUNT @@ -2708,12 +2708,12 @@ ImplTextEncodingData const aImplISO88599TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-9", + "iso-8859-9", 1, 1, 1, 162, - "iso8859-9", - "iso-8859-9", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_TURKISH, pc code page 857, mac encoding 35 */ @@ -2827,11 +2827,11 @@ ImplByteConvertData const aImplISO885910ByteCvtData = { aImplISO885910ToUniTab, aImpl8090SameToUniTab, - ISO885910UNI_START, ISO885910UNI_END, - SAME8090UNI_START, SAME8090UNI_END, aImplISO885910ToCharTab, aImpl8090SameToCharTab, aImplISO885910ToCharTabEx, + ISO885910UNI_START, ISO885910UNI_END, + SAME8090UNI_START, SAME8090UNI_END, ISO885910CHAR_START, ISO885910CHAR_END, SAME8090CHAR_START, SAME8090CHAR_END, ISO885910TOCHARTABEX_COUNT @@ -2849,12 +2849,12 @@ ImplTextEncodingData const aImplISO885910TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-10", + "iso-8859-10", 1, 1, 1, 238, - "iso8859-10", - "iso-8859-10", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_EASTEUROPE, pc code page 852, mac encoding 29 */ @@ -2995,11 +2995,11 @@ ImplByteConvertData const aImplISO885913ByteCvtData = { aImplISO885913ToUniTab, aImpl8090SameToUniTab, - ISO885913UNI_START, ISO885913UNI_END, - SAME8090UNI_START, SAME8090UNI_END, aImpl8090SameToCharTab, nullptr, aImplISO885913ToCharTabEx, + ISO885913UNI_START, ISO885913UNI_END, + SAME8090UNI_START, SAME8090UNI_END, SAME8090CHAR_START, SAME8090CHAR_END, NOTABCHAR_START, NOTABCHAR_END, ISO885913TOCHARTABEX_COUNT @@ -3017,12 +3017,12 @@ ImplTextEncodingData const aImplISO885913TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-13", + "iso-8859-13", 1, 1, 1, 238, - "iso8859-13", - "iso-8859-13", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_EASTEUROPE, pc code page 852, mac encoding 29 */ @@ -3200,11 +3200,11 @@ ImplByteConvertData const aImplAPPLECENTEUROByteCvtData = { aImplAPPLECENTEUROToUniTab, nullptr, - APPLECENTEUROUNI_START, APPLECENTEUROUNI_END, - NOTABUNI_START, NOTABUNI_END, nullptr, nullptr, aImplAPPLECENTEUROToCharTabEx, + APPLECENTEUROUNI_START, APPLECENTEUROUNI_END, + NOTABUNI_START, NOTABUNI_END, NOTABCHAR_START, NOTABCHAR_END, NOTABCHAR_START, NOTABCHAR_END, APPLECENTEUROTOCHARTABEX_COUNT @@ -3222,12 +3222,12 @@ ImplTextEncodingData const aImplAPPLECENTEUROTextEncodingData nullptr, nullptr, nullptr }, + "iso8859-2", + "iso-8859-2", 1, 1, 1, 238, - "iso8859-2", - "iso-8859-2", RTL_TEXTENCODING_INFO_ASCII }; /* MAC, SCRIPT_EASTEUROPE, pc code page 852, mac encoding 29 */ @@ -3348,11 +3348,11 @@ ImplByteConvertData const aImplAPPLECROATIANByteCvtData = { aImplAPPLECROATIANToUniTab, nullptr, - APPLECROATIANUNI_START, APPLECROATIANUNI_END, - NOTABUNI_START, NOTABUNI_END, aImplAPPLECROATIANToCharTab, nullptr, aImplAPPLECROATIANToCharTabEx, + APPLECROATIANUNI_START, APPLECROATIANUNI_END, + NOTABUNI_START, NOTABUNI_END, APPLECROATIANCHAR_START, APPLECROATIANCHAR_END, NOTABCHAR_START, NOTABCHAR_END, APPLECROATIANTOCHARTABEX_COUNT @@ -3370,12 +3370,12 @@ ImplTextEncodingData const aImplAPPLECROATIANTextEncodingData nullptr, nullptr, nullptr }, + "iso8859-2", + "iso-8859-2", 1, 1, 1, 238, - "iso8859-2", - "iso-8859-2", RTL_TEXTENCODING_INFO_ASCII }; /* MAC, SCRIPT_EASTEUROPE, pc code page 852, mac encoding 36 */ @@ -3483,11 +3483,11 @@ ImplByteConvertData const aImplAPPLECYRILLICByteCvtData = { aImplAPPLECYRILLICToUniTab, nullptr, - APPLECYRILLICUNI_START, APPLECYRILLICUNI_END, - NOTABUNI_START, NOTABUNI_END, aImplAPPLECYRILLICToCharTab, nullptr, aImplAPPLECYRILLICToCharTabEx, + APPLECYRILLICUNI_START, APPLECYRILLICUNI_END, + NOTABUNI_START, NOTABUNI_END, APPLECYRILLICCHAR_START, APPLECYRILLICCHAR_END, NOTABCHAR_START, NOTABCHAR_END, APPLECYRILLICTOCHARTABEX_COUNT @@ -3505,12 +3505,12 @@ ImplTextEncodingData const aImplAPPLECYRILLICTextEncodingData nullptr, nullptr, nullptr }, + "iso8859-5", + "iso-8859-5", 1, 1, 1, 204, - "iso8859-5", - "iso-8859-5", RTL_TEXTENCODING_INFO_ASCII }; /* MAC, SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */ @@ -3637,11 +3637,11 @@ ImplByteConvertData const aImplAPPLEGREEKByteCvtData = { aImplAPPLEGREEKToUniTab, nullptr, - APPLEGREEKUNI_START, APPLEGREEKUNI_END, - NOTABUNI_START, NOTABUNI_END, aImplAPPLEGREEKToCharTab, nullptr, aImplAPPLEGREEKToCharTabEx, + APPLEGREEKUNI_START, APPLEGREEKUNI_END, + NOTABUNI_START, NOTABUNI_END, APPLEGREEKCHAR_START, APPLEGREEKCHAR_END, NOTABCHAR_START, NOTABCHAR_END, APPLEGREEKTOCHARTABEX_COUNT @@ -3659,12 +3659,12 @@ ImplTextEncodingData const aImplAPPLEGREEKTextEncodingData nullptr, nullptr, nullptr }, + "iso8859-7", + "iso-8859-7", 1, 1, 1, 161, - "iso8859-7", - "iso-8859-7", RTL_TEXTENCODING_INFO_ASCII }; /* MAC, SCRIPT_GREEK, pc code page 869, mac encoding 6 */ @@ -3791,11 +3791,11 @@ ImplByteConvertData const aImplAPPLEROMANIANByteCvtData = { aImplAPPLEROMANIANToUniTab, nullptr, - APPLEROMANIANUNI_START, APPLEROMANIANUNI_END, - NOTABUNI_START, NOTABUNI_END, aImplAPPLEROMANIANToCharTab, nullptr, aImplAPPLEROMANIANToCharTabEx, + APPLEROMANIANUNI_START, APPLEROMANIANUNI_END, + NOTABUNI_START, NOTABUNI_END, APPLEROMANIANCHAR_START, APPLEROMANIANCHAR_END, NOTABCHAR_START, NOTABCHAR_END, APPLEROMANIANTOCHARTABEX_COUNT @@ -3813,12 +3813,12 @@ ImplTextEncodingData const aImplAPPLEROMANIANTextEncodingData nullptr, nullptr, nullptr }, + "iso8859-2", + "iso-8859-2", 1, 1, 1, 238, - "iso8859-2", - "iso-8859-2", RTL_TEXTENCODING_INFO_ASCII }; /* MAC, SCRIPT_EASTEUROPE, pc code page 852, mac encoding 38 */ @@ -3938,11 +3938,11 @@ ImplByteConvertData const aImplAPPLETURKISHByteCvtData = { aImplAPPLETURKISHToUniTab, nullptr, - APPLETURKISHUNI_START, APPLETURKISHUNI_END, - NOTABUNI_START, NOTABUNI_END, aImplAPPLETURKISHToCharTab, nullptr, aImplAPPLETURKISHToCharTabEx, + APPLETURKISHUNI_START, APPLETURKISHUNI_END, + NOTABUNI_START, NOTABUNI_END, APPLETURKISHCHAR_START, APPLETURKISHCHAR_END, NOTABCHAR_START, NOTABCHAR_END, APPLETURKISHTOCHARTABEX_COUNT @@ -3960,12 +3960,12 @@ ImplTextEncodingData const aImplAPPLETURKISHTextEncodingData nullptr, nullptr, nullptr }, + "iso8859-9", + "iso-8859-9", 1, 1, 1, 162, - "iso8859-9", - "iso-8859-9", RTL_TEXTENCODING_INFO_ASCII }; /* MAC, SCRIPT_TURKISH, pc code page 857, mac encoding 35 */ @@ -4073,11 +4073,11 @@ ImplByteConvertData const aImplAPPLEUKRAINIANByteCvtData = { aImplAPPLEUKRAINIANToUniTab, nullptr, - APPLEUKRAINIANUNI_START, APPLEUKRAINIANUNI_END, - NOTABUNI_START, NOTABUNI_END, aImplAPPLEUKRAINIANToCharTab, nullptr, aImplAPPLEUKRAINIANToCharTabEx, + APPLEUKRAINIANUNI_START, APPLEUKRAINIANUNI_END, + NOTABUNI_START, NOTABUNI_END, APPLEUKRAINIANCHAR_START, APPLEUKRAINIANCHAR_END, NOTABCHAR_START, NOTABCHAR_END, APPLEUKRAINIANTOCHARTABEX_COUNT @@ -4095,12 +4095,12 @@ ImplTextEncodingData const aImplAPPLEUKRAINIANTextEncodingData nullptr, nullptr, nullptr }, + "iso8859-5", + "iso-8859-5", 1, 1, 1, 204, - "iso8859-5", - "iso-8859-5", RTL_TEXTENCODING_INFO_ASCII }; /* MAC, SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 0x98 (MAC 8.5 and above) */ @@ -4232,11 +4232,11 @@ ImplByteConvertData const aImplKOI8RByteCvtData = { aImplKOI8RToUniTab, nullptr, - KOI8RUNI_START, KOI8RUNI_END, - NOTABUNI_START, NOTABUNI_END, aImplKOI8RToCharTab, nullptr, aImplKOI8RToCharTabEx, + KOI8RUNI_START, KOI8RUNI_END, + NOTABUNI_START, NOTABUNI_END, KOI8RCHAR_START, KOI8RCHAR_END, NOTABCHAR_START, NOTABCHAR_END, KOI8RTOCHARTABEX_COUNT @@ -4254,12 +4254,12 @@ ImplTextEncodingData const aImplKOI8RTextEncodingData nullptr, nullptr, nullptr }, + "koi8-r", + "koi8-r", 1, 1, 1, 204, - "koi8-r", - "koi8-r", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_CYRILLIC, pc code page 866 (855?), mac encoding 7 */ @@ -4392,11 +4392,11 @@ ImplByteConvertData const aImplKOI8UByteCvtData = { aImplKOI8UToUniTab, nullptr, - KOI8UUNI_START, KOI8UUNI_END, - NOTABUNI_START, NOTABUNI_END, aImplKOI8UToCharTab, nullptr, aImplKOI8UToCharTabEx, + KOI8UUNI_START, KOI8UUNI_END, + NOTABUNI_START, NOTABUNI_END, KOI8UCHAR_START, KOI8UCHAR_END, NOTABCHAR_START, NOTABCHAR_END, KOI8UTOCHARTABEX_COUNT @@ -4412,12 +4412,12 @@ ImplTextEncodingData const aImplKoi8UTextEncodingData nullptr, nullptr, nullptr }, + "koi8-u", + "KOI8-U", 1, 1, 1, 204, - "koi8-u", - "KOI8-U", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_CYRILLIC */ @@ -4548,11 +4548,11 @@ ImplByteConvertData const aImplPT154ByteCvtData = { aImplPT154ToUniTab, nullptr, - PT154UNI_START, PT154UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplPT154ToCharTab, nullptr, aImplPT154ToCharTabEx, + PT154UNI_START, PT154UNI_END, + NOTABUNI_START, NOTABUNI_END, PT154CHAR_START, PT154CHAR_END, NOTABCHAR_START, NOTABCHAR_END, PT154TOCHARTABEX_COUNT @@ -4570,11 +4570,11 @@ ImplTextEncodingData const aImplPT154TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-5", + "PTCP154", 1, 1, 1, 204, - "iso8859-5", - "PTCP154", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_CYRILLIC */ diff --git a/sal/textenc/tcvtjp6.tab b/sal/textenc/tcvtjp6.tab index 6fd7df8e0e21..0cb02992d63b 100644 --- a/sal/textenc/tcvtjp6.tab +++ b/sal/textenc/tcvtjp6.tab @@ -571,10 +571,10 @@ ImplDBCSConvertData const aImplSJISDBCSCvtData = { aSJISUniLeadTab, aSJISDBCSHighTab, + aImplSJISDBCSEUDCTab, + DBCS_EUDC_SJIS_COUNT, 0x00, 0xFF, 0x40, 0xFC, - aImplSJISDBCSEUDCTab, - DBCS_EUDC_SJIS_COUNT }; /* ----------------------------------------------------------------------- */ @@ -589,12 +589,12 @@ ImplTextEncodingData const aImplSJISTextEncodingData nullptr, nullptr, nullptr }, + "euc-jp", + "shift_jis", 1, 2, 2, 128, - "euc-jp", - "shift_jis", RTL_TEXTENCODING_INFO_MULTIBYTE | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_JAPANESE, pc code page 932, mac encoding 1 */ @@ -1128,10 +1128,10 @@ ImplDBCSConvertData const aImplMS932DBCSCvtData = { aMS932UniLeadTab, aMS932DBCSHighTab, + aImplSJISDBCSEUDCTab, + DBCS_EUDC_SJIS_COUNT, 0x00, 0xFF, 0x40, 0xFC, - aImplSJISDBCSEUDCTab, - DBCS_EUDC_SJIS_COUNT }; /* ----------------------------------------------------------------------- */ @@ -1146,12 +1146,12 @@ ImplTextEncodingData const aImplMS932TextEncodingData nullptr, nullptr, nullptr }, + "euc-jp", + "shift_jis", 1, 2, 2, 128, - "euc-jp", - "shift_jis", RTL_TEXTENCODING_INFO_MULTIBYTE }; /* WIN/DOS/OS2, SCRIPT_JAPANESE, pc code page 932, mac encoding 1 */ @@ -1685,10 +1685,10 @@ ImplDBCSConvertData const aImplAPPLEJAPANESEDBCSCvtData = { aAPPLEJAPANESEUniLeadTab, aAPPLEJAPANESEDBCSHighTab, + aImplSJISDBCSEUDCTab, + DBCS_EUDC_SJIS_COUNT, 0x00, 0xFF, 0x40, 0xFC, - aImplSJISDBCSEUDCTab, - DBCS_EUDC_SJIS_COUNT }; /* ----------------------------------------------------------------------- */ @@ -1703,12 +1703,12 @@ ImplTextEncodingData const aImplAPPLEJAPANESETextEncodingData nullptr, nullptr, nullptr }, + "euc-jp", + "shift_jis", 1, 2, 2, 128, - "euc-jp", - "shift_jis", RTL_TEXTENCODING_INFO_MULTIBYTE }; /* MAC, SCRIPT_JAPANESE, pc code page 932, mac encoding 1 */ @@ -2526,12 +2526,12 @@ ImplTextEncodingData const aImplEUCJPTextEncodingData nullptr, nullptr, nullptr }, + "euc-jp", + "euc-jp", 1, 3, 2, 128, - "euc-jp", - "euc-jp", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MULTIBYTE | RTL_TEXTENCODING_INFO_MIME }; @@ -2558,11 +2558,11 @@ ImplByteConvertData const aImplJISX0201ByteCvtData = { nullptr, nullptr, - 0, 0, - 0, 0, aImplJISX0201Tab, nullptr, nullptr, + 0, 0, + 0, 0, HALFWIDTHKANA_START, HALFWIDTHKANA_END, 0, 0, 0 @@ -2580,12 +2580,12 @@ ImplTextEncodingData const aImplJISX0201TextEncodingData nullptr, nullptr, nullptr }, + "euc-jp", + "euc-jp", 1, 1, 1, 128, - "euc-jp", - "euc-jp", RTL_TEXTENCODING_INFO_MULTIBYTE }; /* SCRIPT_JAPANESE, pc code page 932, mac encoding 1 */ @@ -2595,10 +2595,10 @@ ImplDBCSConvertData const aImplJISX0208DBCSCvtData = { nullptr, aJIS0208DBCSHighTab, + nullptr, + 0, 0x00, 0xFF, 0x21, 0x7E, - nullptr, - 0 }; /* ----------------------------------------------------------------------- */ @@ -2613,12 +2613,12 @@ ImplTextEncodingData const aImplJISX0208TextEncodingData nullptr, nullptr, nullptr }, + "euc-jp", + "euc-jp", 2, 2, 2, 128, - "euc-jp", - "euc-jp", RTL_TEXTENCODING_INFO_MULTIBYTE }; /* SCRIPT_JAPANESE, pc code page 932, mac encoding 1 */ @@ -2628,10 +2628,10 @@ ImplDBCSConvertData const aImplJISX0212DBCSCvtData = { nullptr, aJIS0212DBCSHighTab, + nullptr, + 0, 0x00, 0xFF, 0x21, 0x7E, - nullptr, - 0 }; /* ----------------------------------------------------------------------- */ @@ -2646,11 +2646,11 @@ ImplTextEncodingData const aImplJISX0212TextEncodingData nullptr, nullptr, nullptr }, + "euc-jp", + "euc-jp", 2, 2, 2, 128, - "euc-jp", - "euc-jp", RTL_TEXTENCODING_INFO_MULTIBYTE }; /* SCRIPT_JAPANESE, pc code page 932, mac encoding 1 */ diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab index 794f82a04e55..441e113321a5 100644 --- a/sal/textenc/tcvtkr6.tab +++ b/sal/textenc/tcvtkr6.tab @@ -573,10 +573,10 @@ ImplDBCSConvertData const aImplKSC5601DBCSCvtData = { aKSC5601UniLeadTab, aKSC5601DBCSHighTab, + aImplMS949DBCSEUDCTab, + DBCS_EUDC_MS949_COUNT, 0xA1, 0xFE, 0xA1, 0xFE, - aImplMS949DBCSEUDCTab, - DBCS_EUDC_MS949_COUNT }; /* ----------------------------------------------------------------------- */ @@ -585,10 +585,10 @@ ImplDBCSConvertData const aImplMS949DBCSCvtData = { aKSC5601UniLeadTab, aKSC5601DBCSHighTab, + aImplMS949DBCSEUDCTab, + DBCS_EUDC_MS949_COUNT, 0x00, 0xFF, 0x41, 0xFE, - aImplMS949DBCSEUDCTab, - DBCS_EUDC_MS949_COUNT }; /* ======================================================================= */ @@ -603,12 +603,12 @@ ImplTextEncodingData const aImplEUCKRTextEncodingData nullptr, nullptr, nullptr }, + "euc-kr", + "euc-kr", 1, 2, 2, 129, - "euc-kr", - "euc-kr", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MULTIBYTE | RTL_TEXTENCODING_INFO_MIME }; @@ -626,12 +626,12 @@ ImplTextEncodingData const aImplMS949TextEncodingData nullptr, nullptr, nullptr }, + "euc-kr", + "euc-kr", 1, 2, 2, 129, - "euc-kr", - "euc-kr", RTL_TEXTENCODING_INFO_MULTIBYTE }; /* WIN/DOS/OS2, SCRIPT_KOREAN, pc code page 934, mac encoding 3 */ @@ -649,12 +649,12 @@ ImplTextEncodingData const aImplAPPLEKOREANTextEncodingData nullptr, nullptr, nullptr }, + "euc-kr", + "euc-kr", 1, 2, 2, 129, - "euc-kr", - "euc-kr", RTL_TEXTENCODING_INFO_MULTIBYTE }; /* MAC, SCRIPT_KOREAN, pc code page 934, mac encoding 3 */ @@ -1205,10 +1205,10 @@ ImplDBCSConvertData const aImplJOHABDBCSCvtData = { aJOHABUniLeadTab, aJOHABDBCSHighTab, + aImplMS1361DBCSEUDCTab, + DBCS_EUDC_MS1361_COUNT, 0x00, 0xFF, 0x31, 0xFE, - aImplMS1361DBCSEUDCTab, - DBCS_EUDC_MS1361_COUNT }; /* ======================================================================= */ @@ -1223,11 +1223,11 @@ ImplTextEncodingData const aImplMS1361TextEncodingData nullptr, nullptr, nullptr }, + "euc-kr", + "euc-kr", 1, 2, 2, 130, - "euc-kr", - "euc-kr", RTL_TEXTENCODING_INFO_MULTIBYTE | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_KOREAN, pc code page 1361, mac encoding 3 */ diff --git a/sal/textenc/tcvtlat1.tab b/sal/textenc/tcvtlat1.tab index c6414fca62d8..0bfcb1dd9c16 100644 --- a/sal/textenc/tcvtlat1.tab +++ b/sal/textenc/tcvtlat1.tab @@ -171,11 +171,11 @@ ImplByteConvertData const aImplIBM437ByteCvtData = { aImplIBM437ToUniTab, nullptr, - IBM437UNI_START, IBM437UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplIBM437ToCharTab, nullptr, aImplIBM437ToCharTabEx, + IBM437UNI_START, IBM437UNI_END, + NOTABUNI_START, NOTABUNI_END, IBM437CHAR_START, IBM437CHAR_END, NOTABCHAR_START, NOTABCHAR_END, IBM437TOCHARTABEX_COUNT @@ -193,12 +193,12 @@ ImplTextEncodingData const aImplIBM437TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-1", + "ibm437", 1, 1, 1, 0, - "iso8859-1", - "ibm437", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* DOS/OS2, SCRIPT_LATIN, pc code page 437 */ @@ -305,11 +305,11 @@ ImplByteConvertData const aImplIBM850ByteCvtData = { aImplIBM850ToUniTab, nullptr, - IBM850UNI_START, IBM850UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplIBM850ToCharTab, nullptr, aImplIBM850ToCharTabEx, + IBM850UNI_START, IBM850UNI_END, + NOTABUNI_START, NOTABUNI_END, IBM850CHAR_START, IBM850CHAR_END, NOTABCHAR_START, NOTABCHAR_END, IBM850TOCHARTABEX_COUNT @@ -327,12 +327,12 @@ ImplTextEncodingData const aImplIBM850TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-1", + "ibm850", 1, 1, 1, 0, - "iso8859-1", - "ibm850", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* DOS/OS2, SCRIPT_LATIN, pc code page 850 */ @@ -478,11 +478,11 @@ ImplByteConvertData const aImplIBM860ByteCvtData = { aImplIBM860ToUniTab, nullptr, - IBM860UNI_START, IBM860UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplIBM860ToCharTab, nullptr, aImplIBM860ToCharTabEx, + IBM860UNI_START, IBM860UNI_END, + NOTABUNI_START, NOTABUNI_END, IBM860CHAR_START, IBM860CHAR_END, NOTABCHAR_START, NOTABCHAR_END, IBM860TOCHARTABEX_COUNT @@ -500,12 +500,12 @@ ImplTextEncodingData const aImplIBM860TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-1", + "IBM860", 1, 1, 1, 0, - "iso8859-1", - "IBM860", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* DOS/OS2, SCRIPT_LATIN, pc code page 860 */ @@ -653,11 +653,11 @@ ImplByteConvertData const aImplIBM861ByteCvtData = { aImplIBM861ToUniTab, nullptr, - IBM861UNI_START, IBM861UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplIBM861ToCharTab, nullptr, aImplIBM861ToCharTabEx, + IBM861UNI_START, IBM861UNI_END, + NOTABUNI_START, NOTABUNI_END, IBM861CHAR_START, IBM861CHAR_END, NOTABCHAR_START, NOTABCHAR_END, IBM861TOCHARTABEX_COUNT @@ -675,12 +675,12 @@ ImplTextEncodingData const aImplIBM861TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-1", + "IBM861", 1, 1, 1, 0, - "iso8859-1", - "IBM861", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* DOS/OS2, SCRIPT_LATIN, pc code page 861, mac encoding 37 */ @@ -828,11 +828,11 @@ ImplByteConvertData const aImplIBM863ByteCvtData = { aImplIBM863ToUniTab, nullptr, - IBM863UNI_START, IBM863UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplIBM863ToCharTab, nullptr, aImplIBM863ToCharTabEx, + IBM863UNI_START, IBM863UNI_END, + NOTABUNI_START, NOTABUNI_END, IBM863CHAR_START, IBM863CHAR_END, NOTABCHAR_START, NOTABCHAR_END, IBM863TOCHARTABEX_COUNT @@ -850,12 +850,12 @@ ImplTextEncodingData const aImplIBM863TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-1", + "IBM863", 1, 1, 1, 0, - "iso8859-1", - "IBM863", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* DOS/OS2, SCRIPT_LATIN, pc code page 863 */ @@ -1003,11 +1003,11 @@ ImplByteConvertData const aImplIBM865ByteCvtData = { aImplIBM865ToUniTab, nullptr, - IBM865UNI_START, IBM865UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplIBM865ToCharTab, nullptr, aImplIBM865ToCharTabEx, + IBM865UNI_START, IBM865UNI_END, + NOTABUNI_START, NOTABUNI_END, IBM865CHAR_START, IBM865CHAR_END, NOTABCHAR_START, NOTABCHAR_END, IBM865TOCHARTABEX_COUNT @@ -1025,12 +1025,12 @@ ImplTextEncodingData const aImplIBM865TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-1", + "IBM865", 1, 1, 1, 0, - "iso8859-1", - "IBM865", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* DOS/OS2, SCRIPT_LATIN, pc code page 865 */ @@ -1131,11 +1131,11 @@ ImplByteConvertData const aImplISO885914ByteCvtData = { aImplISO885914ToUniTab, aImpl8090SameToUniTab, - ISO885914UNI_START, ISO885914UNI_END, - SAME8090UNI_START, SAME8090UNI_END, aImplISO885914ToCharTab, aImpl8090SameToCharTab, aImplISO885914ToCharTabEx, + ISO885914UNI_START, ISO885914UNI_END, + SAME8090UNI_START, SAME8090UNI_END, ISO885914CHAR_START, ISO885914CHAR_END, SAME8090CHAR_START, SAME8090CHAR_END, ISO885914TOCHARTABEX_COUNT @@ -1153,12 +1153,12 @@ ImplTextEncodingData const aImplISO885914TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-14", + "iso-8859-14", 1, 1, 1, 0, - "iso8859-14", - "iso-8859-14", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_LATIN, pc code page 850 */ @@ -1233,11 +1233,11 @@ ImplByteConvertData const aImplISO885915ByteCvtData = { aImplISO885915ToUniTab, aImpl8090SameToUniTab, - ISO885915UNI_START, ISO885915UNI_END, - SAME8090UNI_START, SAME8090UNI_END, aImplISO885915ToCharTab, aImpl8090SameToCharTab, aImplISO885915ToCharTabEx, + ISO885915UNI_START, ISO885915UNI_END, + SAME8090UNI_START, SAME8090UNI_END, ISO885915CHAR_START, ISO885915CHAR_END, SAME8090CHAR_START, SAME8090CHAR_END, ISO885915TOCHARTABEX_COUNT @@ -1255,12 +1255,12 @@ ImplTextEncodingData const aImplISO885915TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-15", + "iso-8859-15", 1, 1, 1, 0, - "iso8859-15", - "iso-8859-15", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_LATIN, pc code page 850 */ @@ -1373,11 +1373,11 @@ ImplByteConvertData const aImplAPPLEICELANDByteCvtData = { aImplAPPLEICELANDToUniTab, nullptr, - APPLEICELANDUNI_START, APPLEICELANDUNI_END, - NOTABUNI_START, NOTABUNI_END, aImplAPPLEICELANDToCharTab, nullptr, aImplAPPLEICELANDToCharTabEx, + APPLEICELANDUNI_START, APPLEICELANDUNI_END, + NOTABUNI_START, NOTABUNI_END, APPLEICELANDCHAR_START, APPLEICELANDCHAR_END, NOTABCHAR_START, NOTABCHAR_END, APPLEICELANDTOCHARTABEX_COUNT @@ -1395,12 +1395,12 @@ ImplTextEncodingData const aImplAPPLEICELANDTextEncodingData nullptr, nullptr, nullptr }, + "iso8859-1", + "iso-8859-1", 1, 1, 1, 0, - "iso8859-1", - "iso-8859-1", RTL_TEXTENCODING_INFO_ASCII }; /* MAC, SCRIPT_LATIN, pc code page 861, mac encoding 37 */ @@ -1520,11 +1520,11 @@ ImplByteConvertData const aImplAPPLEROMANByteCvtData = { aImplAPPLEROMANToUniTab, nullptr, - APPLEROMANUNI_START, APPLEROMANUNI_END, - NOTABUNI_START, NOTABUNI_END, aImplAPPLEROMANToCharTab, nullptr, aImplAPPLEROMANToCharTabEx, + APPLEROMANUNI_START, APPLEROMANUNI_END, + NOTABUNI_START, NOTABUNI_END, APPLEROMANCHAR_START, APPLEROMANCHAR_END, NOTABCHAR_START, NOTABCHAR_END, APPLEROMANTOCHARTABEX_COUNT @@ -1542,11 +1542,11 @@ ImplTextEncodingData const aImplAPPLEROMANTextEncodingData nullptr, nullptr, nullptr }, + "iso8859-1", + "macintosh", 1, 1, 1, 77, - "iso8859-1", - "macintosh", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* MAC, SCRIPT_LATIN, pc code page 850 */ diff --git a/sal/textenc/tcvtscn6.tab b/sal/textenc/tcvtscn6.tab index 7dc94ac61a57..806ec561b698 100644 --- a/sal/textenc/tcvtscn6.tab +++ b/sal/textenc/tcvtscn6.tab @@ -583,10 +583,10 @@ ImplDBCSConvertData const aImplGB2312DBCSCvtData = { aGB2312UniLeadTab, aGB2312DBCSHighTab, + aImplMS936DBCSEUDCTab, + DBCS_EUDC_MS936_COUNT, 0x00, 0xFF, 0xA1, 0xFE, - aImplMS936DBCSEUDCTab, - DBCS_EUDC_MS936_COUNT }; /* ----------------------------------------------------------------------- */ @@ -601,12 +601,12 @@ ImplTextEncodingData const aImplGB2312TextEncodingData nullptr, nullptr, nullptr }, + "euc-cn", + "gb2312", 1, 2, 2, 134, - "euc-cn", - "gb2312", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MULTIBYTE | RTL_TEXTENCODING_INFO_MIME }; @@ -624,12 +624,12 @@ ImplTextEncodingData const aImplEUCCNTextEncodingData nullptr, nullptr, nullptr }, + "euc-cn", + "gb2312", 1, 2, 2, 134, - "euc-cn", - "gb2312", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MULTIBYTE }; /* SCRIPT_CHINESE_SIMPLIFIED, pc code page 936, mac encoding 25 */ @@ -1163,10 +1163,10 @@ ImplDBCSConvertData const aImplGBT12345DBCSCvtData = { aGBT12345UniLeadTab, aGBT12345DBCSHighTab, + aImplMS936DBCSEUDCTab, + DBCS_EUDC_MS936_COUNT, 0x00, 0xFF, 0xA1, 0xFE, - aImplMS936DBCSEUDCTab, - DBCS_EUDC_MS936_COUNT }; /* ----------------------------------------------------------------------- */ @@ -1181,12 +1181,12 @@ ImplTextEncodingData const aImplGBT12345TextEncodingData nullptr, nullptr, nullptr }, + "euc-cn", + "cn-gb-12345", 1, 2, 2, 134, - "euc-cn", - "cn-gb-12345", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MULTIBYTE | RTL_TEXTENCODING_INFO_MIME }; @@ -1808,10 +1808,10 @@ ImplDBCSConvertData const aImplGBKDBCSCvtData = { aGBKUniLeadTab, aGBKDBCSHighTab, + aImplMS936DBCSEUDCTab, + DBCS_EUDC_MS936_COUNT, 0x00, 0xFF, 0x40, 0xFE, - aImplMS936DBCSEUDCTab, - DBCS_EUDC_MS936_COUNT }; /* ----------------------------------------------------------------------- */ @@ -1826,12 +1826,12 @@ ImplTextEncodingData const aImplGBKTextEncodingData nullptr, nullptr, nullptr }, + "euc-cn", + "GBK", 1, 2, 2, 134, - "euc-cn", - "GBK", RTL_TEXTENCODING_INFO_MULTIBYTE | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_CHINESE_SIMPLIFIED, pc code page 936, mac encoding 25 */ @@ -2365,10 +2365,10 @@ ImplDBCSConvertData const aImplMS936DBCSCvtData = { aMS936UniLeadTab, aMS936DBCSHighTab, + aImplMS936DBCSEUDCTab, + DBCS_EUDC_MS936_COUNT, 0x00, 0xFF, 0x40, 0xFE, - aImplMS936DBCSEUDCTab, - DBCS_EUDC_MS936_COUNT }; /* ----------------------------------------------------------------------- */ @@ -2383,12 +2383,12 @@ ImplTextEncodingData const aImplMS936TextEncodingData nullptr, nullptr, nullptr }, + "euc-cn", + "gb2312", 1, 2, 2, 134, - "euc-cn", - "gb2312", RTL_TEXTENCODING_INFO_MULTIBYTE }; /* WIN/DOS/OS2, SCRIPT_CHINESE_SIMPLIFIED, pc code page 936, mac encoding 25 */ @@ -2923,10 +2923,10 @@ ImplDBCSConvertData const aImplAPPLECHINSIMPDBCSCvtData = { aAPPLECHINSIMPUniLeadTab, aAPPLECHINSIMPDBCSHighTab, + nullptr, + 0, 0x00, 0xFF, 0xA1, 0xFE, - nullptr, - 0 }; /* ----------------------------------------------------------------------- */ @@ -2941,11 +2941,11 @@ ImplTextEncodingData const aImplAPPLECHINSIMPTextEncodingData nullptr, nullptr, nullptr }, + "euc-cn", + "gb2312", 1, 2, 2, 134, - "euc-cn", - "gb2312", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MULTIBYTE }; /* MAC, SCRIPT_CHINESE_SIMPLIFIED, pc code page 936, mac encoding 25 */ diff --git a/sal/textenc/tcvtsym1.tab b/sal/textenc/tcvtsym1.tab index 0edcdc74ece0..1b4f0f24b716 100644 --- a/sal/textenc/tcvtsym1.tab +++ b/sal/textenc/tcvtsym1.tab @@ -32,11 +32,11 @@ ImplTextEncodingData const aImplSYMBOLTextEncodingData nullptr, nullptr, nullptr }, + "adobe-fontspecific", + "invariant", 1, 1, 1, 2, - "adobe-fontspecific", - "invariant", RTL_TEXTENCODING_INFO_SYMBOL }; /* SCRIPT_SYMBOL, pc code page 65400, mac encoding 32 */ diff --git a/sal/textenc/tcvttcn6.tab b/sal/textenc/tcvttcn6.tab index 0c082671e425..7dedf3f4d253 100644 --- a/sal/textenc/tcvttcn6.tab +++ b/sal/textenc/tcvttcn6.tab @@ -585,10 +585,10 @@ ImplDBCSConvertData const aImplBIG5DBCSCvtData = { aBIG5UniLeadTab, aBIG5DBCSHighTab, + aImplMS950DBCSEUDCTab, + DBCS_EUDC_MS950_COUNT, 0x00, 0xFF, 0x40, 0xFE, - aImplMS950DBCSEUDCTab, - DBCS_EUDC_MS950_COUNT }; /* ----------------------------------------------------------------------- */ @@ -603,12 +603,12 @@ ImplTextEncodingData const aImplBIG5TextEncodingData nullptr, nullptr, nullptr }, + "euc-tw", + "big5", 1, 2, 2, 136, - "euc-tw", - "big5", RTL_TEXTENCODING_INFO_MULTIBYTE | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_CHINESE_TRADITIONAL, pc code page 950, mac encoding 2 */ @@ -1142,10 +1142,10 @@ ImplDBCSConvertData const aImplMS950DBCSCvtData = { aMS950UniLeadTab, aMS950DBCSHighTab, + aImplMS950DBCSEUDCTab, + DBCS_EUDC_MS950_COUNT, 0x00, 0xFF, 0x40, 0xFE, - aImplMS950DBCSEUDCTab, - DBCS_EUDC_MS950_COUNT }; /* ----------------------------------------------------------------------- */ @@ -1160,12 +1160,12 @@ ImplTextEncodingData const aImplMS950TextEncodingData nullptr, nullptr, nullptr }, + "euc-tw", + "big5", 1, 2, 2, 136, - "euc-tw", - "big5", RTL_TEXTENCODING_INFO_MULTIBYTE }; /* WIN/DOS/OS2, SCRIPT_CHINESE_TRADITIONAL, pc code page 950, mac encoding 2 */ @@ -1700,10 +1700,10 @@ ImplDBCSConvertData const aImplAPPLECHINTRADDBCSCvtData = { aAPPLECHINTRADUniLeadTab, aAPPLECHINTRADDBCSHighTab, + nullptr, + 0, 0x00, 0xFF, 0x40, 0xFE, - nullptr, - 0 }; /* ----------------------------------------------------------------------- */ @@ -1718,11 +1718,11 @@ ImplTextEncodingData const aImplAPPLECHINTRADTextEncodingData nullptr, nullptr, nullptr }, + "euc-tw", + "big5", 1, 2, 2, 136, - "euc-tw", - "big5", RTL_TEXTENCODING_INFO_MULTIBYTE }; /* MAC, SCRIPT_CHINESE_TRADITIONAL, pc code page 950, mac encoding 2 */ diff --git a/sal/textenc/tcvtuni1.tab b/sal/textenc/tcvtuni1.tab index c31491221714..e2c781317bdd 100644 --- a/sal/textenc/tcvtuni1.tab +++ b/sal/textenc/tcvtuni1.tab @@ -28,12 +28,12 @@ ImplTextEncodingData const aImplUTF7TextEncodingData ImplUTF7CreateUnicodeToTextContext, ImplUTF7DestroyUnicodeToTextContext, ImplUTF7ResetUnicodeToTextContext }, + "iso8859-1", + "utf-7", 1, 6, 1, 0, - "iso8859-1", - "utf-7", RTL_TEXTENCODING_INFO_CONTEXT | RTL_TEXTENCODING_INFO_UNICODE | RTL_TEXTENCODING_INFO_7BIT diff --git a/sal/textenc/tenchelp.hxx b/sal/textenc/tenchelp.hxx index 901156730da5..469ffabb7acf 100644 --- a/sal/textenc/tenchelp.hxx +++ b/sal/textenc/tenchelp.hxx @@ -90,12 +90,12 @@ struct ImplTextConverter struct SAL_DLLPUBLIC_RTTI ImplTextEncodingData { ImplTextConverter maConverter; + char const * mpBestUnixCharset; + char const * mpBestMimeCharset; sal_uInt8 mnMinCharSize; sal_uInt8 mnMaxCharSize; sal_uInt8 mnAveCharSize; sal_uInt8 mnBestWindowsCharset; - char const * mpBestUnixCharset; - char const * mpBestMimeCharset; sal_uInt32 mnInfoFlags; }; @@ -116,13 +116,13 @@ struct ImplByteConvertData { const sal_uInt16* mpToUniTab1; const sal_uInt16* mpToUniTab2; - unsigned char mnToUniStart1; - unsigned char mnToUniEnd1; - unsigned char mnToUniStart2; - unsigned char mnToUniEnd2; - const unsigned char* mpToCharTab1; - const unsigned char* mpToCharTab2; + const unsigned char* mpToCharTab1; + const unsigned char* mpToCharTab2; const ImplUniCharTabData* mpToCharExTab; + unsigned char mnToUniStart1; + unsigned char mnToUniEnd1; + unsigned char mnToUniStart2; + unsigned char mnToUniEnd2; sal_uInt16 mnToCharStart1; sal_uInt16 mnToCharEnd1; sal_uInt16 mnToCharStart2; @@ -169,12 +169,12 @@ struct ImplDBCSConvertData { const ImplDBCSToUniLeadTab* mpToUniLeadTab; const ImplUniToDBCSHighTab* mpToDBCSHighTab; - unsigned char mnLeadStart; - unsigned char mnLeadEnd; - unsigned char mnTrailStart; - unsigned char mnTrailEnd; const ImplDBCSEUDCData* mpEUDCTab; sal_uInt16 mnEUDCCount; + unsigned char mnLeadStart; + unsigned char mnLeadEnd; + unsigned char mnTrailStart; + unsigned char mnTrailEnd; }; /* ---------------------------------- */ diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index 1d7279f849a4..6b9247566de0 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -158,11 +158,11 @@ ImplByteConvertData const aImplMS1252ByteCvtData = { aImplMS1252ToUniTab, nullptr, - MS1252UNI_START, MS1252UNI_END, - NOTABUNI_START, NOTABUNI_END, aImplA0FFSameToCharTab, nullptr, aImplMS1252ToCharTabEx, + MS1252UNI_START, MS1252UNI_END, + NOTABUNI_START, NOTABUNI_END, SAMEA0FFCHAR_START, SAMEA0FFCHAR_END, NOTABCHAR_START, NOTABCHAR_END, MS1252TOCHARTABEX_COUNT @@ -180,12 +180,12 @@ ImplTextEncodingData const aImplMS1252TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-1", + "windows-1252", 1, 1, 1, 0, - "iso8859-1", - "windows-1252", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* WIN, SCRIPT_LATIN, pc code page 850 */ @@ -223,11 +223,11 @@ ImplByteConvertData const aImplISO88591ByteCvtData = { aImplISO88591ToUniTab, aImpl8090SameToUniTab, - ISO88591UNI_START, ISO88591UNI_END, - SAME8090UNI_START, SAME8090UNI_END, aImplA0FFSameToCharTab, aImpl8090SameToCharTab, nullptr, + ISO88591UNI_START, ISO88591UNI_END, + SAME8090UNI_START, SAME8090UNI_END, SAMEA0FFCHAR_START, SAMEA0FFCHAR_END, SAME8090CHAR_START, SAME8090CHAR_END, 0 @@ -245,12 +245,12 @@ ImplTextEncodingData const aImplISO88591TextEncodingData nullptr, nullptr, nullptr }, + "iso8859-1", + "iso-8859-1", 1, 1, 1, 0, - "iso8859-1", - "iso-8859-1", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MIME }; /* SCRIPT_LATIN, pc code page 850 */ @@ -271,11 +271,11 @@ ImplByteConvertData const aImplUSASCIIByteCvtData = { aImplMS1252ToUniTab, nullptr, - MS1252UNI_START, MS1252UNI_END, - NOTABUNI_START, NOTABUNI_END, nullptr, nullptr, nullptr, + MS1252UNI_START, MS1252UNI_END, + NOTABUNI_START, NOTABUNI_END, NOTABCHAR_START, NOTABCHAR_END, NOTABCHAR_START, NOTABCHAR_END, 0 @@ -293,12 +293,12 @@ ImplTextEncodingData const aImplUSASCIITextEncodingData nullptr, nullptr, nullptr }, + "iso8859-1", + "us-ascii", 1, 1, 1, 0, - "iso8859-1", - "us-ascii", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_7BIT | RTL_TEXTENCODING_INFO_MIME }; @@ -314,12 +314,12 @@ ImplTextEncodingData const aImplUTF8TextEncodingData &ImplCreateUnicodeToUtf8Context, &ImplDestroyUnicodeToUtf8Context, &ImplResetUnicodeToUtf8Context }, + "iso8859-1", + "utf-8", 1, 6, 1, 0, - "iso8859-1", - "utf-8", RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_UNICODE | RTL_TEXTENCODING_INFO_MULTIBYTE @@ -341,12 +341,12 @@ ImplTextEncodingData const aImplJavaUtf8TextEncodingData &ImplCreateUnicodeToUtf8Context, &ImplDestroyUnicodeToUtf8Context, &ImplResetUnicodeToUtf8Context }, + nullptr, + nullptr, 1, 3, 1, 0, - nullptr, - nullptr, RTL_TEXTENCODING_INFO_UNICODE | RTL_TEXTENCODING_INFO_MULTIBYTE }; namespace { |