diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-12-12 16:36:29 +0500 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-12-12 13:25:14 +0100 |
commit | 02c7a9bec769aaa0256bfe4ed8f9a323732e83b6 (patch) | |
tree | 871f146e779064c045e4faed93bcb1a86186162b /vcl/skia | |
parent | c1473de894b17f113fcb6c81f82592434e272a8c (diff) |
Use correct object
Fix an error in commit a1b18eba354dc773c214fc3b7ee92c3473ec4a5e
(Implement Custom Font Collections on pre-Windows 10 systems, 2024-01-11),
where the wrong object used in the call to CreateFontSetBuilder resulted
in the empty return from the initializer, overwriting the just-created
reference. Before commit 93350f4694ef8606150a95786c760bb2efd43979 (Drop
pre-Win10 code from WinSkiaSalGraphicsImpl, 2024-12-07), it was checked,
and the pre-Win10 path was used. After the said commit, it results in a
nullptr dereference.
Change-Id: Ia59f6ae6d236d1eb2c474f4330dcee6f38276c66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178357
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'vcl/skia')
-rw-r--r-- | vcl/skia/win/gdiimpl.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx index 2f257594b668..8de57dba2b89 100644 --- a/vcl/skia/win/gdiimpl.cxx +++ b/vcl/skia/win/gdiimpl.cxx @@ -56,8 +56,7 @@ getDWritePrivateFontCollection(IDWriteFontFace* fontFace) static sal::systools::COMReference<IDWriteFontSetBuilder> dwriteFontSetBuilder = [] { sal::systools::COMReference<IDWriteFontSetBuilder> builder; - sal::systools::ThrowIfFailed(dwriteFactory3->CreateFontSetBuilder(&dwriteFontSetBuilder), - SAL_WHERE); + sal::systools::ThrowIfFailed(dwriteFactory3->CreateFontSetBuilder(&builder), SAL_WHERE); return builder; }(); |