diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-01-02 21:55:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-01-11 18:11:23 +0100 |
| commit | 68818db0ec0e9c308c8a0772d46af551f439b32c (patch) | |
| tree | 18befac2baed205b762c23a379e0eb4cc7bca910 /vcl/inc | |
| parent | f242cc6d5be5c6f5446976fd6a7c26ad0cee7683 (diff) | |
build a IDWriteFontCollection1 of our FR_PRIVATE fonts
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>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/skia/win/gdiimpl.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
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; |