From fa507ae23e1e5e0dd73fe881284bfb41a2eb1315 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Tue, 3 May 2016 21:22:28 -0400 Subject: Replace namespace ScErrorCodes with formula... and remove that 'using namespace' statement in the header... Change-Id: I2f994af5088ce6d1ffe92c8d36285a4f6fdd2248 Reviewed-on: https://gerrit.libreoffice.org/24628 Tested-by: Jenkins Reviewed-by: Kohei Yoshida --- sc/source/ui/unoobj/cellsuno.cxx | 2 +- sc/source/ui/unoobj/funcuno.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sc/source/ui/unoobj') diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index fcc1266e88d5..9b04fb1b45ae 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -1147,7 +1147,7 @@ static bool lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange, case uno::TypeClass_VOID: { // void = "no value" - rDoc.SetError( nDocCol, nDocRow, nTab, NOTAVAILABLE ); + rDoc.SetError( nDocCol, nDocRow, nTab, formula::NOTAVAILABLE ); } break; diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 0ec86590bee2..c5cb6d2a4791 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -621,7 +621,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, // if there is no matrix result const ScMatrix* pMat = (mbArray && pFormula) ? pFormula->GetMatrix() : nullptr; - sal_uInt16 nErrCode = pFormula ? pFormula->GetErrCode() : errIllegalArgument; + sal_uInt16 nErrCode = pFormula ? pFormula->GetErrCode() : formula::errIllegalArgument; if ( nErrCode == 0 ) { if ( pMat ) @@ -641,7 +641,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, aRet <<= aStrVal; } } - else if ( nErrCode == NOTAVAILABLE ) + else if ( nErrCode == formula::NOTAVAILABLE ) { // #N/A: leave result empty, no exception } -- cgit