From e194f597ae5882e1cda2cac2925577fff609f101 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Sun, 30 Sep 2018 16:07:16 +0200 Subject: Change GlyphItem::nFallbackLevel to font instance No need for a real reference, as GlyphItems are bound to their GenericSalLayout, which holds the valid reference and doesn't allow font change. Change-Id: I8e1129ef99f576e43d55f39aee040ceeb635d51d Reviewed-on: https://gerrit.libreoffice.org/62359 Reviewed-by: Khaled Hosny Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski --- vcl/unx/generic/print/genpspgraphics.cxx | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'vcl/unx/generic/print') diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 5350bfcf26a4..67621170b999 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -735,11 +735,7 @@ void GenPspGraphics::GetFontMetric(ImplFontMetricDataRef& rxFontMetric, int nFal bool GenPspGraphics::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangle& rRect) { - const int nLevel = rGlyph.m_nFallbackLevel; - if( nLevel >= MAX_FALLBACK ) - return false; - - FreetypeFont* pSF = m_pFreetypeFont[ nLevel ]; + FreetypeFont* pSF = getFreetypeFontFromGlyph(rGlyph); if( !pSF ) return false; @@ -749,11 +745,7 @@ bool GenPspGraphics::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangle bool GenPspGraphics::GetGlyphOutline(const GlyphItem& rGlyph, basegfx::B2DPolyPolygon& rB2DPolyPoly ) { - const int nLevel = rGlyph.m_nFallbackLevel; - if( nLevel >= MAX_FALLBACK ) - return false; - - FreetypeFont* pSF = m_pFreetypeFont[ nLevel ]; + FreetypeFont* pSF = getFreetypeFontFromGlyph(rGlyph); if( !pSF ) return false; -- cgit