diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-30 14:00:54 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-25 17:35:05 +0200 |
| commit | 134447e78f00d7378406d0a3fa5a4c5d3a02032e (patch) | |
| tree | ce9651e90cf291b8be43fd7459f80348a7d9ae1a /vcl/unx/generic/gdi/cairotextrender.cxx | |
| parent | 094e7b6a1028620c2b1503de8b51dc6a2482e290 (diff) | |
Move GlyphItem into its own header
Actually GlyphItem should be VCL internal, but this requires a
transparent SalLayoutGlyphs (i.e. via pImpl), which I'm too lazy
to implement currently.
This seperation makes the affected source files more obvious and
later migration of vcl/glyphitem.hxx easier.
While at it apply the coding style and add '_' to member prefix.
Change-Id: I61497af5c628c40f51597ce0ef286c47321acbc2
Reviewed-on: https://gerrit.libreoffice.org/62358
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/unx/generic/gdi/cairotextrender.cxx')
| -rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index adcb0deec8ac..b7b8da84dc65 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -185,7 +185,7 @@ void CairoTextRender::DrawTextLayout(const GenericSalLayout& rLayout, const SalG while (rLayout.GetNextGlyph(&pGlyph, aPos, nStart)) { cairo_glyph_t aGlyph; - aGlyph.index = pGlyph->maGlyphId; + aGlyph.index = pGlyph->m_aGlyphId; aGlyph.x = aPos.X(); aGlyph.y = aPos.Y(); cairo_glyphs.push_back(aGlyph); @@ -444,7 +444,7 @@ void CairoTextRender::GetFontMetric( ImplFontMetricDataRef& rxFontMetric, int nF bool CairoTextRender::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangle& rRect) { - const int nLevel = rGlyph.mnFallbackLevel; + const int nLevel = rGlyph.m_nFallbackLevel; if( nLevel >= MAX_FALLBACK ) return false; @@ -475,7 +475,7 @@ bool CairoTextRender::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangl bool CairoTextRender::GetGlyphOutline(const GlyphItem& rGlyph, basegfx::B2DPolyPolygon& rPolyPoly ) { - const int nLevel = rGlyph.mnFallbackLevel; + const int nLevel = rGlyph.m_nFallbackLevel; if( nLevel >= MAX_FALLBACK ) return false; |