diff options
author | Noel Grandin <noel@peralex.com> | 2016-09-14 15:22:20 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2016-09-23 15:22:38 +0000 |
commit | 3e22dfa5eb1ccebdc719a671d23bde7ccab256fb (patch) | |
tree | c3890b2a33cc298ad786c50a9d5879531fc6afc4 /sc/inc/table.hxx | |
parent | 7d8196ea2f4ec3634dbad7367345e62c4ea9893d (diff) |
convert formula error codes to scoped enum
Change-Id: I5ff214bf1ec9031e30344bc125bc99916fd11bfb
Reviewed-on: https://gerrit.libreoffice.org/28897
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/inc/table.hxx')
-rw-r--r-- | sc/inc/table.hxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 8e35256f48c0..d987071274a5 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -34,6 +34,7 @@ #include "cellvalue.hxx" #include <formula/types.hxx> #include "calcmacros.hxx" +#include "formula/errorcodes.hxx" #include <set> #include <map> @@ -362,7 +363,7 @@ public: void SetValue( SCCOL nCol, SCROW nRow, const double& rVal ); void SetValues( SCCOL nCol, SCROW nRow, const std::vector<double>& rVals ); - void SetError( SCCOL nCol, SCROW nRow, sal_uInt16 nError); + void SetError( SCCOL nCol, SCROW nRow, FormulaError nError); SCSIZE GetPatternCount( SCCOL nCol ) const; SCSIZE GetPatternCount( SCCOL nCol, SCROW nRow1, SCROW nRow2 ) const; bool ReservePatternCount( SCCOL nCol, SCSIZE nReserve ); @@ -522,11 +523,11 @@ public: bool HasStringCells( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) const; - sal_uInt16 GetErrCode( const ScAddress& rPos ) const + FormulaError GetErrCode( const ScAddress& rPos ) const { return ValidColRow(rPos.Col(),rPos.Row()) ? aCol[rPos.Col()].GetErrCode( rPos.Row() ) : - 0; + FormulaError::NONE; } void ResetChanged( const ScRange& rRange ); @@ -549,7 +550,7 @@ public: position broadcasted. */ bool BroadcastBroadcasters( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScHint& rHint ); - bool CompileErrorCells( sc::CompileFormulaContext& rCxt, sal_uInt16 nErrCode ); + bool CompileErrorCells( sc::CompileFormulaContext& rCxt, FormulaError nErrCode ); void UpdateReference( sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc = nullptr, |