vcl/source/gdi/sallayout.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 8e409fb74b23c053effda4c892624548acc68903 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Thu Dec 6 10:35:05 2018 +0000 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Thu Dec 6 15:29:23 2018 +0100 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 <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> 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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits