summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-04-12 10:43:14 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-04-12 10:44:17 +0200
commit4a2a03ff08ffd5e490e8d0bb1f27bb4d94c3c8ed (patch)
treeb3046626332cbfc8a3b435fd75aa6624528754af /tools
parentbc937896e255f1372726e36b00ca0d3b0afce35e (diff)
Revert "remove duplicate charset entries"
This reverts commit 98973e40e8753e96c7ae271a2a13078646fadb1b. Not actually duplicates, the entries have underscore instead of dash.
Diffstat (limited to 'tools')
-rw-r--r--tools/source/inet/inetmime.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index d454362d7d20..27cb1857b5d4 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -921,6 +921,7 @@ static EncodingEntry const aEncodingMap[]
{ "ISO-8859-1", RTL_TEXTENCODING_ISO_8859_1 },
{ "ISO_8859-1:1987", RTL_TEXTENCODING_ISO_8859_1 },
{ "ISO-IR-100", RTL_TEXTENCODING_ISO_8859_1 },
+ { "ISO_8859-1", RTL_TEXTENCODING_ISO_8859_1 },
{ "LATIN1", RTL_TEXTENCODING_ISO_8859_1 },
{ "L1", RTL_TEXTENCODING_ISO_8859_1 },
{ "IBM819", RTL_TEXTENCODING_ISO_8859_1 },
@@ -929,29 +930,34 @@ static EncodingEntry const aEncodingMap[]
{ "ISO-8859-2", RTL_TEXTENCODING_ISO_8859_2 },
{ "ISO_8859-2:1987", RTL_TEXTENCODING_ISO_8859_2 },
{ "ISO-IR-101", RTL_TEXTENCODING_ISO_8859_2 },
+ { "ISO_8859-2", RTL_TEXTENCODING_ISO_8859_2 },
{ "LATIN2", RTL_TEXTENCODING_ISO_8859_2 },
{ "L2", RTL_TEXTENCODING_ISO_8859_2 },
{ "CSISOLATIN2", RTL_TEXTENCODING_ISO_8859_2 },
{ "ISO-8859-3", RTL_TEXTENCODING_ISO_8859_3 },
{ "ISO_8859-3:1988", RTL_TEXTENCODING_ISO_8859_3 },
{ "ISO-IR-109", RTL_TEXTENCODING_ISO_8859_3 },
+ { "ISO_8859-3", RTL_TEXTENCODING_ISO_8859_3 },
{ "LATIN3", RTL_TEXTENCODING_ISO_8859_3 },
{ "L3", RTL_TEXTENCODING_ISO_8859_3 },
{ "CSISOLATIN3", RTL_TEXTENCODING_ISO_8859_3 },
{ "ISO-8859-4", RTL_TEXTENCODING_ISO_8859_4 },
{ "ISO_8859-4:1988", RTL_TEXTENCODING_ISO_8859_4 },
{ "ISO-IR-110", RTL_TEXTENCODING_ISO_8859_4 },
+ { "ISO_8859-4", RTL_TEXTENCODING_ISO_8859_4 },
{ "LATIN4", RTL_TEXTENCODING_ISO_8859_4 },
{ "L4", RTL_TEXTENCODING_ISO_8859_4 },
{ "CSISOLATIN4", RTL_TEXTENCODING_ISO_8859_4 },
{ "ISO-8859-5", RTL_TEXTENCODING_ISO_8859_5 },
{ "ISO_8859-5:1988", RTL_TEXTENCODING_ISO_8859_5 },
{ "ISO-IR-144", RTL_TEXTENCODING_ISO_8859_5 },
+ { "ISO_8859-5", RTL_TEXTENCODING_ISO_8859_5 },
{ "CYRILLIC", RTL_TEXTENCODING_ISO_8859_5 },
{ "CSISOLATINCYRILLIC", RTL_TEXTENCODING_ISO_8859_5 },
{ "ISO-8859-6", RTL_TEXTENCODING_ISO_8859_6 },
{ "ISO_8859-6:1987", RTL_TEXTENCODING_ISO_8859_6 },
{ "ISO-IR-127", RTL_TEXTENCODING_ISO_8859_6 },
+ { "ISO_8859-6", RTL_TEXTENCODING_ISO_8859_6 },
{ "ECMA-114", RTL_TEXTENCODING_ISO_8859_6 },
{ "ASMO-708", RTL_TEXTENCODING_ISO_8859_6 },
{ "ARABIC", RTL_TEXTENCODING_ISO_8859_6 },
@@ -959,6 +965,7 @@ static EncodingEntry const aEncodingMap[]
{ "ISO-8859-7", RTL_TEXTENCODING_ISO_8859_7 },
{ "ISO_8859-7:1987", RTL_TEXTENCODING_ISO_8859_7 },
{ "ISO-IR-126", RTL_TEXTENCODING_ISO_8859_7 },
+ { "ISO_8859-7", RTL_TEXTENCODING_ISO_8859_7 },
{ "ELOT_928", RTL_TEXTENCODING_ISO_8859_7 },
{ "ECMA-118", RTL_TEXTENCODING_ISO_8859_7 },
{ "GREEK", RTL_TEXTENCODING_ISO_8859_7 },
@@ -967,15 +974,18 @@ static EncodingEntry const aEncodingMap[]
{ "ISO-8859-8", RTL_TEXTENCODING_ISO_8859_8 },
{ "ISO_8859-8:1988", RTL_TEXTENCODING_ISO_8859_8 },
{ "ISO-IR-138", RTL_TEXTENCODING_ISO_8859_8 },
+ { "ISO_8859-8", RTL_TEXTENCODING_ISO_8859_8 },
{ "HEBREW", RTL_TEXTENCODING_ISO_8859_8 },
{ "CSISOLATINHEBREW", RTL_TEXTENCODING_ISO_8859_8 },
{ "ISO-8859-9", RTL_TEXTENCODING_ISO_8859_9 },
{ "ISO_8859-9:1989", RTL_TEXTENCODING_ISO_8859_9 },
{ "ISO-IR-148", RTL_TEXTENCODING_ISO_8859_9 },
+ { "ISO_8859-9", RTL_TEXTENCODING_ISO_8859_9 },
{ "LATIN5", RTL_TEXTENCODING_ISO_8859_9 },
{ "L5", RTL_TEXTENCODING_ISO_8859_9 },
{ "CSISOLATIN5", RTL_TEXTENCODING_ISO_8859_9 },
{ "ISO-8859-14", RTL_TEXTENCODING_ISO_8859_14 }, // RFC 2047
+ { "ISO_8859-15", RTL_TEXTENCODING_ISO_8859_15 },
{ "ISO-8859-15", RTL_TEXTENCODING_ISO_8859_15 }, // RFC 2047
{ "MACINTOSH", RTL_TEXTENCODING_APPLE_ROMAN },
{ "MAC", RTL_TEXTENCODING_APPLE_ROMAN },