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/source/filter/inc | |
| parent | perf: eliminate SfxSimpleHint and move to SfxHint, tdf#87101 related (diff) | |
| download | core-3e22dfa5eb1ccebdc719a671d23bde7ccab256fb.tar.gz core-3e22dfa5eb1ccebdc719a671d23bde7ccab256fb.zip | |
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/source/filter/inc')
| -rw-r--r-- | sc/source/filter/inc/scflt.hxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/inc/xihelper.hxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/inc/xltools.hxx | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index 164fc56689c5..b315bfc32adb 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -602,7 +602,7 @@ public: class Sc10FontCollection : public ScCollection { protected: - sal_uLong nError; + sal_uLong nError; public: Sc10FontCollection( SvStream& rStream ); sal_uLong GetError() { return nError; } @@ -761,7 +761,7 @@ class Sc10Import Sc10NameCollection* pNameCollection; Sc10PatternCollection* pPatternCollection; Sc10DataBaseCollection* pDataBaseCollection; - sal_uLong nError; + sal_uLong nError; SCTAB nShowTab; ScViewOptions aSc30ViewOpt; ScfStreamProgressBar* pPrgrsBar; @@ -770,7 +770,7 @@ public: Sc10Import( SvStream& rStr, ScDocument* pDocument ); ~Sc10Import(); - sal_uLong Import(); + sal_uLong Import(); void LoadFileHeader(); void LoadFileInfo(); void LoadEditStateInfo(); diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index 0cd1583613a3..6677eeb4b718 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -321,7 +321,7 @@ public: /** Returns the cached Calc error code, if this value has Error type, else 0. */ inline sal_uInt8 GetXclError() const { return (mnType == EXC_CACHEDVAL_ERROR) ? mnBoolErr : EXC_ERR_NA; } /** Returns the cached Calc error code, if this value has Error type, else 0. */ - sal_uInt16 GetScError() const; + FormulaError GetScError() const; protected: typedef ::std::unique_ptr< const ScTokenArray > ScTokenArrayPtr; diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index 89d8531bf116..7ca6e2927f34 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -24,6 +24,7 @@ #include "ftools.hxx" class SfxObjectShell; +enum class FormulaError : sal_uInt16; // BIFF versions ============================================================== @@ -115,9 +116,9 @@ public: static sal_uInt8 GetXclOrientFromRot( sal_uInt16 nXclRot ); /** Converts a Calc error code to an Excel error code. */ - static sal_uInt8 GetXclErrorCode( sal_uInt16 nScError ); + static sal_uInt8 GetXclErrorCode( FormulaError nScError ); /** Converts an Excel error code to a Calc error code. */ - static sal_uInt16 GetScErrorCode( sal_uInt8 nXclError ); + static FormulaError GetScErrorCode( sal_uInt8 nXclError ); /** Converts the passed BIFF error to a double containing the respective Calc error code. */ static double ErrorToDouble( sal_uInt8 nXclError ); |