diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-08-23 11:14:37 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-23 16:39:36 +0200 |
| commit | 8d49069887443c9eeac9c52441ad1a183d12c384 (patch) | |
| tree | a0f7e42976a3587e6011f079f757ad237ce76c84 | |
| parent | 3e392904c558d1f9fc91926511d148762813537e (diff) | |
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í <xiscofauli@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit 4a58fd0e81b0375c71f6182233f0ec9390942cd1)
Reviewed-on: https://gerrit.libreoffice.org/59502
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/unx/generic/print/glyphset.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/generic/print/glyphset.cxx b/vcl/unx/generic/print/glyphset.cxx index 9dacabb7dfb0..b6e94afc1978 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 |