diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-15 09:59:59 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-15 10:11:33 +0000 |
| commit | ef4b9032de55e6b1b182e4ead1bbe6e590df296e (patch) | |
| tree | 4102b9ff2361f9cd74f9a9ac3b5f4a6538bcda84 | |
| parent | 484370526ddf1ae94a62439d879f8ef592180d19 (diff) | |
tdf#103514: Try harder to ignore non-SFNT fonts
It seems that Script (and probably other bitmap fonts) have zero
nFontType, so instead if checking for RASTER_FONTTYPE, check for not
TRUTYPE_FONTTYPE (which seems to cover both TrueType and CFF-based SFNT
fonts).
Change-Id: Ie39ed99b219b756885b13b3ecbf3616556a277db
Reviewed-on: https://gerrit.libreoffice.org/32031
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
| -rw-r--r-- | vcl/win/gdi/salfont.cxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index 65c909ffb1c7..8bf8c547657a 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -1054,16 +1054,8 @@ int CALLBACK SalEnumFontsProcExW( const LOGFONTW* lpelfe, } else { - // Ignore non-device font on printer. - if (pInfo->mbPrinter && !(nFontType & DEVICE_FONTTYPE)) - return 1; - - // Ignore non-scalable fonts. - if (nFontType & RASTER_FONTTYPE) - return 1; - - // Ignore font formats we don’t support. - if ((pMetric->ntmTm.ntmFlags & NTM_TYPE1) || (pMetric->ntmTm.ntmFlags & NTM_MULTIPLEMASTER)) + // Only SFNT fonts are supported, ignore anything else. + if (!(nFontType & TRUETYPE_FONTTYPE)) return 1; WinFontFace* pData = ImplLogMetricToDevFontDataW( pLogFont, &(pMetric->ntmTm), nFontType ); |