drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx | 2 +- svx/source/svdraw/svdoashp.cxx | 4 ++-- svx/source/svdraw/svdobj.cxx | 2 +- vcl/source/outdev/bitmapex.cxx | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit a28cae7899a6fd0977919fd907396c70d92e41c2 Author: Bogdan Buzea <[email protected]> AuthorDate: Sat Aug 17 12:43:46 2024 +0200 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Tue Sep 3 16:11:57 2024 +0200 tdf#160084 Simplify comparison for basegfx::fTools Change-Id: I5fc9823b6d0ca88505e8d4e6127fac7e776fa1a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171784 Tested-by: Jenkins Tested-by: Ilmari Lauhakangas <[email protected]> Reviewed-by: Ilmari Lauhakangas <[email protected]> diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx index 1377ff28ebf3..a155e6472e24 100644 --- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx @@ -44,7 +44,7 @@ namespace drawinglayer::primitive2d // create decompose geometry const basegfx::B2DPolygon aOutline(basegfx::utils::createPolygonFromRect(rViewInformation.getViewport())); - if (basegfx::fTools::lessOrEqual(getTransparency(), 0.0)) + if (getTransparency() <= 0.0) { // no transparency return Primitive2DReference { diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index fb9cf0a9923f..71fab52bb0ae 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -3055,9 +3055,9 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, SetLogicRect(aBaseRect); // Apply flipping from Matrix, which is a transformation relative to origin - if (basegfx::fTools::less(aScale.getX(), 0.0)) + if (aScale.getX() < 0.0) Mirror(Point(0, 0), Point(0, 1000)); // mirror on the y-axis - if (basegfx::fTools::less(aScale.getY(), 0.0)) + if (aScale.getY() < 0.0) Mirror(Point(0, 0), Point(1000, 0)); // mirror on the x-axis // shear? diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index da43e65d0fb7..01d120b97acf 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -3037,7 +3037,7 @@ void SdrObject::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const ba // #i75086# Old DrawingLayer (GeoStat and geometry) does not support holding negative scalings // in X and Y which equal a 180 degree rotation. Recognize it and react accordingly - if(basegfx::fTools::less(aScale.getX(), 0.0) && basegfx::fTools::less(aScale.getY(), 0.0)) + if(aScale.getX() < 0.0 && aScale.getY() < 0.0) { aScale.setX(fabs(aScale.getX())); aScale.setY(fabs(aScale.getY())); diff --git a/vcl/source/outdev/bitmapex.cxx b/vcl/source/outdev/bitmapex.cxx index 9ecccc90ed52..2a1b21153d0b 100644 --- a/vcl/source/outdev/bitmapex.cxx +++ b/vcl/source/outdev/bitmapex.cxx @@ -532,8 +532,8 @@ void OutputDevice::DrawTransformedBitmapEx( rTransformation.decompose(aScale, aTranslate, fRotate, fShearX); const bool bRotated(!basegfx::fTools::equalZero(fRotate)); const bool bSheared(!basegfx::fTools::equalZero(fShearX)); - const bool bMirroredX(basegfx::fTools::less(aScale.getX(), 0.0)); - const bool bMirroredY(basegfx::fTools::less(aScale.getY(), 0.0)); + const bool bMirroredX(aScale.getX() < 0.0); + const bool bMirroredY(aScale.getY() < 0.0); if(!bRotated && !bSheared && !bMirroredX && !bMirroredY) {
