summaryrefslogtreecommitdiff
path: root/svgio
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-04-19 09:07:27 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-05-30 10:49:51 +0200
commitd6c32cffb5cc81989b4bb4a221a152bbe607bd98 (patch)
tree2c4ef9ec2a201ffcfea145ed5a0b901f2b6853ea /svgio
parent9ab64dc48a6a61edce6ff3724093162ca1cf8331 (diff)
loplugin:simplifybool extend to expression like !(a < b || c > d)
mostly to catch stuff from the flatten work, but I think this looks good in general Change-Id: I7be5b7bcf1f3d9f980c748ba20793965cef957e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92493 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svgio')
-rw-r--r--svgio/source/svgreader/svgellipsenode.cxx2
-rw-r--r--svgio/source/svgreader/svgimagenode.cxx2
-rw-r--r--svgio/source/svgreader/svgpatternnode.cxx4
-rw-r--r--svgio/source/svgreader/svgrectnode.cxx2
-rw-r--r--svgio/source/svgreader/svgstyleattributes.cxx4
5 files changed, 7 insertions, 7 deletions
diff --git a/svgio/source/svgreader/svgellipsenode.cxx b/svgio/source/svgreader/svgellipsenode.cxx
index 59b635981015..6e05a418fa0c 100644
--- a/svgio/source/svgreader/svgellipsenode.cxx
+++ b/svgio/source/svgreader/svgellipsenode.cxx
@@ -134,7 +134,7 @@ namespace svgio::svgreader
const double fRx(getRx().solve(*this, xcoordinate));
const double fRy(getRy().solve(*this, ycoordinate));
- if(!(fRx > 0.0 && fRy > 0.0))
+ if(fRx <= 0.0 || fRy <= 0.0)
return;
const basegfx::B2DPolygon aPath(
diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx
index 8dfc70e643a1..1af8b20d2bde 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -196,7 +196,7 @@ namespace svgio::svgreader
const double fWidth(getWidth().solve(*this, xcoordinate));
const double fHeight(getHeight().solve(*this, ycoordinate));
- if(!(fWidth > 0.0 && fHeight > 0.0))
+ if(fWidth <= 0.0 || fHeight <= 0.0)
return;
BitmapEx aBitmapEx;
diff --git a/svgio/source/svgreader/svgpatternnode.cxx b/svgio/source/svgreader/svgpatternnode.cxx
index a72846aacd07..3e7402cb07a3 100644
--- a/svgio/source/svgreader/svgpatternnode.cxx
+++ b/svgio/source/svgreader/svgpatternnode.cxx
@@ -196,7 +196,7 @@ namespace svgio::svgreader
double fTargetWidth(rGeoRange.getWidth());
double fTargetHeight(rGeoRange.getHeight());
- if(!(fTargetWidth > 0.0 && fTargetHeight > 0.0))
+ if(fTargetWidth <= 0.0 || fTargetHeight <= 0.0)
return;
const SvgUnits aPatternUnits(getPatternUnits() ? *getPatternUnits() : objectBoundingBox);
@@ -226,7 +226,7 @@ namespace svgio::svgreader
rfH /= fTargetHeight;
}
- if(!(rfW > 0.0 && rfH > 0.0))
+ if(rfW <= 0.0 || rfH <= 0.0)
return;
if(objectBoundingBox == aPatternUnits)
diff --git a/svgio/source/svgreader/svgrectnode.cxx b/svgio/source/svgreader/svgrectnode.cxx
index dca3c3ad5e31..8b26bb5035d1 100644
--- a/svgio/source/svgreader/svgrectnode.cxx
+++ b/svgio/source/svgreader/svgrectnode.cxx
@@ -163,7 +163,7 @@ namespace svgio::svgreader
const double fWidth(getWidth().solve(*this, xcoordinate));
const double fHeight(getHeight().solve(*this, ycoordinate));
- if(!(fWidth > 0.0 && fHeight > 0.0))
+ if(fWidth <= 0.0 || fHeight <= 0.0)
return;
const double fX(getX().isSet() ? getX().solve(*this, xcoordinate) : 0.0);
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index 383545bf49da..f3387e11cd52 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -517,7 +517,7 @@ namespace svgio::svgreader
double fTargetWidth(rGeoRange.getWidth());
double fTargetHeight(rGeoRange.getHeight());
- if(!(fTargetWidth > 0.0 && fTargetHeight > 0.0))
+ if(fTargetWidth <= 0.0 || fTargetHeight <= 0.0)
return;
// get relative values from pattern
@@ -528,7 +528,7 @@ namespace svgio::svgreader
rFillPattern.getValuesRelative(fX, fY, fW, fH, rGeoRange, mrOwner);
- if(!(fW > 0.0 && fH > 0.0))
+ if(fW <= 0.0 || fH <= 0.0)
return;
// build the reference range relative to the rGeoRange