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/source/outdev | |
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/source/outdev')
-rw-r--r-- | vcl/source/outdev/text.cxx | 4 | ||||
-rw-r--r-- | vcl/source/outdev/textline.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index d23c2137be35..8dfe957392b9 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -2328,10 +2328,10 @@ SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, c while (pLayout->GetNextGlyph(&pGlyph, aPos, nStart)) { SystemGlyphData aSystemGlyph; - aSystemGlyph.index = pGlyph->maGlyphId; + aSystemGlyph.index = pGlyph->m_aGlyphId; aSystemGlyph.x = aPos.X(); aSystemGlyph.y = aPos.Y(); - int nLevel = pGlyph->mnFallbackLevel; + int nLevel = pGlyph->m_nFallbackLevel; aSystemGlyph.fallbacklevel = nLevel < MAX_FALLBACK ? nLevel : 0; aSysLayoutData.rGlyphData.push_back(aSystemGlyph); } diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx index e35f4bb259af..550fc781f6d0 100644 --- a/vcl/source/outdev/textline.cxx +++ b/vcl/source/outdev/textline.cxx @@ -755,7 +755,7 @@ void OutputDevice::ImplDrawTextLines( SalLayout& rSalLayout, FontStrikeout eStri } // update the length of the textline - nWidth += pGlyph->mnNewWidth; + nWidth += pGlyph->m_nNewWidth; } else if( nWidth > 0 ) { |