diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-21 09:12:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-21 21:35:55 +0200 |
| commit | 232992fa65358e7bc493c9f19f724457eed4feb5 (patch) | |
| tree | 5b4b4cf64c8848f9ee99c44b7fc88a3b473e1433 /vcl/inc/win | |
| parent | 99fc650d519f78e3866ce119c7d3640a070e88c5 (diff) | |
can now use just FontSelectPatternAttributes
Change-Id: I1857afa0a9aff39118ba3c242134985f865e37c1
Reviewed-on: https://gerrit.libreoffice.org/59387
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/inc/win')
| -rw-r--r-- | vcl/inc/win/salgdi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index c55193e255e9..ebb9fc8eac3d 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -42,7 +42,7 @@ #include <hb-ot.h> #include <dwrite.h> -class FontSelectPattern; +class FontSelectPatternAttributes; class WinFontInstance; class ImplFontAttrCache; class OpenGLTexture; @@ -185,7 +185,7 @@ private: bool CacheGlyphs(const GenericSalLayout& rLayout); bool DrawCachedGlyphs(const GenericSalLayout& rLayout); - HFONT ImplDoSetFont(FontSelectPattern const & i_rFont, const PhysicalFontFace * i_pFontFace, float& o_rFontScale, HFONT& o_rOldFont); + HFONT ImplDoSetFont(FontSelectPatternAttributes const & i_rFont, const PhysicalFontFace * i_pFontFace, float& o_rFontScale, HFONT& o_rOldFont); public: HDC getHDC() const { return mhLocalDC; } @@ -402,7 +402,7 @@ public: // Init/Deinit Graphics void ImplUpdateSysColorEntries(); int ImplIsSysColorEntry( Color nColor ); -void ImplGetLogFontFromFontSelect( HDC, const FontSelectPattern*, +void ImplGetLogFontFromFontSelect( HDC, const FontSelectPatternAttributes*, const PhysicalFontFace*, LOGFONTW& ); #define MAX_64KSALPOINTS ((((sal_uInt16)0xFFFF)-8)/sizeof(POINTS)) |