diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2016-08-23 00:33:26 +1000 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-08-30 05:40:43 +0000 |
| commit | 20f6a6b159c69771dc0e087f63b6c701908e32e2 (patch) | |
| tree | 455b03cfe737f212d31810994fba2e91ff54ce56 /include/rtl | |
| parent | 965f379b6ed2884f60b7fd6c0aae107fa5fceea7 (diff) | |
tdf#99402: fix Metafile Font handling
1. For DEFAULT_CHARSET/OEM_CHARSET, use correct encoding
based on LibreOffice Default Language for Documents setting
(Tools->Options...->Language Settings->Languages).
For that, two functions added to tencinfo.h, that map language
names to corresponding Windows ANSI/OEM encodings.
2. If charset is DEFAULT_CHARSET/OEM_CHARSET for Symbol font,
then always use RTL_TEXTENCODING_SYMBOL.
Unit test is included.
Change-Id: Ibff63e7a03dec42a9d2a74399936d6bc04f2ff1a
Reviewed-on: https://gerrit.libreoffice.org/28322
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/rtl')
| -rw-r--r-- | include/rtl/tencinfo.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/rtl/tencinfo.h b/include/rtl/tencinfo.h index 48f2ff0fdcf8..c6980112410c 100644 --- a/include/rtl/tencinfo.h +++ b/include/rtl/tencinfo.h @@ -170,6 +170,8 @@ SAL_DLLPUBLIC sal_Bool SAL_CALL rtl_getTextEncodingInfo( @return The corresponding rtl_TextEncoding value, or RTL_TEXTENCODING_DONTKNOW if no mapping is applicable. + If nWinCharset is 255 (OEM_CHARSET), then return value is RTL_TEXTENCODING_IBM_850, + regardless of current locale. */ SAL_DLLPUBLIC rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromWindowsCharset( sal_uInt8 nWinCharset ); |