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/print | |
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/print')
-rw-r--r-- | vcl/unx/generic/print/genpspgraphics.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/print/text_gfx.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index b11a87083c68..5350bfcf26a4 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -735,7 +735,7 @@ void GenPspGraphics::GetFontMetric(ImplFontMetricDataRef& rxFontMetric, int nFal bool GenPspGraphics::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangle& rRect) { - const int nLevel = rGlyph.mnFallbackLevel; + const int nLevel = rGlyph.m_nFallbackLevel; if( nLevel >= MAX_FALLBACK ) return false; @@ -749,7 +749,7 @@ bool GenPspGraphics::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangle bool GenPspGraphics::GetGlyphOutline(const GlyphItem& rGlyph, basegfx::B2DPolyPolygon& rB2DPolyPoly ) { - const int nLevel = rGlyph.mnFallbackLevel; + const int nLevel = rGlyph.m_nFallbackLevel; if( nLevel >= MAX_FALLBACK ) return false; diff --git a/vcl/unx/generic/print/text_gfx.cxx b/vcl/unx/generic/print/text_gfx.cxx index c6528c8a34c3..7099d0a5f57d 100644 --- a/vcl/unx/generic/print/text_gfx.cxx +++ b/vcl/unx/generic/print/text_gfx.cxx @@ -123,14 +123,14 @@ void PrinterGfx::DrawGlyph(const Point& rPoint, PSTranslate( aPoint ); PSRotate (900); // draw the rotated glyph - drawGlyph(aRotPoint, rGlyph.maGlyphId); + drawGlyph(aRotPoint, rGlyph.m_aGlyphId); // restore previous state maVirtualStatus = aSaveStatus; PSGRestore(); } else - drawGlyph(aPoint, rGlyph.maGlyphId); + drawGlyph(aPoint, rGlyph.m_aGlyphId); // restore the user coordinate system if (nCurrentTextAngle != 0) |