diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-08 17:01:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-11 07:35:43 +0100 |
| commit | f14b9d30293f180500fc56d81e5390021758e7c1 (patch) | |
| tree | a6cd0b853169203cfa0953230e6774e7b1dd81b4 /svx | |
| parent | d11120b95ee27cb4b05db466ed07f7a996dda125 (diff) | |
convert (a>b?a:b) to std::max(a,b)
with something like:
git grep -nP '(.*)\s*>\s*(.*)\s*\?\s*\g1\s*:\s*\g2'
Change-Id: I60b9a3a2a09162bc0de4c13fdde2c209696e5413
Reviewed-on: https://gerrit.libreoffice.org/47602
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdocirc.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdomeas.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 5024e265de67..61b050d39fe2 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -57,7 +57,7 @@ Point GetAnglePnt(const tools::Rectangle& rR, long nAngle) Point aCenter(rR.Center()); long nWdt=rR.Right()-rR.Left(); long nHgt=rR.Bottom()-rR.Top(); - long nMaxRad=((nWdt>nHgt ? nWdt : nHgt)+1) /2; + long nMaxRad=(std::max(nWdt,nHgt)+1) /2; double a; a=nAngle*nPi180; Point aRetval(svx::Round(cos(a)*nMaxRad),-svx::Round(sin(a)*nMaxRad)); @@ -863,7 +863,7 @@ void SdrCircObj::NbcMirror(const Point& rRef1, const Point& rRef2) Point aCenter(maRect.Center()); long nWdt=maRect.GetWidth()-1; long nHgt=maRect.GetHeight()-1; - long nMaxRad=((nWdt>nHgt ? nWdt : nHgt)+1) /2; + long nMaxRad=(std::max(nWdt,nHgt)+1) /2; double a; // starting point a=nStartAngle*nPi180; diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index c8ea551e235a..ff7980c5a74c 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -336,7 +336,7 @@ void SdrMeasureObj::ImpTakeAttr(ImpMeasureRec& rRec) const long impGetLineStartEndDistance(const basegfx::B2DPolyPolygon& rPolyPolygon, long nNewWidth, bool bCenter) { const basegfx::B2DRange aPolygonRange(rPolyPolygon.getB2DRange()); - const double fOldWidth(aPolygonRange.getWidth() > 1.0 ? aPolygonRange.getWidth() : 1.0); + const double fOldWidth(std::max(aPolygonRange.getWidth(), 1.0)); const double fScale((double)nNewWidth / fOldWidth); long nHeight(basegfx::fround(aPolygonRange.getHeight() * fScale)); |