vcl/unx/generic/print/glyphset.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4a58fd0e81b0375c71f6182233f0ec9390942cd1
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Thu Aug 23 11:14:37 2018 +0200
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Thu Aug 23 14:54:18 2018 +0200
tdf#119357 add the glyph, if the lookup failed
Regression from commit de8f6b25de6f ("loplugin:unused-returns in
vcl") changing the logic in hunk:
- return LookupGlyphID (nGlyph, nOutGlyphID, nOutGlyphSetID)
- || AddGlyphID (nGlyph, nOutGlyphID, nOutGlyphSetID);
+ if (LookupGlyphID(nGlyph, nOutGlyphID, nOutGlyphSetID))
+ AddGlyphID(nGlyph, nOutGlyphID, nOutGlyphSetID);
Change-Id: Id643120e1cf5e26b3ffda933d07893048493f089
Reviewed-on: https://gerrit.libreoffice.org/59493
Tested-by: Xisco Faulí <xiscofa...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/vcl/unx/generic/print/glyphset.cxx
b/vcl/unx/generic/print/glyphset.cxx
index 28b8facfced3..38045ce2d10a 100644
--- a/vcl/unx/generic/print/glyphset.cxx
+++ b/vcl/unx/generic/print/glyphset.cxx
@@ -65,8 +65,8 @@ GlyphSet::GetGlyphID (
sal_Int32* nOutGlyphSetID
)
{
- if (LookupGlyphID(nGlyph, nOutGlyphID, nOutGlyphSetID))
- AddGlyphID(nGlyph, nOutGlyphID, nOutGlyphSetID);
+ if (!LookupGlyphID(nGlyph, nOutGlyphID, nOutGlyphSetID))
+ AddGlyphID(nGlyph, nOutGlyphID, nOutGlyphSetID);
}
bool
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
