diff options
author | BaiXiaochun <bai.xiaochun.mofan@protonmail.com> | 2021-06-29 20:31:30 +0200 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-07-01 00:39:17 +0200 |
commit | 3964e0854507b2696ae0fbe48a4fb005c779947e (patch) | |
tree | 0a0ae3cd2e8a20f67eb7303f643ab668e44e0ccb /sc | |
parent | 54d7fc9ea9d56ec16ec4f641a3dbf01f64233297 (diff) |
Purge out rtl::math::setInf
Change-Id: I71af8273c672a4cbcbfefafffd0003ab266dcce6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118132
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/math.hxx | 12 | ||||
-rw-r--r-- | sc/source/core/data/dpitemdata.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/data/dputil.cxx | 10 |
3 files changed, 7 insertions, 19 deletions
diff --git a/sc/inc/math.hxx b/sc/inc/math.hxx index 459b82e74bcd..a1afff90a0a7 100644 --- a/sc/inc/math.hxx +++ b/sc/inc/math.hxx @@ -52,16 +52,10 @@ inline double divide( const double& fNumerator, const double& fDenominator ) { if (fDenominator == 0.0) { - double fVal; if (std::isfinite( fNumerator) && fNumerator != 0.0) - { - rtl::math::setInf( &fVal, std::signbit( fNumerator)); - } - else - { - rtl::math::setNan( &fVal); - } - return fVal; + return std::signbit(fNumerator) ? -std::numeric_limits<double>::infinity() + : std::numeric_limits<double>::infinity(); + return std::numeric_limits<double>::quiet_NaN(); } return fNumerator / fDenominator; } diff --git a/sc/source/core/data/dpitemdata.cxx b/sc/source/core/data/dpitemdata.cxx index f6d2e9812f9e..da3293d7c2be 100644 --- a/sc/source/core/data/dpitemdata.cxx +++ b/sc/source/core/data/dpitemdata.cxx @@ -167,14 +167,14 @@ void ScDPItemData::SetRangeStart(double fVal) void ScDPItemData::SetRangeFirst() { DisposeString(); - rtl::math::setInf(&mfValue, true); + mfValue = -std::numeric_limits<double>::infinity(); meType = RangeStart; } void ScDPItemData::SetRangeLast() { DisposeString(); - rtl::math::setInf(&mfValue, false); + mfValue = std::numeric_limits<double>::infinity(); meType = RangeStart; } diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx index 6fabf2e286dd..62d61a733055 100644 --- a/sc/source/core/data/dputil.cxx +++ b/sc/source/core/data/dputil.cxx @@ -153,16 +153,10 @@ OUString ScDPUtil::getDateGroupName( double ScDPUtil::getNumGroupStartValue(double fValue, const ScDPNumGroupInfo& rInfo) { if (fValue < rInfo.mfStart && !rtl::math::approxEqual(fValue, rInfo.mfStart)) - { - rtl::math::setInf(&fValue, true); - return fValue; - } + return -std::numeric_limits<double>::infinity(); if (fValue > rInfo.mfEnd && !rtl::math::approxEqual(fValue, rInfo.mfEnd)) - { - rtl::math::setInf(&fValue, false); - return fValue; - } + return std::numeric_limits<double>::infinity(); double fDiff = fValue - rInfo.mfStart; double fDiv = rtl::math::approxFloor( fDiff / rInfo.mfStep ); |