1 files changed, 5 insertions, 9 deletions
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index d2d964d47f4b..10ec674c9f07 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -1370,19 +1370,15 @@ int CALLBACK SalEnumFontsProcExW( const LOGFONTW* lpelfe,
     }
     else
     {
+        // Only SFNT fonts are supported, ignore anything else.
+        if (SalLayout::UseCommonLayout() || OpenGLWrapper::isVCLOpenGLEnabled())
+            if (!(nFontType & TRUETYPE_FONTTYPE))
+                return 1;
+
         // 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 not supported by CommonSalLayout.
-        if (SalLayout::UseCommonLayout())
-            if ((pMetric->ntmTm.ntmFlags & NTM_TYPE1) || (pMetric->ntmTm.ntmFlags & NTM_MULTIPLEMASTER))
-                return 1;
-
         WinFontFace* pData = ImplLogMetricToDevFontDataW( pLogFont, &(pMetric->ntmTm), nFontType );
         pData->SetFontId( sal_IntPtr( pInfo->mnFontCount++ ) );