From bfb457712b3f558450d64cee168850ec91276ff6 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Mon, 25 Oct 2010 14:56:00 +0200
Subject: [PATCH] sb132: #i113212# support x-iscii-de (based on a patch by cmc)

---
 sal/textenc/convertiscii.tab | 2 +-
 sal/textenc/tencinfo.c       | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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 0c51a98206e5..30a2fef0da72 100644
--- a/sal/textenc/tencinfo.c
+++ b/sal/textenc/tencinfo.c
@@ -910,6 +910,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 no official MIME character set name, but is in use by
+               various windows APIs. */
         { NULL, RTL_TEXTENCODING_DONTKNOW }
     };
 
@@ -1072,6 +1075,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;
@@ -1147,6 +1151,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;