diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-11 16:10:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-13 06:29:34 +0000 |
| commit | 7d902940508decad933c19bc97e5409873ab5189 (patch) | |
| tree | 18fd3ed9420a4127db377bcd2201a3627ef72135 /include | |
| parent | c2f912b51efa458ba9bd1601a8676ab119aca1bd (diff) | |
convert EXCEPTION_ to scoped enum
- simplify VCLExceptionSignal_impl
- drop "minor" part of error code, nobody passes it in, and nobody
checks it
- rename Display to UserInterface, to prevent -Werror=shadow
Change-Id: I503fd8a50ded30d59c30fb388796f6b1a0c058de
Reviewed-on: https://gerrit.libreoffice.org/24892
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/exceptiontypes.hxx | 8 | ||||
| -rw-r--r-- | include/vcl/svapp.hxx | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/include/vcl/exceptiontypes.hxx b/include/vcl/exceptiontypes.hxx index bdf044a47edd..bde3f5f5f91d 100644 --- a/include/vcl/exceptiontypes.hxx +++ b/include/vcl/exceptiontypes.hxx @@ -20,11 +20,9 @@ #ifndef INCLUDED_VCL_EXCEPTIONTYPES_HXX #define INCLUDED_VCL_EXCEPTIONTYPES_HXX -#define EXCEPTION_RESOURCENOTLOADED ((sal_uInt16)0x0100) -#define EXCEPTION_SYSTEM ((sal_uInt16)0x0300) -#define EXCEPTION_DISPLAY ((sal_uInt16)0x0400) -#define EXCEPTION_MAJORTYPE ((sal_uInt16)0xFF00) -#define EXCEPTION_MINORTYPE ((sal_uInt16)0x00FF) +enum class ExceptionCategory { + NONE, ResourceNotLoaded, System, UserInterface +}; #endif // INCLUDED_VCL_EXCEPTIONTYPES_HXX diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 639433b01fb2..7d190b9f83fa 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -421,18 +421,13 @@ public: @{ */ - /** Handles an error code. + /** Handles an error. - @remark This is not actually an exception. It merely takes an - error code, then in most cases aborts. The list of exception - identifiers can be found at include/vcl/inputtypes.hxx - each - one starts with EXC_* - - @param nError The error code identifier + @param nCategory The error category, see include/vcl/exceptiontypes.hxx @see Abort */ - virtual void Exception( sal_uInt16 nError ); + virtual void Exception( ExceptionCategory nCategory ); /** Ends the program prematurely with an error message. |