[Libreoffice-commits] core.git: chart2/source forms/source include/formula sal/qa sal/rtl scaddins/source sc/source
Yukio Siraichi (via logerrit)
logerrit at kemper.freedesktop.org
Thu Mar 12 19:06:47 UTC 2020
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx | 2
chart2/source/inc/RegressionCalculationHelper.hxx | 24 +++++-----
chart2/source/tools/InternalDataProvider.cxx | 2
chart2/source/tools/MeanValueRegressionCurveCalculator.cxx | 4 -
chart2/source/tools/Scaling.cxx | 8 +--
chart2/source/view/axes/DateScaling.cxx | 4 -
chart2/source/view/axes/MinimumAndMaximumSupplier.cxx | 12 ++---
chart2/source/view/charttypes/AreaChart.cxx | 8 +--
chart2/source/view/charttypes/BubbleChart.cxx | 6 +-
chart2/source/view/charttypes/NetChart.cxx | 10 ++--
chart2/source/view/charttypes/Splines.cxx | 4 -
chart2/source/view/charttypes/VSeriesPlotter.cxx | 22 ++++-----
chart2/source/view/main/PlotterBase.cxx | 6 +-
chart2/source/view/main/VDataSeries.cxx | 6 +-
forms/source/component/scrollbar.cxx | 2
include/formula/errorcodes.hxx | 2
sal/qa/rtl/math/test-rtl-math.cxx | 20 ++++----
sal/rtl/math.cxx | 2
sc/source/core/data/dpgroup.cxx | 2
scaddins/source/analysis/financial.cxx | 4 -
20 files changed, 75 insertions(+), 75 deletions(-)
New commits:
commit c95529ed8eee120c109cd6fc7c94f615606586b0
Author: Yukio Siraichi <yukio.siraichi at gmail.com>
AuthorDate: Thu Mar 12 19:45:07 2020 +0900
Commit: Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Mar 12 20:06:13 2020 +0100
tdf#130976 replace `rtl::math::isInf` with `std::inf`.
Change-Id: Id0f0e07b324230d2d69cbf4ab07b0fff5b24474d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90377
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 2ba9fd16d211..7451469a82ae 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -534,7 +534,7 @@ sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber )
{
return nNumber == DBL_MIN
|| ::rtl::math::isNan( nNumber )
- || ::rtl::math::isInf( nNumber );
+ || std::isinf( nNumber );
}
// ____ XComponent ____
diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx
index 3019b0939807..bf99b5c619ae 100644
--- a/chart2/source/inc/RegressionCalculationHelper.hxx
+++ b/chart2/source/inc/RegressionCalculationHelper.hxx
@@ -66,8 +66,8 @@ public:
bool operator()( double x, double y )
{ return ! ( ::rtl::math::isNan( x ) ||
::rtl::math::isNan( y ) ||
- ::rtl::math::isInf( x ) ||
- ::rtl::math::isInf( y ) );
+ std::isinf( x ) ||
+ std::isinf( y ) );
}
};
@@ -77,8 +77,8 @@ public:
bool operator()( double x, double y )
{ return ! ( ::rtl::math::isNan( x ) ||
::rtl::math::isNan( y ) ||
- ::rtl::math::isInf( x ) ||
- ::rtl::math::isInf( y ) ||
+ std::isinf( x ) ||
+ std::isinf( y ) ||
x <= 0.0 );
}
};
@@ -89,8 +89,8 @@ public:
bool operator()( double x, double y )
{ return ! ( ::rtl::math::isNan( x ) ||
::rtl::math::isNan( y ) ||
- ::rtl::math::isInf( x ) ||
- ::rtl::math::isInf( y ) ||
+ std::isinf( x ) ||
+ std::isinf( y ) ||
y <= 0.0 );
}
};
@@ -101,8 +101,8 @@ public:
bool operator()( double x, double y )
{ return ! ( ::rtl::math::isNan( x ) ||
::rtl::math::isNan( y ) ||
- ::rtl::math::isInf( x ) ||
- ::rtl::math::isInf( y ) ||
+ std::isinf( x ) ||
+ std::isinf( y ) ||
y >= 0.0 );
}
};
@@ -113,8 +113,8 @@ public:
bool operator()( double x, double y )
{ return ! ( ::rtl::math::isNan( x ) ||
::rtl::math::isNan( y ) ||
- ::rtl::math::isInf( x ) ||
- ::rtl::math::isInf( y ) ||
+ std::isinf( x ) ||
+ std::isinf( y ) ||
x <= 0.0 ||
y <= 0.0 );
}
@@ -126,8 +126,8 @@ public:
bool operator()( double x, double y )
{ return ! ( ::rtl::math::isNan( x ) ||
::rtl::math::isNan( y ) ||
- ::rtl::math::isInf( x ) ||
- ::rtl::math::isInf( y ) ||
+ std::isinf( x ) ||
+ std::isinf( y ) ||
x <= 0.0 ||
y >= 0.0 );
}
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 9a9d2db8188a..a02c9e79a324 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -1486,7 +1486,7 @@ double SAL_CALL InternalDataProvider::getNotANumber()
sal_Bool SAL_CALL InternalDataProvider::isNotANumber( double nNumber )
{
return ::rtl::math::isNan( nNumber )
- || ::rtl::math::isInf( nNumber );
+ || std::isinf( nNumber );
}
// lang::XInitialization:
void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments)
diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
index 5d98e8c563c1..ad8c6ddcb6ff 100644
--- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
@@ -49,7 +49,7 @@ void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression(
for( sal_Int32 i = 0; i < nDataLength; ++i )
{
if( ::rtl::math::isNan( pY[i] ) ||
- ::rtl::math::isInf( pY[i] ))
+ std::isinf( pY[i] ))
--nMax;
else
fSumY += pY[i];
@@ -72,7 +72,7 @@ void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression(
for( sal_Int32 i = 0; i < nDataLength; ++i )
{
if( !::rtl::math::isNan( pY[i] ) &&
- !::rtl::math::isInf( pY[i] ))
+ !std::isinf( pY[i] ))
{
double v = m_fMeanValue - pY[i];
fErrorSum += (v*v);
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index e387a3047442..b8bed8262b97 100644
--- a/chart2/source/tools/Scaling.cxx
+++ b/chart2/source/tools/Scaling.cxx
@@ -58,7 +58,7 @@ LogarithmicScaling::~LogarithmicScaling()
double SAL_CALL LogarithmicScaling::doScaling( double value )
{
double fResult;
- if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
+ if( ::rtl::math::isNan( value ) || std::isinf( value ) )
::rtl::math::setNan( & fResult );
else
fResult = log( value ) / m_fLogOfBase;
@@ -107,7 +107,7 @@ ExponentialScaling::~ExponentialScaling()
double SAL_CALL ExponentialScaling::doScaling( double value )
{
double fResult;
- if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
+ if( ::rtl::math::isNan( value ) || std::isinf( value ) )
::rtl::math::setNan( & fResult );
else
fResult = pow( m_fBase, value );
@@ -155,7 +155,7 @@ LinearScaling::~LinearScaling()
double SAL_CALL LinearScaling::doScaling( double value )
{
double fResult;
- if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
+ if( ::rtl::math::isNan( value ) || std::isinf( value ) )
::rtl::math::setNan( & fResult );
else
fResult = m_fOffset + m_fSlope * value;
@@ -206,7 +206,7 @@ PowerScaling::~PowerScaling()
double SAL_CALL PowerScaling::doScaling( double value )
{
double fResult;
- if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
+ if( ::rtl::math::isNan( value ) || std::isinf( value ) )
::rtl::math::setNan( & fResult );
else
fResult = pow( value, m_fExponent );
diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx
index a1aa4151c1fe..8285600801de 100644
--- a/chart2/source/view/axes/DateScaling.cxx
+++ b/chart2/source/view/axes/DateScaling.cxx
@@ -53,7 +53,7 @@ DateScaling::~DateScaling()
double SAL_CALL DateScaling::doScaling( double value )
{
double fResult(value);
- if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
+ if( ::rtl::math::isNan( value ) || std::isinf( value ) )
::rtl::math::setNan( & fResult );
else
{
@@ -129,7 +129,7 @@ InverseDateScaling::~InverseDateScaling()
double SAL_CALL InverseDateScaling::doScaling( double value )
{
double fResult(value);
- if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
+ if( ::rtl::math::isNan( value ) || std::isinf( value ) )
::rtl::math::setNan( & fResult );
else
{
diff --git a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
index 50c3d4958694..2bb936567469 100644
--- a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
+++ b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
@@ -55,7 +55,7 @@ double MergedMinimumAndMaximumSupplier::getMinimumX()
if(fLocalExtremum<fGlobalExtremum)
fGlobalExtremum=fLocalExtremum;
}
- if(::rtl::math::isInf(fGlobalExtremum))
+ if(std::isinf(fGlobalExtremum))
::rtl::math::setNan(&fGlobalExtremum);
return fGlobalExtremum;
}
@@ -70,7 +70,7 @@ double MergedMinimumAndMaximumSupplier::getMaximumX()
if(fLocalExtremum>fGlobalExtremum)
fGlobalExtremum=fLocalExtremum;
}
- if(::rtl::math::isInf(fGlobalExtremum))
+ if(std::isinf(fGlobalExtremum))
::rtl::math::setNan(&fGlobalExtremum);
return fGlobalExtremum;
}
@@ -85,7 +85,7 @@ double MergedMinimumAndMaximumSupplier::getMinimumYInRange( double fMinimumX, do
if(fLocalExtremum<fGlobalExtremum)
fGlobalExtremum=fLocalExtremum;
}
- if(::rtl::math::isInf(fGlobalExtremum))
+ if(std::isinf(fGlobalExtremum))
::rtl::math::setNan(&fGlobalExtremum);
return fGlobalExtremum;
}
@@ -100,7 +100,7 @@ double MergedMinimumAndMaximumSupplier::getMaximumYInRange( double fMinimumX, do
if(fLocalExtremum>fGlobalExtremum)
fGlobalExtremum=fLocalExtremum;
}
- if(::rtl::math::isInf(fGlobalExtremum))
+ if(std::isinf(fGlobalExtremum))
::rtl::math::setNan(&fGlobalExtremum);
return fGlobalExtremum;
}
@@ -115,7 +115,7 @@ double MergedMinimumAndMaximumSupplier::getMinimumZ()
if(fLocalExtremum<fGlobalExtremum)
fGlobalExtremum=fLocalExtremum;
}
- if(::rtl::math::isInf(fGlobalExtremum))
+ if(std::isinf(fGlobalExtremum))
::rtl::math::setNan(&fGlobalExtremum);
return fGlobalExtremum;
}
@@ -130,7 +130,7 @@ double MergedMinimumAndMaximumSupplier::getMaximumZ()
if(fLocalExtremum>fGlobalExtremum)
fGlobalExtremum=fLocalExtremum;
}
- if(::rtl::math::isInf(fGlobalExtremum))
+ if(std::isinf(fGlobalExtremum))
::rtl::math::setNan(&fGlobalExtremum);
return fGlobalExtremum;
}
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index f6101c15917c..1ec356fe65cc 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -668,7 +668,7 @@ void AreaChart::createShapes()
m_pPosHelper = &getPlottingPositionHelper(nAttachedAxisIndex);
double fAdd = pSeries->getYValue( nIndex );
- if( !::rtl::math::isNan(fAdd) && !::rtl::math::isInf(fAdd) )
+ if( !::rtl::math::isNan(fAdd) && !std::isinf(fAdd) )
rLogicYSumMap[nAttachedAxisIndex] += fabs( fAdd );
}
}
@@ -729,9 +729,9 @@ void AreaChart::createShapes()
fLogicY = fabs( fLogicY )/rLogicYSumMap[nAttachedAxisIndex];
}
- if( ::rtl::math::isNan(fLogicX) || ::rtl::math::isInf(fLogicX)
- || ::rtl::math::isNan(fLogicY) || ::rtl::math::isInf(fLogicY)
- || ::rtl::math::isNan(fLogicZ) || ::rtl::math::isInf(fLogicZ) )
+ if( ::rtl::math::isNan(fLogicX) || std::isinf(fLogicX)
+ || ::rtl::math::isNan(fLogicY) || std::isinf(fLogicY)
+ || ::rtl::math::isNan(fLogicZ) || std::isinf(fLogicZ) )
{
if( pSeries->getMissingValueTreatment() == css::chart::MissingValueTreatment::LEAVE_GAP )
{
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index ef2a75934dfb..e664d328901e 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -102,7 +102,7 @@ drawing::Direction3D BubbleChart::transformToScreenBubbleSize( double fLogicSize
{
drawing::Direction3D aRet(0,0,0);
- if( ::rtl::math::isNan(fLogicSize) || ::rtl::math::isInf(fLogicSize) )
+ if( ::rtl::math::isNan(fLogicSize) || std::isinf(fLogicSize) )
return aRet;
double fMaxSize = m_fMaxLogicBubbleSize;
@@ -227,8 +227,8 @@ void BubbleChart::createShapes()
if( fBubbleSize == 0.0 || ::rtl::math::isNan(fBubbleSize) )
continue;
- if( ::rtl::math::isNan(fLogicX) || ::rtl::math::isInf(fLogicX)
- || ::rtl::math::isNan(fLogicY) || ::rtl::math::isInf(fLogicY) )
+ if( ::rtl::math::isNan(fLogicX) || std::isinf(fLogicX)
+ || ::rtl::math::isNan(fLogicY) || std::isinf(fLogicY) )
continue;
bool bIsVisible = rPosHelper.isLogicVisible(fLogicX, fLogicY, fLogicZ);
diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx
index 6c4a202a7bc4..66839280340a 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -373,7 +373,7 @@ void NetChart::createShapes()
m_pPosHelper = &getPlottingPositionHelper(nAttachedAxisIndex);
double fAdd = pSeries->getYValue( nIndex );
- if( !::rtl::math::isNan(fAdd) && !::rtl::math::isInf(fAdd) )
+ if( !::rtl::math::isNan(fAdd) && !std::isinf(fAdd) )
aLogicYSumMap[nAttachedAxisIndex] += fabs( fAdd );
}
}
@@ -411,7 +411,7 @@ void NetChart::createShapes()
fLogicX = DateHelper::RasterizeDateValue( fLogicX, m_aNullDate, m_nTimeResolution );
double fLogicY = pSeries->getYValue(nIndex);
- if( m_bArea && ( ::rtl::math::isNan(fLogicY) || ::rtl::math::isInf(fLogicY) ) )
+ if( m_bArea && ( ::rtl::math::isNan(fLogicY) || std::isinf(fLogicY) ) )
{
if( pSeries->getMissingValueTreatment() == css::chart::MissingValueTreatment::LEAVE_GAP )
{
@@ -431,9 +431,9 @@ void NetChart::createShapes()
fLogicY = fabs( fLogicY )/aLogicYSumMap[nAttachedAxisIndex];
}
- if( ::rtl::math::isNan(fLogicX) || ::rtl::math::isInf(fLogicX)
- || ::rtl::math::isNan(fLogicY) || ::rtl::math::isInf(fLogicY)
- || ::rtl::math::isNan(fLogicZ) || ::rtl::math::isInf(fLogicZ) )
+ if( ::rtl::math::isNan(fLogicX) || std::isinf(fLogicX)
+ || ::rtl::math::isNan(fLogicY) || std::isinf(fLogicY)
+ || ::rtl::math::isNan(fLogicZ) || std::isinf(fLogicZ) )
{
if( pSeries->getMissingValueTreatment() == css::chart::MissingValueTreatment::LEAVE_GAP )
{
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index e41a2ba6bcd7..5d5a02228690 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -149,7 +149,7 @@ void lcl_SplineCalculation::Calculate()
std::vector< double > u( n );
m_aSecDerivY.resize( n + 1, 0.0 );
- if( ::rtl::math::isInf( m_fYp1 ) )
+ if( std::isinf( m_fYp1 ) )
{
// natural spline
m_aSecDerivY[ 0 ] = 0.0;
@@ -190,7 +190,7 @@ void lcl_SplineCalculation::Calculate()
double qn = 0.0;
double un = 0.0;
- if( ! ::rtl::math::isInf( m_fYpN ) )
+ if( ! std::isinf( m_fYpN ) )
{
qn = 0.5;
double xDiff = m_aPoints[ n ].first - m_aPoints[ n - 1 ].first;
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index b9affd0e9f88..27c5fe29ee6b 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1427,9 +1427,9 @@ void VSeriesPlotter::createRegressionCurvesShapes( VDataSeries const & rVDataSer
if(!bAverageLine)
m_pPosHelper->doLogicScaling( &fLogicX, &fLogicY, &fLogicZ );
- if(!rtl::math::isNan(fLogicX) && !rtl::math::isInf(fLogicX) &&
- !rtl::math::isNan(fLogicY) && !rtl::math::isInf(fLogicY) &&
- !rtl::math::isNan(fLogicZ) && !rtl::math::isInf(fLogicZ) )
+ if(!rtl::math::isNan(fLogicX) && !std::isinf(fLogicX) &&
+ !rtl::math::isNan(fLogicY) && !std::isinf(fLogicY) &&
+ !rtl::math::isNan(fLogicZ) && !std::isinf(fLogicZ) )
{
aRegressionPoly.SequenceX[0][nRealPointCount] = fLogicX;
aRegressionPoly.SequenceY[0][nRealPointCount] = fLogicY;
@@ -1735,7 +1735,7 @@ double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, s
fMinimum=fLocalMinimum;
}
}
- if(::rtl::math::isInf(fMinimum))
+ if(std::isinf(fMinimum))
::rtl::math::setNan(&fMinimum);
return fMinimum;
}
@@ -1768,7 +1768,7 @@ double VSeriesPlotter::getMaximumYInRange( double fMinimumX, double fMaximumX, s
fMinimum=fLocalMinimum;
}
}
- if(::rtl::math::isInf(fMaximum))
+ if(std::isinf(fMaximum))
::rtl::math::setNan(&fMaximum);
return fMaximum;
}
@@ -1842,9 +1842,9 @@ void VSeriesPlotter::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximu
rfMaximum = fLocalMaximum;
}
}
- if(::rtl::math::isInf(rfMinimum))
+ if(std::isinf(rfMinimum))
::rtl::math::setNan(&rfMinimum);
- if(::rtl::math::isInf(rfMaximum))
+ if(std::isinf(rfMaximum))
::rtl::math::setNan(&rfMaximum);
}
@@ -1865,9 +1865,9 @@ void VSeriesPlotter::getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, d
rfMaxY = fLocalMaximum;
}
}
- if(::rtl::math::isInf(rfMinY))
+ if(std::isinf(rfMinY))
::rtl::math::setNan(&rfMinY);
- if(::rtl::math::isInf(rfMaxY))
+ if(std::isinf(rfMaxY))
::rtl::math::setNan(&rfMaxY);
}
@@ -1953,9 +1953,9 @@ void VDataSeriesGroup::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaxi
rfMinimum=fX;
}
}
- if(::rtl::math::isInf(rfMinimum))
+ if(std::isinf(rfMinimum))
::rtl::math::setNan(&rfMinimum);
- if(::rtl::math::isInf(rfMaximum))
+ if(std::isinf(rfMaximum))
::rtl::math::setNan(&rfMaximum);
}
diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx
index ea40338f6a22..c5cd481d7b44 100644
--- a/chart2/source/view/main/PlotterBase.cxx
+++ b/chart2/source/view/main/PlotterBase.cxx
@@ -101,11 +101,11 @@ bool PlotterBase::isValidPosition( const drawing::Position3D& rPos )
return false;
if( ::rtl::math::isNan(rPos.PositionZ) )
return false;
- if( ::rtl::math::isInf(rPos.PositionX) )
+ if( std::isinf(rPos.PositionX) )
return false;
- if( ::rtl::math::isInf(rPos.PositionY) )
+ if( std::isinf(rPos.PositionY) )
return false;
- if( ::rtl::math::isInf(rPos.PositionZ) )
+ if( std::isinf(rPos.PositionZ) )
return false;
return true;
}
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index d66d97a94482..8b3a9c18b9a0 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -137,7 +137,7 @@ void lcl_clearIfNoValuesButTextIsContained( VDataSequence& rData, const uno::Ref
void lcl_maybeReplaceNanWithZero( double& rfValue, sal_Int32 nMissingValueTreatment )
{
if( nMissingValueTreatment == css::chart::MissingValueTreatment::USE_ZERO
- && (::rtl::math::isNan(rfValue) || ::rtl::math::isInf(rfValue)) )
+ && (::rtl::math::isNan(rfValue) || std::isinf(rfValue)) )
rfValue = 0.0;
}
@@ -700,7 +700,7 @@ double VDataSeries::getMinimumofAllDifferentYValues( sal_Int32 index ) const
fMin=fY;
}
- if( ::rtl::math::isInf(fMin) )
+ if( std::isinf(fMin) )
::rtl::math::setNan(&fMin);
return fMin;
@@ -736,7 +736,7 @@ double VDataSeries::getMaximumofAllDifferentYValues( sal_Int32 index ) const
fMax=fY;
}
- if( ::rtl::math::isInf(fMax) )
+ if( std::isinf(fMax) )
::rtl::math::setNan(&fMax);
return fMax;
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 6520ce235f31..364d1823f918 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -51,7 +51,7 @@ namespace frm
double nExternalValue = 0;
if ( _rExternalValue >>= nExternalValue )
{
- if ( ::rtl::math::isInf( nExternalValue ) )
+ if ( std::isinf( nExternalValue ) )
{
// set the minimum or maximum of the scroll values
OUString sLimitPropertyName = ::rtl::math::isSignBitSet( nExternalValue )
diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx
index a6095678c0e5..12696bb0579d 100644
--- a/include/formula/errorcodes.hxx
+++ b/include/formula/errorcodes.hxx
@@ -106,7 +106,7 @@ inline FormulaError GetDoubleErrorValue( double fVal )
{
if ( std::isfinite( fVal ) )
return FormulaError::NONE;
- if ( ::rtl::math::isInf( fVal ) )
+ if ( std::isinf( fVal ) )
return FormulaError::IllegalFPOperation; // normal INF
sal_uInt32 nErr = reinterpret_cast< sal_math_Double * >( &fVal)->nan_parts.fraction_lo;
if ( nErr & 0xffff0000 )
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx
index af45eded639e..43d8e90afffc 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -79,14 +79,14 @@ public:
'.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_OutOfRange, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end);
- CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res));
+ CPPUNIT_ASSERT(std::isinf(res));
res = rtl::math::stringToDouble(
OUString("INF1.23"),
'.', ',', &status, &end);
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_OutOfRange, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end);
- CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res));
+ CPPUNIT_ASSERT(std::isinf(res));
res = rtl::math::stringToDouble(
OUString(".5"),
@@ -402,7 +402,7 @@ public:
CPPUNIT_ASSERT_EQUAL(true, rtl::math::isSignBitSet(res));
rtl::math::setInf( &x, false);
res = rtl::math::expm1(x);
- CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res) && !rtl::math::isSignBitSet(res));
+ CPPUNIT_ASSERT_EQUAL(true, std::isinf(res) && !rtl::math::isSignBitSet(res));
rtl::math::setInf( &x, true);
res = rtl::math::expm1(x);
CPPUNIT_ASSERT_EQUAL(-1.0,res);
@@ -422,10 +422,10 @@ public:
CPPUNIT_ASSERT_EQUAL(true, rtl::math::isSignBitSet(res));
rtl::math::setInf( &x, false);
res = rtl::math::log1p(x);
- CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res) && !rtl::math::isSignBitSet(res));
+ CPPUNIT_ASSERT_EQUAL(true, std::isinf(res) && !rtl::math::isSignBitSet(res));
x = -1.0;
res = rtl::math::log1p(x);
- CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res) && rtl::math::isSignBitSet(res));
+ CPPUNIT_ASSERT_EQUAL(true, std::isinf(res) && rtl::math::isSignBitSet(res));
x = -1.1;
res = rtl::math::log1p(x);
CPPUNIT_ASSERT_EQUAL(true, rtl::math::isNan(res));
@@ -453,7 +453,7 @@ public:
res = rtl::math::acosh(std::numeric_limits<double>::infinity()); // +Inf
CPPUNIT_ASSERT(!rtl::math::isSignBitSet(res));
- CPPUNIT_ASSERT(rtl::math::isInf(res));
+ CPPUNIT_ASSERT(std::isinf(res));
// #i97605
CPPUNIT_ASSERT_DOUBLES_EQUAL(692.56728736744176, rtl::math::acosh(3e+300), 1e-15);
@@ -465,13 +465,13 @@ public:
res = rtl::math::asinh(-std::numeric_limits<double>::infinity()); // -Inf
CPPUNIT_ASSERT(rtl::math::isSignBitSet(res));
- CPPUNIT_ASSERT(rtl::math::isInf(res));
+ CPPUNIT_ASSERT(std::isinf(res));
CPPUNIT_ASSERT_EQUAL(0.0, rtl::math::asinh(0.0));
res = rtl::math::asinh(std::numeric_limits<double>::infinity()); // +Inf
CPPUNIT_ASSERT(!rtl::math::isSignBitSet(res));
- CPPUNIT_ASSERT(rtl::math::isInf(res));
+ CPPUNIT_ASSERT(std::isinf(res));
// #i97605
CPPUNIT_ASSERT_DOUBLES_EQUAL(691.67568924815798, rtl::math::asinh(1.23e+300), 1e-15);
@@ -492,13 +492,13 @@ public:
res = rtl::math::atanh(-1.0); // -Inf
CPPUNIT_ASSERT(rtl::math::isSignBitSet(res));
- CPPUNIT_ASSERT(rtl::math::isInf(res));
+ CPPUNIT_ASSERT(std::isinf(res));
CPPUNIT_ASSERT_EQUAL(0.0, rtl::math::atanh(0.0));
res = rtl::math::atanh(1.0); // +Inf
CPPUNIT_ASSERT(!rtl::math::isSignBitSet(res));
- CPPUNIT_ASSERT(rtl::math::isInf(res));
+ CPPUNIT_ASSERT(std::isinf(res));
res = rtl::math::atanh(2.0); // NaN
CPPUNIT_ASSERT(rtl::math::isNan(res));
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 5f52b96a34c7..31de7f718b09 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -259,7 +259,7 @@ void doubleToString(typename T::String ** pResult,
}
bool bHuge = fValue == HUGE_VAL; // g++ 3.0.1 requires it this way...
- if (bHuge || rtl::math::isInf(fValue))
+ if (bHuge || std::isinf(fValue))
{
// #i112652# XMLSchema-2
sal_Int32 nCapacity = RTL_CONSTASCII_LENGTH("-INF");
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 93601ebf68a7..061ad64aa5e0 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -70,7 +70,7 @@ bool ScDPGroupNumFilter::match(const ScDPItemData& rCellData) const
for (const auto& rValue : maValues)
{
double fVal = rValue.GetValue();
- if (rtl::math::isInf(fVal))
+ if (std::isinf(fVal))
{
if (rtl::math::isSignBitSet(fVal))
{
diff --git a/scaddins/source/analysis/financial.cxx b/scaddins/source/analysis/financial.cxx
index 63ad2085b349..c32f61ed5700 100644
--- a/scaddins/source/analysis/financial.cxx
+++ b/scaddins/source/analysis/financial.cxx
@@ -561,8 +561,8 @@ double SAL_CALL AnalysisAddIn::getXirr(
}
while( bContLoop && (++nIter < nMaxIter) );
nIter = 0;
- if ( ::rtl::math::isNan(fResultRate) || ::rtl::math::isInf(fResultRate)
- ||::rtl::math::isNan(fResultValue) || ::rtl::math::isInf(fResultValue))
+ if ( ::rtl::math::isNan(fResultRate) || std::isinf(fResultRate)
+ ||::rtl::math::isNan(fResultValue) || std::isinf(fResultValue))
bContLoop = true;
++nIterScan;
More information about the Libreoffice-commits
mailing list