diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-01 13:14:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-08 07:37:40 +0100 |
| commit | 7f48fa8152bd3320af7276d811b752c5a762dcce (patch) | |
| tree | a95f2aec74a17050e825eb78833ee8f0274cb728 /vcl/source/fontsubset | |
| parent | f10b7e820844d94b4dbec3dcaf24392275940914 (diff) | |
loplugin:collapseif in tools..xmloff
Change-Id: Iea1227a9f13a0a618d9bb6b0bbedaa5ce8d1a4f5
Reviewed-on: https://gerrit.libreoffice.org/62732
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/fontsubset')
| -rw-r--r-- | vcl/source/fontsubset/sft.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index a945ee7cc7be..11d9bedae11c 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -551,9 +551,8 @@ static int GetCompoundTTOutline(TrueTypeFont *ttf, sal_uInt32 glyphID, ControlPo if( ! glyphlist.empty() ) glyphlist.pop_back(); - if (flags & USE_MY_METRICS) { - if (metrics) GetMetrics(ttf, index, metrics); - } + if ((flags & USE_MY_METRICS) && metrics) + GetMetrics(ttf, index, metrics); if (flags & ARG_1_AND_2_ARE_WORDS) { e = GetInt16(ptr, 0); |