From 68818db0ec0e9c308c8a0772d46af551f439b32c Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sun, 2 Jan 2022 21:55:10 +0000
Subject: build a IDWriteFontCollection1 of our FR_PRIVATE fonts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

so we don't need to fallback to gdi in skia for those

we build it incrementally as GetFontFromFontFace fails
in the system font set

Change-Id: I2ac6d151657b9b720eed46dd7bcee0e9682e462a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127877
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 vcl/inc/skia/win/gdiimpl.hxx | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'vcl/inc')

diff --git a/vcl/inc/skia/win/gdiimpl.hxx b/vcl/inc/skia/win/gdiimpl.hxx
index 58043e5f6a83..a8897d0d7c20 100644
--- a/vcl/inc/skia/win/gdiimpl.hxx
+++ b/vcl/inc/skia/win/gdiimpl.hxx
@@ -25,6 +25,8 @@
 #include <SkFont.h>
 #include <SkFontMgr.h>
 
+#include <dwrite_3.h>
+
 class SkTypeface;
 class ControlCacheKey;
 
@@ -64,6 +66,8 @@ protected:
     static void initFontInfo();
     inline static sal::systools::COMReference<IDWriteFactory> dwriteFactory;
     inline static sal::systools::COMReference<IDWriteGdiInterop> dwriteGdiInterop;
+    inline static sal::systools::COMReference<IDWriteFontSetBuilder> dwriteFontSetBuilder;
+    inline static sal::systools::COMReference<IDWriteFontCollection1> dwritePrivateCollection;
     inline static sk_sp<SkFontMgr> dwriteFontMgr;
     inline static bool dwriteDone = false;
     static SkFont::Edging fontEdging;
-- 
cgit