Kaydet (Commit) 1c4810f8 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#121936 uninitialized value used

since...

commit e194f597
Date:   Sun Sep 30 16:07:16 2018 +0200

    Change GlyphItem::nFallbackLevel to font instance

Change-Id: I14b40a63cd48ef527e76e15af8f421ce48cce769
Reviewed-on: https://gerrit.libreoffice.org/64698Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 67806532
...@@ -892,7 +892,7 @@ sal_Int32 GenericSalLayout::GetTextBreak( DeviceCoordinate nMaxWidth, DeviceCoor ...@@ -892,7 +892,7 @@ sal_Int32 GenericSalLayout::GetTextBreak( DeviceCoordinate nMaxWidth, DeviceCoor
bool GenericSalLayout::GetNextGlyph(const GlyphItem** pGlyph, bool GenericSalLayout::GetNextGlyph(const GlyphItem** pGlyph,
Point& rPos, int& nStart, 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 pGlyphIter = m_GlyphItems.Impl()->begin();
std::vector<GlyphItem>::const_iterator pGlyphIterEnd = m_GlyphItems.Impl()->end(); std::vector<GlyphItem>::const_iterator pGlyphIterEnd = m_GlyphItems.Impl()->end();
...@@ -915,6 +915,8 @@ bool GenericSalLayout::GetNextGlyph(const GlyphItem** pGlyph, ...@@ -915,6 +915,8 @@ bool GenericSalLayout::GetNextGlyph(const GlyphItem** pGlyph,
// update return data with glyph info // update return data with glyph info
*pGlyph = &(*pGlyphIter); *pGlyph = &(*pGlyphIter);
if (pFallbackLevel)
*pFallbackLevel = 0;
++nStart; ++nStart;
// calculate absolute position in pixel units // calculate absolute position in pixel units
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment