diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-15 08:40:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-15 09:48:11 +0200 |
| commit | 7aee0ea7c5a780bca5193382b6f73599c2f025eb (patch) | |
| tree | c6f7c110b53a5460a10ee1145e95f19ce08be27e /include | |
| parent | 5ea13cb3b9ec19fe2d88f91585f433c81e6b1f2e (diff) | |
replace SbxError typedef with ErrCode
part of a larger patch to convert ErrCode to strong_int
Change-Id: Ia56e5d6d8c4217d6f258e2113d20ce737977892f
Reviewed-on: https://gerrit.libreoffice.org/38813
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/basic/sberrors.hxx | 2 | ||||
| -rw-r--r-- | include/basic/sbxcore.hxx | 4 | ||||
| -rw-r--r-- | include/basic/sbxdef.hxx | 3 | ||||
| -rw-r--r-- | include/basic/sbxvar.hxx | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/include/basic/sberrors.hxx b/include/basic/sberrors.hxx index 52dc1256835a..95ccfa1c6cc3 100644 --- a/include/basic/sberrors.hxx +++ b/include/basic/sberrors.hxx @@ -22,7 +22,7 @@ #include <basic/sbxdef.hxx> -// Mapping to SbxError +// Mapping to ErrCode #define ERRCODE_BASIC_SYNTAX ERRCODE_SBX_SYNTAX // unspecified syntax error #define ERRCODE_BASIC_BAD_ARGUMENT ERRCODE_SBX_NOTIMP // Invalid procedure call #define ERRCODE_BASIC_MATH_OVERFLOW ERRCODE_SBX_OVERFLOW // Overflow diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx index afa7e393f56c..3c1c48fdd9c5 100644 --- a/include/basic/sbxcore.hxx +++ b/include/basic/sbxcore.hxx @@ -80,8 +80,8 @@ public: bool Store( SvStream& ); virtual bool LoadCompleted(); - static SbxError GetError(); - static void SetError( SbxError ); + static ErrCode GetError(); + static void SetError( ErrCode ); static bool IsError(); static void ResetError(); diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx index 9008702ac5a2..973a472640fa 100644 --- a/include/basic/sbxdef.hxx +++ b/include/basic/sbxdef.hxx @@ -124,9 +124,6 @@ enum class SbxNameType { // Type of the questioned name of a variable ShortTypes, // Name%(A%,B$) }; -// from 1996/3/20: New error messages -typedef sal_uIntPtr SbxError; // Preserve old type - #endif diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index 5645a6cb409f..516d0d936516 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -166,7 +166,7 @@ public: void fillAutomationDecimal( css::bridge::oleautomation::Decimal& rAutomationDec ) const; bool PutCurrency( sal_Int64 ); // Interface for CDbl in Basic - static SbxError ScanNumIntnl( const OUString& rSrc, double& nVal, bool bSingle = false ); + static ErrCode ScanNumIntnl( const OUString& rSrc, double& nVal, bool bSingle = false ); bool PutObject( SbxBase* ); |