diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-12-06 10:35:05 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-12-06 15:29:23 +0100 |
| commit | 8e409fb74b23c053effda4c892624548acc68903 (patch) | |
| tree | 99ad24b4444bb724ed34599a3d231a00e4d1eba4 /vcl | |
| parent | b4b213dc088fddbf4c2e34350828354e9262e4fa (diff) | |
Resolves: tdf#121936 uninitialized value used
since...
commit e194f597ae5882e1cda2cac2925577fff609f101
Date: Sun Sep 30 16:07:16 2018 +0200
Change GlyphItem::nFallbackLevel to font instance
Change-Id: I14b40a63cd48ef527e76e15af8f421ce48cce769
Reviewed-on: https://gerrit.libreoffice.org/64699
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/sallayout.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 4cbca56d9b70..d49ad0430cfa 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -894,7 +894,7 @@ sal_Int32 GenericSalLayout::GetTextBreak( DeviceCoordinate nMaxWidth, DeviceCoor bool GenericSalLayout::GetNextGlyph(const GlyphItem** pGlyph, Point& rPos, int& nStart, - const PhysicalFontFace**, int* const) const + const PhysicalFontFace**, int* const pFallbackLevel) const { std::vector<GlyphItem>::const_iterator pGlyphIter = m_GlyphItems.Impl()->begin(); std::vector<GlyphItem>::const_iterator pGlyphIterEnd = m_GlyphItems.Impl()->end(); @@ -917,6 +917,8 @@ bool GenericSalLayout::GetNextGlyph(const GlyphItem** pGlyph, // update return data with glyph info *pGlyph = &(*pGlyphIter); + if (pFallbackLevel) + *pFallbackLevel = 0; ++nStart; // calculate absolute position in pixel units |