summaryrefslogtreecommitdiff
path: root/vcl/inc/win
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-08-20 15:41:17 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-08-21 21:28:01 +0200
commit2f97ae5def2e51cfec3240fa625ffd495288360e (patch)
tree27d49dc19288c21254023bc784618de5a3e3a6bf /vcl/inc/win
parent3a6f510c3e3bc269b2816cd6cca57f81eb7c4ae3 (diff)
use LogicalFontInstance with SalGraphics
Change-Id: I66fb1ff4b2fdcc211e0a9d5831f6dcc5e564e789 Reviewed-on: https://gerrit.libreoffice.org/59372 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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 85b92946226e..c55193e255e9 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -185,7 +185,7 @@ private:
bool CacheGlyphs(const GenericSalLayout& rLayout);
bool DrawCachedGlyphs(const GenericSalLayout& rLayout);
- HFONT ImplDoSetFont(FontSelectPattern const * i_pFont, const PhysicalFontFace * i_pFontFace, float& o_rFontScale, HFONT& o_rOldFont);
+ HFONT ImplDoSetFont(FontSelectPattern const & i_rFont, const PhysicalFontFace * i_pFontFace, float& o_rFontScale, HFONT& o_rOldFont);
public:
HDC getHDC() const { return mhLocalDC; }
@@ -337,7 +337,7 @@ public:
// set the text color to a specific color
virtual void SetTextColor( Color nColor ) override;
// set the font
- virtual void SetFont( const FontSelectPattern*, int nFallbackLevel ) override;
+ virtual void SetFont( LogicalFontInstance*, int nFallbackLevel ) override;
// get the current font's metrics
virtual void GetFontMetric( ImplFontMetricDataRef&, int nFallbackLevel ) override;
// get the repertoire of the current font