diff options
| author | Noel <noelgrandin@gmail.com> | 2020-11-11 18:08:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-12 07:37:38 +0100 |
| commit | 1397a1c8e4995b0dd336478e564880fe8ad91d1d (patch) | |
| tree | 41a4cf915bb52d453e6eb5a57c15b8718d847874 /include | |
| parent | 48b667a7e7d25f835f95df89162a7849d6972531 (diff) | |
remove BigInt::operator tools::Long()
which was introduced in
commit adf0738d2dbfa742d0e9ef130954fb4638a8e90d
Author: Noel Grandin <noel.grandin@collabora.co.uk>
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/itemtype.hxx | 2 | ||||
| -rw-r--r-- | include/tools/bigint.hxx | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx index 19d2a19b4ee3..9adcb98cb370 100644 --- a/include/editeng/itemtype.hxx +++ b/include/editeng/itemtype.hxx @@ -42,7 +42,7 @@ inline tools::Long Scale( tools::Long nVal, tools::Long nMult, tools::Long nDiv aVal *= nMult; aVal += nDiv/2; aVal /= nDiv; - return aVal; + return static_cast<sal_Int32>(aVal); } #endif diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx index de03339f041d..a07ba53d7f92 100644 --- a/include/tools/bigint.hxx +++ b/include/tools/bigint.hxx @@ -88,9 +88,6 @@ public: operator sal_Int32() const; operator sal_uInt32() const; operator double() const; -#if SAL_TYPES_SIZEOFPOINTER == 8 - operator tools::Long() const; -#endif bool IsSet() const { return bIsSet; } bool IsNeg() const; @@ -156,17 +153,6 @@ inline BigInt::operator sal_uInt32() const return 0; } -#if SAL_TYPES_SIZEOFPOINTER == 8 -inline BigInt::operator tools::Long() const -{ - // Clamp to int32 since long is int32 on Windows. - if (!bIsBig) - return nVal; - assert(false && "out of range"); - return 0; -} -#endif - inline BigInt& BigInt::operator =( sal_Int32 nValue ) { bIsSet = true; |