diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2018-04-24 15:55:34 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2018-04-25 22:54:42 +0200 |
| commit | 5441727c29fba37dff85e465ec55ead5942d8232 (patch) | |
| tree | 12a835f887cd27a05d4e41c50181e16c765fce92 /vcl/win | |
| parent | a985d4c2977ca23971f145b93a0155827bebfcdf (diff) | |
Simplify and rename SalLayout::GetNextGlyphs
It is now always called with nLen == 1, so simplify and rename. The
criteria for deciding how many glyphs to return was bogus anyway, good
riddance.
Change-Id: Iff578d124ab40a0dfa84469be8e0e9fc1b6b8c48
Reviewed-on: https://gerrit.libreoffice.org/53406
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/gdi/DWriteTextRenderer.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/gdi/winlayout.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx b/vcl/win/gdi/DWriteTextRenderer.cxx index 25530c00aa84..8006d3f7d0d5 100644 --- a/vcl/win/gdi/DWriteTextRenderer.cxx +++ b/vcl/win/gdi/DWriteTextRenderer.cxx @@ -294,7 +294,7 @@ bool D2DWriteTextOutRenderer::performRender(CommonSalLayout const & rLayout, Sal int nStart = 0; Point aPos(0, 0); const GlyphItem* pGlyph; - while (rLayout.GetNextGlyphs(1, &pGlyph, aPos, nStart)) + while (rLayout.GetNextGlyph(&pGlyph, aPos, nStart)) { UINT16 glyphIndices[] = { pGlyph->maGlyphId }; FLOAT glyphAdvances[] = { pGlyph->mnNewWidth }; diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index f7c407c78fe1..94eb47dddebb 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -274,7 +274,7 @@ bool ExTextOutRenderer::operator ()(CommonSalLayout const &rLayout, int nStart = 0; Point aPos(0, 0); const GlyphItem* pGlyph; - while (rLayout.GetNextGlyphs(1, &pGlyph, aPos, nStart)) + while (rLayout.GetNextGlyph(&pGlyph, aPos, nStart)) { WORD glyphWStr[] = { pGlyph->maGlyphId }; if (hAltFont && pGlyph->IsVertical() == bUseAltFont) @@ -351,7 +351,7 @@ bool WinSalGraphics::CacheGlyphs(const CommonSalLayout& rLayout) int nStart = 0; Point aPos(0, 0); const GlyphItem* pGlyph; - while (rLayout.GetNextGlyphs(1, &pGlyph, aPos, nStart)) + while (rLayout.GetNextGlyph(&pGlyph, aPos, nStart)) { if (!rFont.GetGlyphCache().IsGlyphCached(pGlyph->maGlyphId)) { @@ -382,7 +382,7 @@ bool WinSalGraphics::DrawCachedGlyphs(const CommonSalLayout& rLayout) int nStart = 0; Point aPos(0, 0); const GlyphItem* pGlyph; - while (rLayout.GetNextGlyphs(1, &pGlyph, aPos, nStart)) + while (rLayout.GetNextGlyph(&pGlyph, aPos, nStart)) { OpenGLGlyphDrawElement& rElement(rFont.GetGlyphCache().GetDrawElement(pGlyph->maGlyphId)); OpenGLTexture& rTexture = rElement.maTexture; |