diff options
| author | th <th@openoffice.org> | 2001-07-16 10:44:08 +0000 |
|---|---|---|
| committer | th <th@openoffice.org> | 2001-07-16 10:44:08 +0000 |
| commit | deac1c2539fac182f1123492466c2c700b945b2c (patch) | |
| tree | 1328c773dd0c5dc0610a82c34bc5406517842f3e /sal | |
| parent | cca7623a91f46805493c5ada95e1f6ce674edcdc (diff) | |
#88970# - return more MIME-charset for better MS-compatibility
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/inc/rtl/tencinfo.h | 6 | ||||
| -rw-r--r-- | sal/textenc/tcvtscn6.tab | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sal/inc/rtl/tencinfo.h b/sal/inc/rtl/tencinfo.h index c7249c5929cf..d4b8dd530df5 100644 --- a/sal/inc/rtl/tencinfo.h +++ b/sal/inc/rtl/tencinfo.h @@ -2,9 +2,9 @@ * * $RCSfile: tencinfo.h,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: pl $ $Date: 2001-05-11 14:44:41 $ + * last change: $Author: th $ $Date: 2001-07-16 11:44:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ - #ifndef _RTL_TENCINFO_H #define _RTL_TENCINFO_H @@ -114,6 +113,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const sal_Char* pU sal_uInt8 SAL_CALL rtl_getBestWindowsCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding ); const sal_Char* SAL_CALL rtl_getBestMimeCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding ); const sal_Char* SAL_CALL rtl_getBestUnixCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding ); + #ifdef __cplusplus } #endif diff --git a/sal/textenc/tcvtscn6.tab b/sal/textenc/tcvtscn6.tab index 8692252f5e56..7e3bc169e45c 100644 --- a/sal/textenc/tcvtscn6.tab +++ b/sal/textenc/tcvtscn6.tab @@ -2,9 +2,9 @@ * * $RCSfile: tcvtscn6.tab,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: th $ $Date: 2000-12-13 22:23:24 $ + * last change: $Author: th $ $Date: 2001-07-16 11:42:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1835,8 +1835,7 @@ static ImplTextEncodingData const aImplGBKTextEncodingData = (const sal_Char*)"euc-cn", (const sal_Char*)"gb2312", RTL_TEXTENCODING_INFO_ASCII | - RTL_TEXTENCODING_INFO_MULTIBYTE | - RTL_TEXTENCODING_INFO_MIME, + RTL_TEXTENCODING_INFO_MULTIBYTE, SCRIPT_CHINESE_SIMPLIFIED }; |