From 3e22dfa5eb1ccebdc719a671d23bde7ccab256fb Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 14 Sep 2016 15:22:20 +0200 Subject: convert formula error codes to scoped enum Change-Id: I5ff214bf1ec9031e30344bc125bc99916fd11bfb Reviewed-on: https://gerrit.libreoffice.org/28897 Reviewed-by: Eike Rathke Tested-by: Eike Rathke --- sc/qa/unit/ucalc.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sc/qa/unit/ucalc.cxx') diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 7e8654f3ea0e..0db6a1c270be 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -900,12 +900,12 @@ void Test::testValueIterator() bool bHas = false; size_t nCheckPos = 0; double fVal; - sal_uInt16 nErr; + FormulaError nErr; for (bHas = aIter.GetFirst(fVal, nErr); bHas; bHas = aIter.GetNext(fVal, nErr), ++nCheckPos) { CPPUNIT_ASSERT_MESSAGE("Iteration longer than expected.", nCheckPos < nCheckLen); CPPUNIT_ASSERT_EQUAL(aChecks[nCheckPos], fVal); - CPPUNIT_ASSERT_EQUAL(static_cast(0), nErr); + CPPUNIT_ASSERT_EQUAL(0, (int)nErr); } } @@ -5776,8 +5776,8 @@ void Test::testFormulaWizardSubformula() m_pDoc->SetString(ScAddress(1,2,0), "=gibberish"); // B3 ScSimpleFormulaCalculator aFCell1( m_pDoc, ScAddress(0,0,0), "=B1:B3", true ); - sal_uInt16 nErrCode = aFCell1.GetErrCode(); - CPPUNIT_ASSERT( nErrCode == 0 || aFCell1.IsMatrix() ); + FormulaError nErrCode = aFCell1.GetErrCode(); + CPPUNIT_ASSERT( nErrCode == FormulaError::NONE || aFCell1.IsMatrix() ); CPPUNIT_ASSERT_EQUAL( OUString("{1;#DIV/0!;#NAME?}"), aFCell1.GetString().getString() ); m_pDoc->SetString(ScAddress(1,0,0), "=NA()"); // B1 @@ -5785,7 +5785,7 @@ void Test::testFormulaWizardSubformula() m_pDoc->SetString(ScAddress(1,2,0), "=1+2"); // B3 ScSimpleFormulaCalculator aFCell2( m_pDoc, ScAddress(0,0,0), "=B1:B3", true ); nErrCode = aFCell2.GetErrCode(); - CPPUNIT_ASSERT( nErrCode == 0 || aFCell2.IsMatrix() ); + CPPUNIT_ASSERT( nErrCode == FormulaError::NONE || aFCell2.IsMatrix() ); CPPUNIT_ASSERT_EQUAL( OUString("{#N/A;2;3}"), aFCell2.GetString().getString() ); m_pDoc->DeleteTab(0); -- cgit v1.2.3