summaryrefslogtreecommitdiffstats
path: root/chart2
diff options
context:
space:
mode:
authorYukio Siraichi <yukio.siraichi@gmail.com>2020-03-13 15:41:40 +0900
committerMike Kaganski <mike.kaganski@collabora.com>2020-03-14 09:19:00 +0100
commit3bf3face224a7e12ba95888821a0ac21525af22c (patch)
tree93908386dd614404e46898ae16ee179549a1a0f9 /chart2
parenttdf#130974 replace `rtl::math::isSignBitSet` with `std::signbit`. (diff)
downloadcore-3bf3face224a7e12ba95888821a0ac21525af22c.tar.gz
core-3bf3face224a7e12ba95888821a0ac21525af22c.zip
tdf#130975 replace `rtl::math::isNan` with `std::isnan`.
Change-Id: I5d53e6369d35093445b2efd8936bbf8c6775ff47 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90451 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/qa/extras/chart2import.cxx24
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx4
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx6
-rw-r--r--chart2/source/inc/CommonFunctors.hxx2
-rw-r--r--chart2/source/inc/RegressionCalculationHelper.hxx24
-rw-r--r--chart2/source/tools/AxisHelper.cxx2
-rw-r--r--chart2/source/tools/ExplicitCategoriesProvider.cxx4
-rw-r--r--chart2/source/tools/ExponentialRegressionCurveCalculator.cxx4
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx2
-rw-r--r--chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx4
-rw-r--r--chart2/source/tools/MeanValueRegressionCurveCalculator.cxx4
-rw-r--r--chart2/source/tools/PotentialRegressionCurveCalculator.cxx4
-rw-r--r--chart2/source/tools/Scaling.cxx8
-rw-r--r--chart2/source/tools/StatisticsHelper.cxx6
-rw-r--r--chart2/source/view/axes/DateHelper.cxx2
-rw-r--r--chart2/source/view/axes/DateScaling.cxx4
-rw-r--r--chart2/source/view/axes/ScaleAutomatism.cxx8
-rw-r--r--chart2/source/view/axes/VCartesianAxis.cxx2
-rw-r--r--chart2/source/view/charttypes/AreaChart.cxx10
-rw-r--r--chart2/source/view/charttypes/BarChart.cxx14
-rw-r--r--chart2/source/view/charttypes/BubbleChart.cxx12
-rw-r--r--chart2/source/view/charttypes/NetChart.cxx10
-rw-r--r--chart2/source/view/charttypes/PieChart.cxx8
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx38
-rw-r--r--chart2/source/view/main/PlotterBase.cxx6
-rw-r--r--chart2/source/view/main/VDataSeries.cxx10
26 files changed, 111 insertions, 111 deletions
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index 4850f33ee76c..68a142090805 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -531,8 +531,8 @@ void Chart2ImportTest::testDOCXChartEmptySeries()
CPPUNIT_ASSERT_EQUAL(2.4, aValues[1][0]);
CPPUNIT_ASSERT_EQUAL(4.4, aValues[1][1]);
//test the third series (empty) values
- CPPUNIT_ASSERT(rtl::math::isNan(aValues[2][0]));
- CPPUNIT_ASSERT(rtl::math::isNan(aValues[2][1]));
+ CPPUNIT_ASSERT(std::isnan(aValues[2][0]));
+ CPPUNIT_ASSERT(std::isnan(aValues[2][1]));
}
void Chart2ImportTest::testDOCXChartValuesSize()
@@ -596,13 +596,13 @@ void Chart2ImportTest::testPPTXSparseChartSeries()
std::vector<std::vector<double> > aValues = getDataSeriesYValuesFromChartType(xCT);
CPPUNIT_ASSERT_EQUAL(size_t(2), aValues.size());
- CPPUNIT_ASSERT( rtl::math::isNan( aValues[0][0] ) );
+ CPPUNIT_ASSERT( std::isnan( aValues[0][0] ) );
CPPUNIT_ASSERT_EQUAL(2.5, aValues[0][1]);
CPPUNIT_ASSERT_EQUAL(3.5, aValues[0][2]);
- CPPUNIT_ASSERT( rtl::math::isNan( aValues[0][3] ) );
+ CPPUNIT_ASSERT( std::isnan( aValues[0][3] ) );
CPPUNIT_ASSERT_EQUAL(-2.4, aValues[1][0]);
- CPPUNIT_ASSERT( rtl::math::isNan( aValues[1][1] ) );
- CPPUNIT_ASSERT( rtl::math::isNan( aValues[1][2] ) );
+ CPPUNIT_ASSERT( std::isnan( aValues[1][1] ) );
+ CPPUNIT_ASSERT( std::isnan( aValues[1][2] ) );
CPPUNIT_ASSERT_EQUAL(-2.8, aValues[1][3]);
}
@@ -1633,17 +1633,17 @@ void Chart2ImportTest::testInternalDataProvider() {
// Parse empty first and last
xDataSeq = rxDataProvider->createDataSequenceByValueArray("values-y", "{\"\";42;42;\"\"}");
xSequence = xDataSeq->getData();
- CPPUNIT_ASSERT( rtl::math::isNan( *static_cast<const double*>(xSequence[0].getValue())));
+ CPPUNIT_ASSERT( std::isnan( *static_cast<const double*>(xSequence[0].getValue())));
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[1]);
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[2]);
- CPPUNIT_ASSERT( rtl::math::isNan( *static_cast<const double*>(xSequence[3].getValue())));
+ CPPUNIT_ASSERT( std::isnan( *static_cast<const double*>(xSequence[3].getValue())));
// Parse empty middle
xDataSeq = rxDataProvider->createDataSequenceByValueArray("values-y", "{42;\"\";\"\";42}");
xSequence = xDataSeq->getData();
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[0]);
- CPPUNIT_ASSERT( rtl::math::isNan( *static_cast<const double*>(xSequence[1].getValue())) );
- CPPUNIT_ASSERT( rtl::math::isNan( *static_cast<const double*>(xSequence[2].getValue())) );
+ CPPUNIT_ASSERT( std::isnan( *static_cast<const double*>(xSequence[1].getValue())) );
+ CPPUNIT_ASSERT( std::isnan( *static_cast<const double*>(xSequence[2].getValue())) );
CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[3]);
// Parse mixed types, numeric only role
@@ -2277,10 +2277,10 @@ void Chart2ImportTest::testXaxisValues()
Sequence<uno::Any> xSequence = xDataSeq->getData();
// test X values
CPPUNIT_ASSERT_EQUAL(uno::Any(0.04), xSequence[0]);
- CPPUNIT_ASSERT(rtl::math::isNan(*static_cast<const double*>(xSequence[1].getValue())));
+ CPPUNIT_ASSERT(std::isnan(*static_cast<const double*>(xSequence[1].getValue())));
CPPUNIT_ASSERT_EQUAL(uno::Any(0.16), xSequence[2]);
CPPUNIT_ASSERT_EQUAL(uno::Any(0.11), xSequence[3]);
- CPPUNIT_ASSERT(rtl::math::isNan(*static_cast<const double*>(xSequence[4].getValue())));
+ CPPUNIT_ASSERT(std::isnan(*static_cast<const double*>(xSequence[4].getValue())));
}
void Chart2ImportTest::testTdf123504()
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 7451469a82ae..48a448edfc50 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -76,7 +76,7 @@ uno::Sequence< uno::Sequence< double > > lcl_getDBL_MINInsteadNAN( const uno::Se
{
aRet[nOuter][nInner] = rData[nOuter][nInner];
double& rValue = aRet[nOuter][nInner];
- if( ::rtl::math::isNan( rValue ) )
+ if( std::isnan( rValue ) )
rValue = DBL_MIN;
}
}
@@ -533,7 +533,7 @@ double SAL_CALL ChartDataWrapper::getNotANumber()
sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber )
{
return nNumber == DBL_MIN
- || ::rtl::math::isNan( nNumber )
+ || std::isnan( nNumber )
|| std::isinf( nNumber );
}
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 415a38bb4980..5887d85af217 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -705,7 +705,7 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
double fData( m_apDataBrowserModel->getCellNumber( nColIndex, nRow ));
Color nLabelColor;
- if( ! ::rtl::math::isNan( fData ) &&
+ if( ! std::isnan( fData ) &&
m_spNumberFormatterWrapper.get() )
{
bool bColorChanged = false;
@@ -723,7 +723,7 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
aResult = aText;
else if( aAny>>=fDouble )
{
- if( ! ::rtl::math::isNan( fDouble ) && m_spNumberFormatterWrapper.get() )
+ if( ! std::isnan( fDouble ) && m_spNumberFormatterWrapper.get() )
{
// If a numberformat was available here we could directly
// obtain the corresponding edit format in
@@ -1140,7 +1140,7 @@ void DataBrowser::InitController(
{
// treat invalid and empty text as Nan
m_aNumberEditField->EnableNotANumber( true );
- if( ::rtl::math::isNan( GetCellNumber( nRow, nCol )))
+ if( std::isnan( GetCellNumber( nRow, nCol )))
m_aNumberEditField->SetTextValue( OUString());
else
m_aNumberEditField->SetValue( GetCellNumber( nRow, nCol ) );
diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx
index d9daef13d574..10d32f5bf0e1 100644
--- a/chart2/source/inc/CommonFunctors.hxx
+++ b/chart2/source/inc/CommonFunctors.hxx
@@ -69,7 +69,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString
{
if( auto pDouble = o3tl::tryAccess<double>(rAny) )
{
- if( ::rtl::math::isNan(*pDouble) )
+ if( std::isnan(*pDouble) )
return OUString();
return ::rtl::math::doubleToUString(
* pDouble,
diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx
index bf99b5c619ae..a5b2b3b16975 100644
--- a/chart2/source/inc/RegressionCalculationHelper.hxx
+++ b/chart2/source/inc/RegressionCalculationHelper.hxx
@@ -64,8 +64,8 @@ class isValid
{
public:
bool operator()( double x, double y )
- { return ! ( ::rtl::math::isNan( x ) ||
- ::rtl::math::isNan( y ) ||
+ { return ! ( std::isnan( x ) ||
+ std::isnan( y ) ||
std::isinf( x ) ||
std::isinf( y ) );
}
@@ -75,8 +75,8 @@ class isValidAndXPositive
{
public:
bool operator()( double x, double y )
- { return ! ( ::rtl::math::isNan( x ) ||
- ::rtl::math::isNan( y ) ||
+ { return ! ( std::isnan( x ) ||
+ std::isnan( y ) ||
std::isinf( x ) ||
std::isinf( y ) ||
x <= 0.0 );
@@ -87,8 +87,8 @@ class isValidAndYPositive
{
public:
bool operator()( double x, double y )
- { return ! ( ::rtl::math::isNan( x ) ||
- ::rtl::math::isNan( y ) ||
+ { return ! ( std::isnan( x ) ||
+ std::isnan( y ) ||
std::isinf( x ) ||
std::isinf( y ) ||
y <= 0.0 );
@@ -99,8 +99,8 @@ class isValidAndYNegative
{
public:
bool operator()( double x, double y )
- { return ! ( ::rtl::math::isNan( x ) ||
- ::rtl::math::isNan( y ) ||
+ { return ! ( std::isnan( x ) ||
+ std::isnan( y ) ||
std::isinf( x ) ||
std::isinf( y ) ||
y >= 0.0 );
@@ -111,8 +111,8 @@ class isValidAndBothPositive
{
public:
bool operator()( double x, double y )
- { return ! ( ::rtl::math::isNan( x ) ||
- ::rtl::math::isNan( y ) ||
+ { return ! ( std::isnan( x ) ||
+ std::isnan( y ) ||
std::isinf( x ) ||
std::isinf( y ) ||
x <= 0.0 ||
@@ -124,8 +124,8 @@ class isValidAndXPositiveAndYNegative
{
public:
bool operator()( double x, double y )
- { return ! ( ::rtl::math::isNan( x ) ||
- ::rtl::math::isNan( y ) ||
+ { return ! ( std::isnan( x ) ||
+ std::isnan( y ) ||
std::isinf( x ) ||
std::isinf( y ) ||
x <= 0.0 ||
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 75d51c610e11..78c9cf5e4e28 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -214,7 +214,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
sal_Int32 nCount = aCats.getLength();
for( sal_Int32 i = 0; i < nCount; ++i )
{
- if( (aCats[i]>>=fTest) && !::rtl::math::isNan(fTest) )
+ if( (aCats[i]>>=fTest) && !std::isnan(fTest) )
{
bHasValidDoubles=true;
break;
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 845b55afda04..401d6eaa70e1 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -192,7 +192,7 @@ void ExplicitCategoriesProvider::convertCategoryAnysToText( uno::Sequence< OUStr
double fDouble = 0;
if( aAny>>=fDouble )
{
- if( !::rtl::math::isNan(fDouble) )
+ if( !std::isnan(fDouble) )
aText = aNumberFormatterWrapper.getFormattedString(
nAxisNumberFormat, fDouble, nLabelColor, bColorChanged );
}
@@ -438,7 +438,7 @@ static bool lcl_fillDateCategories( const uno::Reference< data::XDataSequence >&
bool bContainsNan = false;
if( (aAny>>=aTest) && aTest.isEmpty() ) //empty String
bContainsEmptyString = true;
- else if( (aAny>>=fTest) && ::rtl::math::isNan(fTest) )
+ else if( (aAny>>=fTest) && std::isnan(fTest) )
bContainsNan = true;
if( !bContainsEmptyString && !bContainsNan )
diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index 2c2b81359355..600afa76c09b 100644
--- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -115,8 +115,8 @@ double SAL_CALL ExponentialRegressionCurveCalculator::getCurveValue( double x )
double fResult;
::rtl::math::setNan( & fResult );
- if( ! ( ::rtl::math::isNan( m_fLogSlope ) ||
- ::rtl::math::isNan( m_fLogIntercept )))
+ if( ! ( std::isnan( m_fLogSlope ) ||
+ std::isnan( m_fLogIntercept )))
{
fResult = m_fSign * exp(m_fLogIntercept + x * m_fLogSlope);
}
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index a02c9e79a324..08d03b4118d1 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -1485,7 +1485,7 @@ double SAL_CALL InternalDataProvider::getNotANumber()
sal_Bool SAL_CALL InternalDataProvider::isNotANumber( double nNumber )
{
- return ::rtl::math::isNan( nNumber )
+ return std::isnan( nNumber )
|| std::isinf( nNumber );
}
// lang::XInitialization:
diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
index d164918970ba..3c486411b37f 100644
--- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
@@ -92,8 +92,8 @@ double SAL_CALL LogarithmicRegressionCurveCalculator::getCurveValue( double x )
double fResult;
::rtl::math::setNan( & fResult );
- if( ! ( ::rtl::math::isNan( m_fSlope ) ||
- ::rtl::math::isNan( m_fIntercept )))
+ if( ! ( std::isnan( m_fSlope ) ||
+ std::isnan( m_fIntercept )))
{
fResult = m_fSlope * log( x ) + m_fIntercept;
}
diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
index ad8c6ddcb6ff..4fe6bea036bb 100644
--- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
@@ -48,7 +48,7 @@ void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression(
for( sal_Int32 i = 0; i < nDataLength; ++i )
{
- if( ::rtl::math::isNan( pY[i] ) ||
+ if( std::isnan( pY[i] ) ||
std::isinf( pY[i] ))
--nMax;
else
@@ -71,7 +71,7 @@ void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression(
double fErrorSum = 0.0;
for( sal_Int32 i = 0; i < nDataLength; ++i )
{
- if( !::rtl::math::isNan( pY[i] ) &&
+ if( !std::isnan( pY[i] ) &&
!std::isinf( pY[i] ))
{
double v = m_fMeanValue - pY[i];
diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
index abda608a3c34..5ced438e1a3f 100644
--- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
@@ -104,8 +104,8 @@ double SAL_CALL PotentialRegressionCurveCalculator::getCurveValue( double x )
double fResult;
::rtl::math::setNan( & fResult );
- if( ! ( ::rtl::math::isNan( m_fSlope ) ||
- ::rtl::math::isNan( m_fIntercept )))
+ if( ! ( std::isnan( m_fSlope ) ||
+ std::isnan( m_fIntercept )))
{
fResult = m_fIntercept * pow( x, m_fSlope );
}
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index b8bed8262b97..82ce8149b704 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 ) || std::isinf( value ) )
+ if( std::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 ) || std::isinf( value ) )
+ if( std::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 ) || std::isinf( value ) )
+ if( std::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 ) || std::isinf( value ) )
+ if( std::isnan( value ) || std::isinf( value ) )
::rtl::math::setNan( & fResult );
else
fResult = pow( value, m_fExponent );
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index 25e27438c259..f90edf2fe15a 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -51,7 +51,7 @@ double lcl_getVariance( const Sequence< double > & rData, sal_Int32 & rOutValidC
for( sal_Int32 i = 0; i < nCount; ++i )
{
const double fData = rData[i];
- if( ::rtl::math::isNan( fData ))
+ if( std::isnan( fData ))
--rOutValidCount;
else
{
@@ -173,7 +173,7 @@ double StatisticsHelper::getVariance(
double StatisticsHelper::getStandardDeviation( const Sequence< double > & rData )
{
double fResult = getVariance( rData );
- if( ! ::rtl::math::isNan( fResult ))
+ if( ! std::isnan( fResult ))
fResult = sqrt( fResult );
return fResult;
@@ -186,7 +186,7 @@ double StatisticsHelper::getStandardError( const Sequence< double > & rData )
double fResult;
if( nValCount == 0 ||
- ::rtl::math::isNan( fVar ))
+ std::isnan( fVar ))
{
::rtl::math::setNan( & fResult );
}
diff --git a/chart2/source/view/axes/DateHelper.cxx b/chart2/source/view/axes/DateHelper.cxx
index 6006d3e48bed..f705a7346091 100644
--- a/chart2/source/view/axes/DateHelper.cxx
+++ b/chart2/source/view/axes/DateHelper.cxx
@@ -68,7 +68,7 @@ bool DateHelper::IsLessThanOneYearAway( const Date& rD1, const Date& rD2 )
double DateHelper::RasterizeDateValue( double fValue, const Date& rNullDate, long TimeResolution )
{
- if (rtl::math::isNan(fValue))
+ if (std::isnan(fValue))
return fValue;
Date aDate(rNullDate); aDate.AddDays(::rtl::math::approxFloor(fValue));
diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx
index 8285600801de..292f24b7edee 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 ) || std::isinf( value ) )
+ if( std::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 ) || std::isinf( value ) )
+ if( std::isnan( value ) || std::isinf( value ) )
::rtl::math::setNan( & fResult );
else
{
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index b467af2d16b5..1adcfe64d652 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -119,9 +119,9 @@ void ScaleAutomatism::expandValueRange( double fMinimum, double fMaximum )
// so they need to be reset tdf#96807
if( (m_fValueMinimum == 0.0) && (m_fValueMaximum == 0.0) )
resetValueRange();
- if( (fMinimum < m_fValueMinimum) || ::rtl::math::isNan( m_fValueMinimum ) )
+ if( (fMinimum < m_fValueMinimum) || std::isnan( m_fValueMinimum ) )
m_fValueMinimum = fMinimum;
- if( (fMaximum > m_fValueMaximum) || ::rtl::math::isNan( m_fValueMaximum ) )
+ if( (fMaximum > m_fValueMaximum) || std::isnan( m_fValueMaximum ) )
m_fValueMaximum = fMaximum;
}
@@ -174,7 +174,7 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
{
if( m_aSourceScale.AxisType==AxisType::PERCENT )
rExplicitScale.Minimum = 0.0;
- else if( ::rtl::math::isNan( m_fValueMinimum ) )
+ else if( std::isnan( m_fValueMinimum ) )
{
if( m_aSourceScale.AxisType==AxisType::DATE )
rExplicitScale.Minimum = 36526.0; //1.1.2000
@@ -190,7 +190,7 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
{
if( m_aSourceScale.AxisType==AxisType::PERCENT )
rExplicitScale.Maximum = 1.0;
- else if( ::rtl::math::isNan( m_fValueMaximum ) )
+ else if( std::isnan( m_fValueMaximum ) )
{
if( m_aSourceScale.AxisType==AxisType::DATE )
rExplicitScale.Maximum = 40179.0; //1.1.2010
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 52dc4bdb20c8..dbf360ad8ab0 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1957,7 +1957,7 @@ void VCartesianAxis::createShapes()
if( !AxisHelper::isAxisPositioningEnabled() )
{
double fExtraLineCrossesOtherAxis = getExtraLineIntersectionValue();
- if (!rtl::math::isNan(fExtraLineCrossesOtherAxis))
+ if (!std::isnan(fExtraLineCrossesOtherAxis))
{
B2DVector aStart, aEnd;
AxisLabelAlignment aLabelAlign = m_aAxisProperties.maLabelAlignment;
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index 1ec356fe65cc..74e852533345 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) && !std::isinf(fAdd) )
+ if( !std::isnan(fAdd) && !std::isinf(fAdd) )
rLogicYSumMap[nAttachedAxisIndex] += fabs( fAdd );
}
}
@@ -712,7 +712,7 @@ void AreaChart::createShapes()
double fLogicX = pSeries->getXValue(nIndex);
if (bDateCategory)
{
- if (rtl::math::isNan(fLogicX))
+ if (std::isnan(fLogicX))
continue;
fLogicX = DateHelper::RasterizeDateValue( fLogicX, m_aNullDate, m_nTimeResolution );
@@ -729,9 +729,9 @@ void AreaChart::createShapes()
fLogicY = fabs( fLogicY )/rLogicYSumMap[nAttachedAxisIndex];
}
- if( ::rtl::math::isNan(fLogicX) || std::isinf(fLogicX)
- || ::rtl::math::isNan(fLogicY) || std::isinf(fLogicY)
- || ::rtl::math::isNan(fLogicZ) || std::isinf(fLogicZ) )
+ if( std::isnan(fLogicX) || std::isinf(fLogicX)
+ || std::isnan(fLogicY) || std::isinf(fLogicY)
+ || std::isnan(fLogicZ) || std::isinf(fLogicZ) )
{
if( pSeries->getMissingValueTreatment() == css::chart::MissingValueTreatment::LEAVE_GAP )
{
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index e50fbe36ff74..88e8f6e4b502 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -537,9 +537,9 @@ void BarChart::createShapes()
rXSlot.calculateYMinAndMaxForCategory( nPointIndex
, isSeparateStackingForDifferentSigns( 1 ), fMinimumY, fMaximumY, nAttachedAxisIndex );
- if( !::rtl::math::isNan( fMaximumY ) && fMaximumY > 0)
+ if( !std::isnan( fMaximumY ) && fMaximumY > 0)
aLogicYSumMap[nAttachedAxisIndex] += fMaximumY;
- if( !::rtl::math::isNan( fMinimumY ) && fMinimumY < 0)
+ if( !std::isnan( fMinimumY ) && fMinimumY < 0)
aLogicYSumMap[nAttachedAxisIndex] += fabs(fMinimumY);
}
}
@@ -571,11 +571,11 @@ void BarChart::createShapes()
, isSeparateStackingForDifferentSigns( 1 ), fMinimumY, fMaximumY, nAttachedAxisIndex );
double fLogicPositiveYSum = 0.0;
- if( !::rtl::math::isNan( fMaximumY ) )
+ if( !std::isnan( fMaximumY ) )
fLogicPositiveYSum = fMaximumY;
double fLogicNegativeYSum = 0.0;
- if( !::rtl::math::isNan( fMinimumY ) )
+ if( !std::isnan( fMinimumY ) )
fLogicNegativeYSum = fMinimumY;
if( pPosHelper->isPercentY() )
@@ -646,7 +646,7 @@ void BarChart::createShapes()
//collect data point information (logic coordinates, style ):
double fUnscaledLogicX = pSeries->getXValue( nPointIndex );
fUnscaledLogicX = DateHelper::RasterizeDateValue( fUnscaledLogicX, m_aNullDate, m_nTimeResolution );
- if(rtl::math::isNan(fUnscaledLogicX))
+ if(std::isnan(fUnscaledLogicX))
continue;//point not visible
if(fUnscaledLogicX<pPosHelper->getLogicMinX())
continue;//point not visible
@@ -657,7 +657,7 @@ void BarChart::createShapes()
double fLogicX = pPosHelper->getScaledSlotPos( fUnscaledLogicX, fSlotX );
double fLogicBarHeight = pSeries->getYValue( nPointIndex );
- if( ::rtl::math::isNan( fLogicBarHeight )) //no value at this category
+ if( std::isnan( fLogicBarHeight )) //no value at this category
continue;
double fLogicValueForLabeDisplay = fLogicBarHeight;
@@ -867,7 +867,7 @@ void BarChart::createShapes()
if(bHasFillColorMapping)
{
double nPropVal = pSeries->getValueByProperty(nPointIndex, "FillColor");
- if(!rtl::math::isNan(nPropVal))
+ if(!std::isnan(nPropVal))
{
uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
xProps->setPropertyValue("FillColor", uno::Any(static_cast<sal_Int32>(nPropVal)));
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index e664d328901e..395814c576fb 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) || std::isinf(fLogicSize) )
+ if( std::isnan(fLogicSize) || std::isinf(fLogicSize) )
return aRet;
double fMaxSize = m_fMaxLogicBubbleSize;
@@ -224,11 +224,11 @@ void BubbleChart::createShapes()
if( fBubbleSize<0.0 )
continue;
- if( fBubbleSize == 0.0 || ::rtl::math::isNan(fBubbleSize) )
+ if( fBubbleSize == 0.0 || std::isnan(fBubbleSize) )
continue;
- if( ::rtl::math::isNan(fLogicX) || std::isinf(fLogicX)
- || ::rtl::math::isNan(fLogicY) || std::isinf(fLogicY) )
+ if( std::isnan(fLogicX) || std::isinf(fLogicX)
+ || std::isnan(fLogicY) || std::isinf(fLogicY) )
continue;
bool bIsVisible = rPosHelper.isLogicVisible(fLogicX, fLogicY, fLogicZ);
@@ -282,7 +282,7 @@ void BubbleChart::createShapes()
if(bHasFillColorMapping)
{
double nPropVal = pSeries->getValueByProperty(nIndex, "FillColor");
- if(!rtl::math::isNan(nPropVal))
+ if(!std::isnan(nPropVal))
{
uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
xProps->setPropertyValue("FillColor", uno::Any(static_cast<sal_Int32>(nPropVal)));
@@ -291,7 +291,7 @@ void BubbleChart::createShapes()
if(bHasBorderColorMapping)
{
double nPropVal = pSeries->getValueByProperty(nIndex, "LineColor");
- if(!rtl::math::isNan(nPropVal))
+ if(!std::isnan(nPropVal))
{
uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW );
xProps->setPropertyValue("LineColor", uno::Any(static_cast<sal_Int32>(nPropVal)));
diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx
index 66839280340a..3fea8f9ac403 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) && !std::isinf(fAdd) )
+ if( !std::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) || std::isinf(fLogicY) ) )
+ if( m_bArea && ( std::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) || std::isinf(fLogicX)
- || ::rtl::math::isNan(fLogicY) || std::isinf(fLogicY)
- || ::rtl::math::isNan(fLogicZ) || std::isinf(fLogicZ) )
+ if( std::isnan(fLogicX) || std::isinf(fLogicX)
+ || std::isnan(fLogicY) || std::isinf(fLogicY)
+ || std::isnan(fLogicZ) || std::isinf(fLogicZ) )
{
if( pSeries->getMissingValueTreatment() == css::chart::MissingValueTreatment::LEAVE_GAP )
{
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 94037cdc2272..0214d0f6a0eb 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -399,7 +399,7 @@ double PieChart::getMinimumX()
}
double PieChart::getMaxOffset()
{
- if (!::rtl::math::isNan(m_fMaxOffset))
+ if (!std::isnan(m_fMaxOffset))
// Value already cached. Use it.
return m_fMaxOffset;
@@ -592,7 +592,7 @@ void PieChart::createShapes()
{
//@todo warn somehow that negative values are treated as positive
}
- if( ::rtl::math::isNan(fY) )
+ if( std::isnan(fY) )
continue;
aParam.mfLogicYSum += fabs(fY);
}
@@ -624,7 +624,7 @@ void PieChart::createShapes()
uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShape(pSeries, xSeriesTarget);
///collect data point information (logic coordinates, style ):
double fLogicYValue = fabs(pSeries->getYValue( nPointIndex ));
- if( ::rtl::math::isNan(fLogicYValue) )
+ if( std::isnan(fLogicYValue) )
continue;
if(fLogicYValue==0.0)//@todo: continue also if the resolution is too small
continue;
@@ -678,7 +678,7 @@ void PieChart::createShapes()
if(bHasFillColorMapping)
{
double nPropVal = pSeries->getValueByProperty(nPointIndex, "FillColor");
- if(!rtl::math::isNan(nPropVal))
+ if(!std::isnan(nPropVal))
{
uno::Reference< beans::XPropertySet > xProps( xPointShape, uno::UNO_QUERY_THROW );
xProps->setPropertyValue("FillColor", uno::Any(static_cast<sal_Int32>( nPropVal)));
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 27c5fe29ee6b..492dcc8a00da 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -842,8 +842,8 @@ double lcl_getErrorBarLogicLength(
: OUString("NegativeError") ) >>= fPercent )
{
if( nIndex >=0 && nIndex < rData.getLength() &&
- ! ::rtl::math::isNan( rData[nIndex] ) &&
- ! ::rtl::math::isNan( fPercent ))
+ ! std::isnan( rData[nIndex] ) &&
+ ! std::isnan( fPercent ))
{
fResult = rData[nIndex] * fPercent / 100.0;
}
@@ -1427,9 +1427,9 @@ void VSeriesPlotter::createRegressionCurvesShapes( VDataSeries const & rVDataSer
if(!bAverageLine)
m_pPosHelper->doLogicScaling( &fLogicX, &fLogicY, &fLogicZ );
- if(!rtl::math::isNan(fLogicX) && !std::isinf(fLogicX) &&
- !rtl::math::isNan(fLogicY) && !std::isinf(fLogicY) &&
- !rtl::math::isNan(fLogicZ) && !std::isinf(fLogicZ) )
+ if(!std::isnan(fLogicX) && !std::isinf(fLogicX) &&
+ !std::isnan(fLogicY) && !std::isinf(fLogicY) &&
+ !std::isnan(fLogicZ) && !std::isinf(fLogicZ) )
{
aRegressionPoly.SequenceX[0][nRealPointCount] = fLogicX;
aRegressionPoly.SequenceY[0][nRealPointCount] = fLogicY;
@@ -1661,7 +1661,7 @@ long VSeriesPlotter::calculateTimeResolutionOnXAxis()
std::vector<double>::const_iterator aIt = rDateCategories.begin(), aEnd = rDateCategories.end();
- aIt = std::find_if(aIt, aEnd, [](const double& rDateCategory) { return !rtl::math::isNan(rDateCategory); });
+ aIt = std::find_if(aIt, aEnd, [](const double& rDateCategory) { return !std::isnan(rDateCategory); });
if (aIt == aEnd)
return nRet;
@@ -1673,7 +1673,7 @@ long VSeriesPlotter::calculateTimeResolutionOnXAxis()
++aIt;
for(;aIt!=aEnd;++aIt)
{
- if (rtl::math::isNan(*aIt))
+ if (std::isnan(*aIt))
continue;
Date aCurrent(aNullDate); aCurrent.AddDays(rtl::math::approxFloor(*aIt));
@@ -1836,9 +1836,9 @@ void VSeriesPlotter::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximu
{
double fLocalMinimum, fLocalMaximum;
XSlot.getMinimumAndMaximiumX( fLocalMinimum, fLocalMaximum );
- if( !::rtl::math::isNan(fLocalMinimum) && fLocalMinimum< rfMinimum )
+ if( !std::isnan(fLocalMinimum) && fLocalMinimum< rfMinimum )
rfMinimum = fLocalMinimum;
- if( !::rtl::math::isNan(fLocalMaximum) && fLocalMaximum> rfMaximum )
+ if( !std::isnan(fLocalMaximum) && fLocalMaximum> rfMaximum )
rfMaximum = fLocalMaximum;
}
}
@@ -1859,9 +1859,9 @@ void VSeriesPlotter::getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, d
{
double fLocalMinimum, fLocalMaximum;
XSlot.getMinimumAndMaximiumYInContinuousXRange( fLocalMinimum, fLocalMaximum, fMinX, fMaxX, nAxisIndex );
- if( !::rtl::math::isNan(fLocalMinimum) && fLocalMinimum< rfMinY )
+ if( !std::isnan(fLocalMinimum) && fLocalMinimum< rfMinY )
rfMinY = fLocalMinimum;
- if( !::rtl::math::isNan(fLocalMaximum) && fLocalMaximum> rfMaxY )
+ if( !std::isnan(fLocalMaximum) && fLocalMaximum> rfMaxY )
rfMaxY = fLocalMaximum;
}
}
@@ -1945,7 +1945,7 @@ void VDataSeriesGroup::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaxi
for(sal_Int32 nN=0;nN<nPointCount;nN++)
{
double fX = pSeries->getXValue( nN );
- if( ::rtl::math::isNan(fX) )
+ if( std::isnan(fX) )
continue;
if(rfMaximum<fX)
rfMaximum=fX;
@@ -2114,7 +2114,7 @@ void VDataSeriesGroup::getMinimumAndMaximiumYInContinuousXRange(
continue;
double fX = pSeries->getXValue(i);
- if (rtl::math::isNan(fX))
+ if (std::isnan(fX))
continue;
if (fX < fMinX || fX > fMaxX)
@@ -2122,7 +2122,7 @@ void VDataSeriesGroup::getMinimumAndMaximiumYInContinuousXRange(
continue;
double fY = pSeries->getYValue(i);
- if (::rtl::math::isNan(fY))
+ if (std::isnan(fY))
continue;
aRangeCalc.setValue(fX, fY);
@@ -2174,21 +2174,21 @@ void VDataSeriesGroup::calculateYMinAndMaxForCategory( sal_Int32 nCategoryIndex
if( fValueMaxY >= 0 )
{
- if( ::rtl::math::isNan( fPositiveSum ) )
+ if( std::isnan( fPositiveSum ) )
fPositiveSum = fFirstPositiveY = fValueMaxY;
else
fPositiveSum += fValueMaxY;
}
if( fValueMinY < 0 )
{
- if(::rtl::math::isNan( fNegativeSum ))
+ if(std::isnan( fNegativeSum ))
fNegativeSum = fFirstNegativeY = fValueMinY;
else
fNegativeSum += fValueMinY;
}
}
- rfMinimumY = ::rtl::math::isNan( fNegativeSum ) ? fFirstPositiveY : fNegativeSum;
- rfMaximumY = ::rtl::math::isNan( fPositiveSum ) ? fFirstNegativeY : fPositiveSum;
+ rfMinimumY = std::isnan( fNegativeSum ) ? fFirstPositiveY : fNegativeSum;
+ rfMaximumY = std::isnan( fPositiveSum ) ? fFirstNegativeY : fPositiveSum;
}
else
{
@@ -2200,7 +2200,7 @@ void VDataSeriesGroup::calculateYMinAndMaxForCategory( sal_Int32 nCategoryIndex
double fValueMinY = pSeries->getMinimumofAllDifferentYValues( nCategoryIndex );
double fValueMaxY = pSeries->getMaximumofAllDifferentYValues( nCategoryIndex );
- if( ::rtl::math::isNan( fTotalSum ) )
+ if( std::isnan( fTotalSum ) )
{
rfMinimumY = fValueMinY;
rfMaximumY = fTotalSum = fValueMaxY;
diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx
index c5cd481d7b44..6479668c67ef 100644
--- a/chart2/source/view/main/PlotterBase.cxx
+++ b/chart2/source/view/main/PlotterBase.cxx
@@ -95,11 +95,11 @@ uno::Reference< drawing::XShapes > PlotterBase::createGroupShape(
bool PlotterBase::isValidPosition( const drawing::Position3D& rPos )
{
- if( ::rtl::math::isNan(rPos.PositionX) )
+ if( std::isnan(rPos.PositionX) )
return false;
- if( ::rtl::math::isNan(rPos.PositionY) )
+ if( std::isnan(rPos.PositionY) )
return false;
- if( ::rtl::math::isNan(rPos.PositionZ) )
+ if( std::isnan(rPos.PositionZ) )
return false;
if( std::isinf(rPos.PositionX) )
return false;
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 8b3a9c18b9a0..b6c4adc013fa 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -116,7 +116,7 @@ void lcl_clearIfNoValuesButTextIsContained( VDataSequence& rData, const uno::Ref
sal_Int32 nCount = rData.Doubles.getLength();
for( sal_Int32 i = 0; i < nCount; ++i )
{
- if( !::rtl::math::isNan( rData.Doubles[i] ) )
+ if( !std::isnan( rData.Doubles[i] ) )
return;
}
//no double value is contained
@@ -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) || std::isinf(rfValue)) )
+ && (std::isnan(rfValue) || std::isinf(rfValue)) )
rfValue = 0.0;
}
@@ -501,7 +501,7 @@ void VDataSeries::getMinMaxXValue(double& fMin, double& fMax) const
if(aValuesX.hasElements())
{
sal_Int32 i = 0;
- while ( i < aValuesX.getLength() && ::rtl::math::isNan(aValuesX[i]) )
+ while ( i < aValuesX.getLength() && std::isnan(aValuesX[i]) )
i++;
if ( i < aValuesX.getLength() )
fMax = fMin = aValuesX[i++];
@@ -770,7 +770,7 @@ uno::Sequence< double > const & VDataSeries::getAllY() const
double VDataSeries::getXMeanValue() const
{
- if( ::rtl::math::isNan( m_fXMeanValue ) )
+ if( std::isnan( m_fXMeanValue ) )
{
uno::Reference< XRegressionCurveCalculator > xCalculator( RegressionCurveHelper::createRegressionCurveCalculatorByServiceName( "com.sun.star.chart2.MeanValueRegressionCurve" ) );
uno::Sequence< double > aXValuesDummy;
@@ -782,7 +782,7 @@ double VDataSeries::getXMeanValue() const
double VDataSeries::getYMeanValue() const
{
- if( ::rtl::math::isNan( m_fYMeanValue ) )
+ if( std::isnan( m_fYMeanValue ) )
{
uno::Reference< XRegressionCurveCalculator > xCalculator(
RegressionCurveHelper::createRegressionCurveCalculatorByServiceName("com.sun.star.chart2.MeanValueRegressionCurve"));