diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2016-09-06 13:50:40 +1000 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2016-09-12 15:33:39 +0000 |
| commit | 56badc051ceee678e978add00d36c8e4d2d37ddb (patch) | |
| tree | e1fae2eadcd632f931f20faa1c7863840b4a565a /vcl | |
| parent | 3aaa820446f1ad3d3b0ddc557238b6fb3496dd54 (diff) | |
tdf#101889: add absent brackets to OpenSymbol
The code points for the glyphs were chosen according to IANA and Unicode:
http://www.iana.org/assignments/character-sets/character-sets.xml
ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/ADOBE/symbol.txt
Adobe Symbol font map has been corrected accordingly.
Fixed MT Extra font to always have symbol charset.
Change-Id: I45d4f33f2b640cc852175c7c5d5c875cb72a9297
Reviewed-on: https://gerrit.libreoffice.org/28677
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/wmf/winmtf.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index f7fd07e33c99..b6d7d76ba682 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -160,13 +160,12 @@ OUString getLODefaultLanguage() WinMtfFontStyle::WinMtfFontStyle( LOGFONTW& rFont ) { rtl_TextEncoding eCharSet; - if ((rFont.lfCharSet == DEFAULT_CHARSET) || (rFont.lfCharSet == OEM_CHARSET)) - if (rFont.alfFaceName == "Symbol") - // Workaround for incorrect charset for the Symbol nonstandard font - eCharSet = RTL_TEXTENCODING_SYMBOL; - else - eCharSet = utl_getWinTextEncodingFromLangStr(getLODefaultLanguage().toUtf8().getStr(), - rFont.lfCharSet == OEM_CHARSET); + if ((rFont.alfFaceName == "Symbol") + || (rFont.alfFaceName == "MT Extra")) + eCharSet = RTL_TEXTENCODING_SYMBOL; + else if ((rFont.lfCharSet == DEFAULT_CHARSET) || (rFont.lfCharSet == OEM_CHARSET)) + eCharSet = utl_getWinTextEncodingFromLangStr(getLODefaultLanguage().toUtf8().getStr(), + rFont.lfCharSet == OEM_CHARSET); else eCharSet = rtl_getTextEncodingFromWindowsCharset( rFont.lfCharSet ); if ( eCharSet == RTL_TEXTENCODING_DONTKNOW ) |