diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-06 13:32:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-14 18:03:06 +0200 |
| commit | e67657d5211f6e95ddf8bd621108608573b00d5d (patch) | |
| tree | 66724101dbd95721714bd40fcb4861663432774c /drawinglayer | |
| parent | 186def8f48e273c3a3b4d23b3ab2efd0d8664731 (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 'drawinglayer')
4 files changed, 4 insertions, 4 deletions
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx index c3b030dcf1ac..3f20baa1351f 100644 --- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx @@ -45,7 +45,7 @@ namespace drawinglayer::primitive2d { void ControlPrimitive2D::createXControl() { - if(!(!mxXControl.is() && getControlModel().is())) + if(mxXControl.is() || !getControlModel().is()) return; uno::Reference< beans::XPropertySet > xSet(getControlModel(), uno::UNO_QUERY); diff --git a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx index d4b604e79c9f..a95e42cfecad 100644 --- a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx @@ -35,7 +35,7 @@ namespace drawinglayer::primitive2d const std::vector< basegfx::B2DPoint >& rPositions = getPositions(); const sal_uInt32 nMarkerCount(rPositions.size()); - if(!(nMarkerCount && !getMarker().IsEmpty())) + if(!nMarkerCount || getMarker().IsEmpty()) return; // get pixel size diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx index e6906a638084..7c9eb8441306 100644 --- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx @@ -377,7 +377,7 @@ namespace drawinglayer::primitive2d void SvgGradientHelper::createMirroredGradientEntries() { - if(!(maMirroredGradientEntries.empty() && !getGradientEntries().empty())) + if(!maMirroredGradientEntries.empty() || getGradientEntries().empty()) return; const sal_uInt32 nCount(getGradientEntries().size()); diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index ffb649da3554..3aa7d0262b98 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -958,7 +958,7 @@ void VclProcessor2D::RenderMarkerArrayPrimitive2D( const std::vector<basegfx::B2DPoint>& rPositions = rMarkArrayCandidate.getPositions(); const sal_uInt32 nCount(rPositions.size()); - if (!(nCount && !rMarkArrayCandidate.getMarker().IsEmpty())) + if (!nCount || rMarkArrayCandidate.getMarker().IsEmpty()) return; // get pixel size |