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/64698
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 0fea93f..aad45b3 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -892,7 +892,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();
@@ -915,6 +915,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