[Libreoffice-commits] core.git: vcl/win

[Khaled Hosny]

 vcl/win/gdi/salfont.cxx |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit ef4b9032de55e6b1b182e4ead1bbe6e590df296e
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Thu Dec 15 09:59:59 2016 +0200

    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 at libreoffice.org>
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>

diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 65c909f..8bf8c54 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 );