summaryrefslogtreecommitdiff
path: root/testtools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-08-06 13:32:43 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-08-14 18:03:06 +0200
commite67657d5211f6e95ddf8bd621108608573b00d5d (patch)
tree66724101dbd95721714bd40fcb4861663432774c /testtools
parent186def8f48e273c3a3b4d23b3ab2efd0d8664731 (diff)
loplugin:simplifybool more
look for expressions like !(a && !b) which can be expanded out Change-Id: I72515a9638762b050f9a258c08da39ebfa2ef8e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100579 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'testtools')
-rw-r--r--testtools/source/bridgetest/constructors.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx
index 9683c1fac9ed..f1894155444d 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -111,7 +111,7 @@ void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
::test::testtools::bridgetest::TestPolyStruct< css::uno::Any > arg38;
bool arg38b;
css::uno::Reference< css::uno::XInterface > arg39;
- if (!(arguments.getLength() == 40
+ bool ok = (arguments.getLength() == 40
&& (arguments[0] >>= arg0) && arg0
&& (arguments[1] >>= arg1) && arg1 == SAL_MIN_INT8
&& (arguments[2] >>= arg2) && arg2 == SAL_MIN_INT16
@@ -174,7 +174,8 @@ void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
&& (arguments[36] >>= arg36) && arg36.member == 10
&& (arguments[37] >>= arg37) && arg37.member
&& (arguments[38] >>= arg38) && (arg38.member >>= arg38b) && arg38b
- && (arguments[39] >>= arg39) && !arg39.is()))
+ && (arguments[39] >>= arg39) && !arg39.is());
+ if (!ok)
{
throw ::test::testtools::bridgetest::BadConstructorArguments();
}