vcl/win/gdi/salfont.cxx | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 064773ecc3bfba37c80c2f9c6fccde35395a57c0
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Tue Dec 20 23:35:28 2016 +0200
tdf#104733: Don't ignore OpenType-CFF fons on Windows
This is a folloup for ef4b9032de55e6b1b182e4ead1bbe6e590df296e, turns
out TRUTYPE_FONTTYPE does not cover CFF fonts like I thought (the
fonts that I was checking were actually TTF fonts).
Reviewed-on: https://gerrit.libreoffice.org/32258
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledho...@eglug.org>
(cherry picked from commit 72002992a3c5213882fa4d60c7cd8fab10f0b009)
Change-Id: I2d7b34b625aa03134421dc44a24e3c66be25df98
Reviewed-on: https://gerrit.libreoffice.org/32270
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledho...@eglug.org>
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index fd207a5..9de0541 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -1408,8 +1408,15 @@ int CALLBACK SalEnumFontsProcExW( const LOGFONTW* lpelfe,
{
// Only SFNT fonts are supported, ignore anything else.
if (SalLayout::UseCommonLayout() ||
OpenGLWrapper::isVCLOpenGLEnabled())
- if (!(nFontType & TRUETYPE_FONTTYPE))
- return 1;
+ {
+ if (!(nFontType & TRUETYPE_FONTTYPE) &&
+ !(pMetric->ntmTm.ntmFlags & NTM_PS_OPENTYPE) &&
+ !(pMetric->ntmTm.ntmFlags & NTM_TT_OPENTYPE))
+ {
+ SAL_INFO("vcl.gdi", "Unsupported font ignored: " <<
OUString(pLogFont->elfLogFont.lfFaceName));
+ return 1;
+ }
+ }
// Ignore non-device font on printer.
if (pInfo->mbPrinter && !(nFontType & DEVICE_FONTTYPE))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
