diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-20 15:41:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-21 21:28:01 +0200 |
| commit | 2f97ae5def2e51cfec3240fa625ffd495288360e (patch) | |
| tree | 27d49dc19288c21254023bc784618de5a3e3a6bf /vcl/unx/generic/gdi | |
| parent | 3a6f510c3e3bc269b2816cd6cca57f81eb7c4ae3 (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/unx/generic/gdi')
| -rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 6 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/font.cxx | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 4711f7084ab9..600a1eaafa81 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -84,7 +84,7 @@ CairoTextRender::CairoTextRender() rp = nullptr; } -void CairoTextRender::setFont( const FontSelectPattern *pEntry, int nFallbackLevel ) +void CairoTextRender::setFont( LogicalFontInstance *pEntry, int nFallbackLevel ) { // release all no longer needed font resources for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i ) @@ -102,7 +102,7 @@ void CairoTextRender::setFont( const FontSelectPattern *pEntry, int nFallbackLev return; // handle the request for a non-native X11-font => use the GlyphCache - FreetypeFont* pFreetypeFont = GlyphCache::GetInstance().CacheFont( *pEntry ); + FreetypeFont* pFreetypeFont = GlyphCache::GetInstance().CacheFont(pEntry->GetFontSelectPattern()); if( pFreetypeFont != nullptr ) { // ignore fonts with e.g. corrupted font files @@ -364,7 +364,7 @@ bool CairoTextRender::GetFontCapabilities(vcl::FontCapabilities &rGetImplFontCap // SalGraphics -void CairoTextRender::SetFont( const FontSelectPattern *pEntry, int nFallbackLevel ) +void CairoTextRender::SetFont( LogicalFontInstance *pEntry, int nFallbackLevel ) { setFont(pEntry, nFallbackLevel); } diff --git a/vcl/unx/generic/gdi/font.cxx b/vcl/unx/generic/gdi/font.cxx index 9cdbff3ea69d..381e79373953 100644 --- a/vcl/unx/generic/gdi/font.cxx +++ b/vcl/unx/generic/gdi/font.cxx @@ -69,8 +69,7 @@ bool X11SalGraphics::GetFontCapabilities(vcl::FontCapabilities &rGetImplFontCapa } // SalGraphics - -void X11SalGraphics::SetFont( const FontSelectPattern *pEntry, int nFallbackLevel ) +void X11SalGraphics::SetFont(LogicalFontInstance* pEntry, int nFallbackLevel) { mxTextRenderImpl->SetFont(pEntry, nFallbackLevel); } |