diff options
author | Yukio Siraichi <yukio.siraichi@gmail.com> | 2020-03-13 15:41:40 +0900 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-03-14 09:19:00 +0100 |
commit | 3bf3face224a7e12ba95888821a0ac21525af22c (patch) | |
tree | 93908386dd614404e46898ae16ee179549a1a0f9 /chart2/source/view/charttypes | |
parent | 8f8b64cad377c6d767cdf291fd00225658bd02c5 (diff) |
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/source/view/charttypes')
-rw-r--r-- | chart2/source/view/charttypes/AreaChart.cxx | 10 | ||||
-rw-r--r-- | chart2/source/view/charttypes/BarChart.cxx | 14 | ||||
-rw-r--r-- | chart2/source/view/charttypes/BubbleChart.cxx | 12 | ||||
-rw-r--r-- | chart2/source/view/charttypes/NetChart.cxx | 10 | ||||
-rw-r--r-- | chart2/source/view/charttypes/PieChart.cxx | 8 | ||||
-rw-r--r-- | chart2/source/view/charttypes/VSeriesPlotter.cxx | 38 |
6 files changed, 46 insertions, 46 deletions
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; |