diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-09 08:52:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-21 08:42:30 +0200 |
| commit | 528632660b72b105345945c13c5b68060d94a91b (patch) | |
| tree | 860508d482959abeb9175f0ce6b9e65954269f95 /sd/inc | |
| parent | aee66aa85e75f67135e5c6079a281e18402d261a (diff) | |
convert ErrCode to strong typedef
would have preferred to re-use o3tl::strong_int, of which this
is a modified copy, but there are lots of convenience accessors
which are nice to define on the class.
Change-Id: I301b807aaf02fbced3bf75de1e1692cde6c0340a
Reviewed-on: https://gerrit.libreoffice.org/38497
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/inc')
| -rw-r--r-- | sd/inc/sderror.hxx | 15 | ||||
| -rw-r--r-- | sd/inc/sdgrffilter.hxx | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/sd/inc/sderror.hxx b/sd/inc/sderror.hxx index 009bb9f35d57..4f52035a13c0 100644 --- a/sd/inc/sderror.hxx +++ b/sd/inc/sderror.hxx @@ -31,21 +31,12 @@ #define WARN_SD_WRITE_BASE (WARN_SD_BASE | ERRCODE_CLASS_WRITE ) // Import errors -#define ERR_FORMAT_ROWCOL (ERROR_SD_READ_BASE | 1) -#define ERR_FORMAT_FILE_ROWCOL (ERROR_SD_READ_BASE | 2) +#define ERR_FORMAT_ROWCOL ErrCode(ERROR_SD_READ_BASE | 1) +#define ERR_FORMAT_FILE_ROWCOL ErrCode(ERROR_SD_READ_BASE | 2) // ----- Warnings --------------------------- -#define WARN_FORMAT_FILE_ROWCOL (WARN_SD_READ_BASE | 100) - -#ifndef __RSC - -inline bool IsWarning( sal_uLong nErr ) -{ - return 0 != ( nErr & ERRCODE_WARNING_MASK ); -} - -#endif +#define WARN_FORMAT_FILE_ROWCOL ErrCode(WARN_SD_READ_BASE | 100) #endif diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx index a64896d4d4b2..2846914e24cd 100644 --- a/sd/inc/sdgrffilter.hxx +++ b/sd/inc/sdgrffilter.hxx @@ -36,7 +36,7 @@ public: bool Import(); bool Export() override; - static void HandleGraphicFilterError( ErrCode nFilterError, sal_uLong nStreamError ); + static void HandleGraphicFilterError( ErrCode nFilterError, ErrCode nStreamError ); }; #endif // INCLUDED_SD_INC_SDGRFFILTER_HXX |