summaryrefslogtreecommitdiff
path: root/unoidl
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-11-01 13:14:09 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-11-08 07:37:40 +0100
commit7f48fa8152bd3320af7276d811b752c5a762dcce (patch)
treea95f2aec74a17050e825eb78833ee8f0274cb728 /unoidl
parentf10b7e820844d94b4dbec3dcaf24392275940914 (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 'unoidl')
-rw-r--r--unoidl/source/unoidl-write.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/unoidl/source/unoidl-write.cxx b/unoidl/source/unoidl-write.cxx
index 827e9ad0a4db..1626dbe19ea5 100644
--- a/unoidl/source/unoidl-write.cxx
+++ b/unoidl/source/unoidl-write.cxx
@@ -731,10 +731,8 @@ sal_uInt64 writeMap(
bool dfltCtor = ent2->getConstructors().size() == 1
&& ent2->getConstructors()[0].defaultConstructor;
bool ann = !ent2->getAnnotations().empty();
- if (!dfltCtor) {
- if (!ann)
- ann = hasNotEmptyAnnotations(ent2->getConstructors());
- }
+ if (!dfltCtor && !ann)
+ ann = hasNotEmptyAnnotations(ent2->getConstructors());
i.second.dataOffset = getOffset(file);
writeKind(file, ent2.get(), ann, dfltCtor);
writeIdxName(file, ent2->getBase());