diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-30 16:07:16 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-25 19:53:22 +0200 |
| commit | e194f597ae5882e1cda2cac2925577fff609f101 (patch) | |
| tree | 5607412d62d9f40415992255e849b8425e4cd6a3 /vcl/unx/generic | |
| parent | b5a6865a67dc6223dc164d2fe68dfdaf4dab5c39 (diff) | |
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 <khaledhosny@eglug.org>
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 12 | ||||
| -rw-r--r-- | vcl/unx/generic/print/genpspgraphics.cxx | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index b7b8da84dc65..13c8e156dc5b 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -444,11 +444,7 @@ void CairoTextRender::GetFontMetric( ImplFontMetricDataRef& rxFontMetric, int nF bool CairoTextRender::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangle& rRect) { - const int nLevel = rGlyph.m_nFallbackLevel; - if( nLevel >= MAX_FALLBACK ) - return false; - - FreetypeFont* pSF = mpFreetypeFont[ nLevel ]; + FreetypeFont* pSF = getFreetypeFontFromGlyph(rGlyph); if( !pSF ) return false; @@ -475,11 +471,7 @@ bool CairoTextRender::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangl bool CairoTextRender::GetGlyphOutline(const GlyphItem& rGlyph, basegfx::B2DPolyPolygon& rPolyPoly ) { - const int nLevel = rGlyph.m_nFallbackLevel; - if( nLevel >= MAX_FALLBACK ) - return false; - - const FreetypeFont* pSF = mpFreetypeFont[ nLevel ]; + const FreetypeFont* pSF = getFreetypeFontFromGlyph(rGlyph); if( !pSF ) return false; 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; |