diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-07-05 22:12:39 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-07-06 03:15:58 +0200 |
| commit | af8f249ad6368fb957b98ea70bfdf6778709d2eb (patch) | |
| tree | a0693930c1a4e887efcb502aa033dea0916ef734 /vcl/unx | |
| parent | a36e0f34f2d1baa95f3fe1c9afe6882abcf554dc (diff) | |
Constify GlyphItem
This hides all the data, which shouldn't change after init. Real
const makes a lot of problems for copying, so this is the 2nd
option to just add getters for private data. While at it use
typed_flags for the GlyphItemFlags.
Change-Id: Ic1eeabe2398f6c30080fdd516285b72c620b11be
Reviewed-on: https://gerrit.libreoffice.org/75147
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/print/text_gfx.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index d6355e65f173..f72664657673 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -184,7 +184,7 @@ void CairoTextRender::DrawTextLayout(const GenericSalLayout& rLayout, const SalG while (rLayout.GetNextGlyph(&pGlyph, aPos, nStart)) { cairo_glyph_t aGlyph; - aGlyph.index = pGlyph->m_aGlyphId; + aGlyph.index = pGlyph->glyphId(); aGlyph.x = aPos.X(); aGlyph.y = aPos.Y(); cairo_glyphs.push_back(aGlyph); diff --git a/vcl/unx/generic/print/text_gfx.cxx b/vcl/unx/generic/print/text_gfx.cxx index 156f801cb8c9..e7ced7a83c97 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.m_aGlyphId); + drawGlyph(aRotPoint, rGlyph.glyphId()); // restore previous state maVirtualStatus = aSaveStatus; PSGRestore(); } else - drawGlyph(aPoint, rGlyph.m_aGlyphId); + drawGlyph(aPoint, rGlyph.glyphId()); // restore the user coordinate system if (nCurrentTextAngle != 0) |