diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-12 09:31:42 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-13 13:38:26 +0100 |
| commit | d55e0fbde49ad3b1e678419588dd58df6d9e06c4 (patch) | |
| tree | 4c448d5a759829f4e7b6e5e594db83dd3a926009 /vcl/source/outdev/map.cxx | |
| parent | 811b77e0f63b91eeb05311c724e3e209bff30f68 (diff) | |
Revert "remove BigInt::operator tools::Long()"
This reverts commit 1397a1c8e4995b0dd336478e564880fe8ad91d1d.
Reason for revert: Some discussion required
Change-Id: Id39ee8260790e0722c5bf8338b0b76ca34da83d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105539
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/outdev/map.cxx')
| -rw-r--r-- | vcl/source/outdev/map.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index 7af0649e2ef5..aba22cb4ef1f 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<sal_Int32>(aX) + aOrigin.X(); + rMapRes.mnMapOfsX = static_cast<tools::Long>(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<sal_Int32>(aY) + aOrigin.Y(); + rMapRes.mnMapOfsY = static_cast<tools::Long>(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<sal_Int32>(a7); + return static_cast<tools::Long>(a7); } // of if else { @@ -1596,7 +1596,7 @@ static tools::Long fn5( const tools::Long n1, a7 /= n8; } // of else - return static_cast<sal_Int32>(a7); + return static_cast<tools::Long>(a7); } // of if else { @@ -1616,7 +1616,7 @@ static tools::Long fn5( const tools::Long n1, a7 += a9; a7 /= a8; - return static_cast<sal_Int32>(a7); + return static_cast<tools::Long>(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<sal_Int32>(a4); + return static_cast<tools::Long>(a4); } // of if else { |