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/qa/extras/chart2import.cxx | |
| 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/qa/extras/chart2import.cxx')
| -rw-r--r-- | chart2/qa/extras/chart2import.cxx | 24 |
1 files changed, 12 insertions, 12 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() |