From 232992fa65358e7bc493c9f19f724457eed4feb5 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 21 Aug 2018 09:12:16 +0100 Subject: can now use just FontSelectPatternAttributes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1857afa0a9aff39118ba3c242134985f865e37c1 Reviewed-on: https://gerrit.libreoffice.org/59387 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/inc/win/salgdi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vcl/inc/win') 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 #include -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)) -- cgit