#96038# Added MIME charset names for GB18030 and GBK.

3 files changed, 22 insertions, 12 deletions

diff --git a/sal/textenc/convertgb18030.tab b/sal/textenc/convertgb18030.tab
index 43a622f0d8fc..5c28291f42b1 100644
--- a/sal/textenc/convertgb18030.tab
+++ b/sal/textenc/convertgb18030.tab
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: convertgb18030.tab,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: sb $ $Date: 2001-10-12 13:10:29 $
+ *  last change: $Author: sb $ $Date: 2002-05-28 10:12:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,6 +97,8 @@ static ImplTextEncodingData const aImplGb18030TextEncodingData
         2,
         134,
         "gbk-0",
-        "UTF-8",
-        RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MULTIBYTE };
+        "GB18030",
+        RTL_TEXTENCODING_INFO_ASCII
+            | RTL_TEXTENCODING_INFO_MULTIBYTE
+            | RTL_TEXTENCODING_INFO_MIME };
     /* SCRIPT_CHINESE_SIMPLIFIED */
diff --git a/sal/textenc/tcvtscn6.tab b/sal/textenc/tcvtscn6.tab
index 5393ce25d14e..33d08826b20a 100644
--- a/sal/textenc/tcvtscn6.tab
+++ b/sal/textenc/tcvtscn6.tab
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tcvtscn6.tab,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: sb $ $Date: 2002-03-18 09:03:48 $
+ *  last change: $Author: sb $ $Date: 2002-05-28 10:12:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1785,8 +1785,10 @@ static ImplTextEncodingData const aImplGBKTextEncodingData
         2,
         134,
         "euc-cn",
-        "gb2312",
-        RTL_TEXTENCODING_INFO_ASCII | RTL_TEXTENCODING_INFO_MULTIBYTE };
+        "GBK",
+        RTL_TEXTENCODING_INFO_ASCII
+            | RTL_TEXTENCODING_INFO_MULTIBYTE
+            | RTL_TEXTENCODING_INFO_MIME };
     /* SCRIPT_CHINESE_SIMPLIFIED, pc code page 936, mac encoding 25 */
 
 /* ======================================================================= */
diff --git a/sal/textenc/tencinfo.c b/sal/textenc/tencinfo.c
index 9383be7d9759..738e42ff595a 100644
--- a/sal/textenc/tencinfo.c
+++ b/sal/textenc/tencinfo.c
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tencinfo.c,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: sb $ $Date: 2002-03-19 15:11:16 $
+ *  last change: $Author: sb $ $Date: 2002-05-28 10:12:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -919,11 +919,17 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMimeCharset( const sal_Char* pM
         { "ascii", RTL_TEXTENCODING_ASCII_US },
         { "us", RTL_TEXTENCODING_ASCII_US },
         { "gb180302000", RTL_TEXTENCODING_GB_18030 },
-            /* This is no actual MIME character set name, it's only a guess */
+            /* This is no actual MIME character set name, it is only in here
+               for backwards compatibility (before "GB18030" was officially
+               registered with IANA, this code contained some guesses of what
+               would become official names for GB18030). */
         { "gb18030", RTL_TEXTENCODING_GB_18030 },
-            /* This is no actual MIME character set name, it's only a guess */
         { "big5hkscs", RTL_TEXTENCODING_BIG5_HKSCS },
         { "tis620", RTL_TEXTENCODING_TIS_620 },
+        { "gbk", RTL_TEXTENCODING_GBK },
+        { "cp936", RTL_TEXTENCODING_GBK },
+        { "ms936", RTL_TEXTENCODING_GBK },
+        { "windows936", RTL_TEXTENCODING_GBK },
         { NULL, RTL_TEXTENCODING_DONTKNOW }
     };