diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-14 14:16:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-15 08:25:22 +0200 |
| commit | 3059ede409bd8136be0397f532b644855bb9d07a (patch) | |
| tree | b36700ce181ea77640a2419228ef1a39dfe475ca /include/basic | |
| parent | 3f20471490c61b19fe4222f8c40df255051f6e3d (diff) | |
drop SbError typedef
in favour of ErrCode.
Part of a larger patch to convert ErrCode to strong_int
Change-Id: Ia846bfc93c58c85c6a6cec79e9d19b9ecbd1c05f
Reviewed-on: https://gerrit.libreoffice.org/38783
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/basic')
| -rw-r--r-- | include/basic/sberrors.hxx | 4 | ||||
| -rw-r--r-- | include/basic/sbstar.hxx | 24 |
2 files changed, 12 insertions, 16 deletions
diff --git a/include/basic/sberrors.hxx b/include/basic/sberrors.hxx index f1e44a977754..52dc1256835a 100644 --- a/include/basic/sberrors.hxx +++ b/include/basic/sberrors.hxx @@ -22,10 +22,6 @@ #include <basic/sbxdef.hxx> -#ifndef __RSC -typedef ErrCode SbError; -#endif - // Mapping to SbxError #define ERRCODE_BASIC_SYNTAX ERRCODE_SBX_SYNTAX // unspecified syntax error #define ERRCODE_BASIC_BAD_ARGUMENT ERRCODE_SBX_NOTIMP // Invalid procedure call diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx index b48334048ef9..c625abc4820f 100644 --- a/include/basic/sbstar.hxx +++ b/include/basic/sbstar.hxx @@ -69,9 +69,9 @@ class BASIC_DLLPUBLIC StarBASIC : public SbxObject BASIC_DLLPRIVATE void implClearDependingVarsOnDelete( StarBASIC* pDeletedBasic ); protected: - bool CError( SbError, const OUString&, sal_Int32, sal_Int32, sal_Int32 ); + bool CError( ErrCode, const OUString&, sal_Int32, sal_Int32, sal_Int32 ); private: - BASIC_DLLPRIVATE bool RTError( SbError, const OUString& rMsg, sal_Int32, sal_Int32, sal_Int32 ); + BASIC_DLLPRIVATE bool RTError( ErrCode, const OUString& rMsg, sal_Int32, sal_Int32, sal_Int32 ); BASIC_DLLPRIVATE BasicDebugFlags BreakPoint( sal_Int32 nLine, sal_Int32 nCol1, sal_Int32 nCol2 ); BASIC_DLLPRIVATE BasicDebugFlags StepPoint( sal_Int32 nLine, sal_Int32 nCol1, sal_Int32 nCol2 ); virtual bool LoadData( SvStream&, sal_uInt16 ) override; @@ -101,12 +101,12 @@ public: SbModule* MakeModule( const OUString& rName, const OUString& rSrc ); SbModule* MakeModule( const OUString& rName, const css::script::ModuleInfo& mInfo, const OUString& rSrc ); static void Stop(); - static void Error( SbError ); - static void Error( SbError, const OUString& rMsg ); - static void FatalError( SbError ); - static void FatalError( SbError, const OUString& rMsg ); + static void Error( ErrCode ); + static void Error( ErrCode, const OUString& rMsg ); + static void FatalError( ErrCode ); + static void FatalError( ErrCode, const OUString& rMsg ); static bool IsRunning(); - static SbError GetErrBasic(); + static ErrCode GetErrBasic(); // #66536 make additional message accessible by RTL function Error static OUString GetErrorMsg(); static sal_Int32 GetErl(); @@ -126,15 +126,15 @@ public: static sal_uInt16 GetLine(); static sal_uInt16 GetCol1(); static sal_uInt16 GetCol2(); - static void SetErrorData( SbError nCode, sal_uInt16 nLine, + static void SetErrorData( ErrCode nCode, sal_uInt16 nLine, sal_uInt16 nCol1, sal_uInt16 nCol2 ); // Specific to error handler - static void MakeErrorText( SbError, const OUString& aMsg ); + static void MakeErrorText( ErrCode, const OUString& aMsg ); static const OUString& GetErrorText(); - static SbError GetErrorCode(); - static sal_uInt16 GetVBErrorCode( SbError nError ); - static SbError GetSfxFromVBError( sal_uInt16 nError ); + static ErrCode GetErrorCode(); + static sal_uInt16 GetVBErrorCode( ErrCode nError ); + static ErrCode GetSfxFromVBError( sal_uInt16 nError ); bool IsBreak() const { return bBreak; } static Link<StarBASIC*,bool> GetGlobalErrorHdl(); |