diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-25 21:03:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-25 21:03:26 +0100 |
| commit | 1268770147662f80c455e85bedfaaa7133919fc1 (patch) | |
| tree | 6932fd481a2df9df39c135868cf64707d8939553 /sal/textenc | |
| parent | c954581637cdd6b76a14a74d17068c1d3d481021 (diff) | |
#i113212# support x-iscii-de/RTL_TEXTENCODING_ISCII_DEVANGARI mapping
Diffstat (limited to 'sal/textenc')
| -rw-r--r-- | sal/textenc/convertiscii.tab | 2 | ||||
| -rw-r--r-- | sal/textenc/tencinfo.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sal/textenc/convertiscii.tab b/sal/textenc/convertiscii.tab index 60672b8c0188..96f5dc8582c5 100644 --- a/sal/textenc/convertiscii.tab +++ b/sal/textenc/convertiscii.tab @@ -108,5 +108,5 @@ static ImplTextEncodingData const aImplIsciiDevanagariTextEncodingData 1, 1, NULL, - NULL, + "x-iscii-de", RTL_TEXTENCODING_INFO_ASCII }; diff --git a/sal/textenc/tencinfo.c b/sal/textenc/tencinfo.c index 65713c7b1af1..c56d1a671ae9 100644 --- a/sal/textenc/tencinfo.c +++ b/sal/textenc/tencinfo.c @@ -750,6 +750,9 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMimeCharset( const sal_Char* pM { "csptcp154", RTL_TEXTENCODING_PT154 }, { "pt154", RTL_TEXTENCODING_PT154 }, { "cp154", RTL_TEXTENCODING_PT154 }, + { "xisciide", RTL_TEXTENCODING_ISCII_DEVANAGARI }, + /* This is not an official MIME character set name, but is in use by + various windows APIs. */ { NULL, RTL_TEXTENCODING_DONTKNOW } }; @@ -912,6 +915,7 @@ rtl_getTextEncodingFromWindowsCodePage(sal_uInt32 nCodePage) case 51932: return RTL_TEXTENCODING_EUC_JP; case 51936: return RTL_TEXTENCODING_EUC_CN; case 51949: return RTL_TEXTENCODING_EUC_KR; + case 57002: return RTL_TEXTENCODING_ISCII_DEVANAGARI; case 65000: return RTL_TEXTENCODING_UTF7; case 65001: return RTL_TEXTENCODING_UTF8; default: return RTL_TEXTENCODING_DONTKNOW; @@ -987,6 +991,7 @@ rtl_getWindowsCodePageFromTextEncoding(rtl_TextEncoding nEncoding) case RTL_TEXTENCODING_EUC_JP: return 51932; case RTL_TEXTENCODING_EUC_CN: return 51936; case RTL_TEXTENCODING_EUC_KR: return 51949; + case RTL_TEXTENCODING_ISCII_DEVANAGARI: return 57002; case RTL_TEXTENCODING_UTF7: return 65000; case RTL_TEXTENCODING_UTF8: return 65001; default: return 0; |