[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 6 14:29:47 UTC 2018
vcl/source/gdi/sallayout.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 8e409fb74b23c053effda4c892624548acc68903
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Dec 6 10:35:05 2018 +0000
Commit: Caolán McNamara <caolanm at 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 <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at 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
More information about the Libreoffice-commits
mailing list