From 1397a1c8e4995b0dd336478e564880fe8ad91d1d Mon Sep 17 00:00:00 2001 From: Noel Date: Wed, 11 Nov 2020 18:08:40 +0200 Subject: remove BigInt::operator tools::Long() which was introduced in commit adf0738d2dbfa742d0e9ef130954fb4638a8e90d Author: Noel Grandin Date: Wed Jan 3 14:25:15 2018 +0200 long->sal_Int32 in BigInt presumably to make the conversion easier. Instead just fix the call-sites to select a better conversion, BigInt only returns 32-bits of precision anyway. Change-Id: I2e4354bcfded01763fe3312a715ef37800297876 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105602 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/source/outdev/map.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'vcl/source/outdev') diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index aba22cb4ef1f..7af0649e2ef5 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -279,7 +279,7 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, aX += BigInt(nXNumerator / 2); } aX /= BigInt(nXNumerator); - rMapRes.mnMapOfsX = static_cast(aX) + aOrigin.X(); + rMapRes.mnMapOfsX = static_cast(aX) + aOrigin.X(); BigInt aY( rMapRes.mnMapOfsY ); aY *= BigInt( aScaleY.GetDenominator() ); if( rMapRes.mnMapOfsY >= 0 ) @@ -297,7 +297,7 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, aY += BigInt(nYNumerator / 2); } aY /= BigInt(nYNumerator); - rMapRes.mnMapOfsY = static_cast(aY) + aOrigin.Y(); + rMapRes.mnMapOfsY = static_cast(aY) + aOrigin.Y(); } // calculate scaling factor according to MapMode @@ -1560,7 +1560,7 @@ static tools::Long fn5( const tools::Long n1, a7 /= n8; } // of else - return static_cast(a7); + return static_cast(a7); } // of if else { @@ -1596,7 +1596,7 @@ static tools::Long fn5( const tools::Long n1, a7 /= n8; } // of else - return static_cast(a7); + return static_cast(a7); } // of if else { @@ -1616,7 +1616,7 @@ static tools::Long fn5( const tools::Long n1, a7 += a9; a7 /= a8; - return static_cast(a7); + return static_cast(a7); } // of if else { @@ -1653,7 +1653,7 @@ static tools::Long fn3( const tools::Long n1, const tools::Long n2, const tools: a4 += n3 / 2; a4 /= n3; - return static_cast(a4); + return static_cast(a4); } // of if else { -- cgit v1.2.3