diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-08-21 07:14:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-21 10:30:14 +0200 |
| commit | 25f65b23840a424991027067ae48d0a1de682380 (patch) | |
| tree | f699118beae4c796d41d94c1fca27219893b6799 /sw/inc/swerror.h | |
| parent | 7766135f1ca11f942eb5b9ccc7828d55acfbe28f (diff) | |
remove dead sw error codes
and inline some macros
Change-Id: Ida8db46bec4fcec46a779da0180fe3bf1a1af59d
Reviewed-on: https://gerrit.libreoffice.org/41375
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/inc/swerror.h')
| -rw-r--r-- | sw/inc/swerror.h | 81 |
1 files changed, 21 insertions, 60 deletions
diff --git a/sw/inc/swerror.h b/sw/inc/swerror.h index 4ecd4ac21f56..a4094786be30 100644 --- a/sw/inc/swerror.h +++ b/sw/inc/swerror.h @@ -22,66 +22,27 @@ #include <vcl/errcode.hxx> -#define ERROR_SW_READ_BASE (ERRCODE_AREA_SW | ERRCODE_CLASS_READ) -#define ERROR_SW_WRITE_BASE (ERRCODE_AREA_SW | ERRCODE_CLASS_WRITE) - -#define WARN_SW_BASE (ERRCODE_AREA_SW | ERRCODE_WARNING_MASK) -#define WARN_SW_READ_BASE (WARN_SW_BASE | ERRCODE_CLASS_READ ) -#define WARN_SW_WRITE_BASE (WARN_SW_BASE | ERRCODE_CLASS_WRITE ) - - -// Import Errors -#define ERR_SWG_FILE_FORMAT_ERROR ErrCode(ERROR_SW_READ_BASE | 1 ) -#define ERR_SWG_READ_ERROR ErrCode(ERROR_SW_READ_BASE | 2 ) - -#define ERR_SW6_INPUT_FILE ErrCode(ERROR_SW_READ_BASE | 4 ) -#define ERR_SW6_NOWRITER_FILE ErrCode(ERROR_SW_READ_BASE | 5 ) -#define ERR_SW6_UNEXPECTED_EOF ErrCode(ERROR_SW_READ_BASE | 6 ) -#define ERR_SW6_PASSWD ErrCode(ERROR_SW_READ_BASE | 7 ) - -#define ERR_WW6_NO_WW6_FILE_ERR ErrCode(ERROR_SW_READ_BASE | 8 ) -#define ERR_WW6_FASTSAVE_ERR ErrCode(ERROR_SW_READ_BASE | 9 ) - -#define ERR_FORMAT_ROWCOL ErrCode(ERROR_SW_READ_BASE | 12) - -#define ERR_SWG_NEW_VERSION ErrCode(ERROR_SW_READ_BASE | 13) -#define ERR_WW8_NO_WW8_FILE_ERR ErrCode(ERROR_SW_READ_BASE | 14) - -#define ERR_FORMAT_FILE_ROWCOL ErrCode(ERROR_SW_READ_BASE | 15) - -// Export errors -#define ERR_SWG_WRITE_ERROR ErrCode(ERROR_SW_WRITE_BASE | 30 ) -#define ERR_SWG_OLD_GLOSSARY ErrCode(ERROR_SW_WRITE_BASE | 31 ) -#define ERR_WRITE_ERROR_FILE ErrCode(ERROR_SW_WRITE_BASE | 35 ) - -// Import/Export errors -#define ERR_SWG_INTERNAL_ERROR ErrCode(ERRCODE_AREA_SW | 50 ) - -#define ERR_TXTBLOCK_NEWFILE_ERROR ErrCode(ERRCODE_AREA_SW|ERRCODE_CLASS_LOCKING | 55 ) - -// other errors and errorclasses -#define ERR_AUTOPATH_ERROR ErrCode(ERRCODE_AREA_SW|ERRCODE_CLASS_PATH | 55 ) -#define ERR_TBLSPLIT_ERROR ErrCode(ERRCODE_AREA_SW|ERRCODE_CLASS_NONE| 56 ) -#define ERR_TBLINSCOL_ERROR ErrCode(ERRCODE_AREA_SW|ERRCODE_CLASS_NONE| 57 ) -#define ERR_TBLDDECHG_ERROR ErrCode(ERRCODE_AREA_SW|ERRCODE_CLASS_NONE| 58 ) - -// Import - Warnings -#define WARN_SWG_NO_DRAWINGS ErrCode(WARN_SW_READ_BASE | 70 ) -#define WARN_WW6_FASTSAVE_ERR ErrCode(WARN_SW_READ_BASE | 71 ) -// continued below - -// Import & Export - Warnings -#define WARN_SWG_FEATURES_LOST ErrCode(WARN_SW_BASE | 72 ) -#define WARN_SWG_OLE ErrCode(WARN_SW_BASE | 73 ) -#define WARN_SWG_POOR_LOAD (WARN_SW_BASE | 74 ) - -// Export warnings -#define WARN_SWG_HTML_NO_MACROS ErrCode(WARN_SW_WRITE_BASE |75) -#define WARN_WRITE_ERROR_FILE ErrCode(WARN_SW_WRITE_BASE |76) - -// More Import & Export - Warnings -#define WARN_FORMAT_FILE_ROWCOL ErrCode(WARN_SW_READ_BASE | 77) - +// Import & Export +#define ERR_SWG_FILE_FORMAT_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_READ | 1 ) +#define ERR_SWG_READ_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_READ | 2 ) +#define ERR_WW6_NO_WW6_FILE_ERR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_READ | 8 ) +#define ERR_FORMAT_ROWCOL ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_READ | 12) +#define ERR_WW8_NO_WW8_FILE_ERR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_READ | 14) +#define ERR_FORMAT_FILE_ROWCOL ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_READ | 15) +#define ERR_SWG_WRITE_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_WRITE | 30 ) +#define ERR_SWG_OLD_GLOSSARY ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_WRITE | 31 ) +#define ERR_WRITE_ERROR_FILE ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_WRITE | 35 ) +#define ERR_SWG_INTERNAL_ERROR ErrCode(ERRCODE_AREA_SW | 50 ) +#define ERR_TXTBLOCK_NEWFILE_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_LOCKING | 55 ) +#define ERR_AUTOPATH_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_PATH | 55 ) +#define ERR_TBLSPLIT_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_NONE | 56 ) +#define ERR_TBLINSCOL_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_NONE | 57 ) +#define ERR_TBLDDECHG_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_NONE | 58 ) +#define WARN_SWG_FEATURES_LOST ErrCode(ERRCODE_AREA_SW | ERRCODE_WARNING_MASK | 72 ) +#define WARN_SWG_POOR_LOAD ErrCode(ERRCODE_AREA_SW | ERRCODE_WARNING_MASK | ERRCODE_CLASS_WRITE | 74 ) +#define WARN_SWG_HTML_NO_MACROS ErrCode(ERRCODE_AREA_SW | ERRCODE_WARNING_MASK | ERRCODE_CLASS_WRITE | 75) +#define WARN_WRITE_ERROR_FILE ErrCode(ERRCODE_AREA_SW | ERRCODE_WARNING_MASK | ERRCODE_CLASS_WRITE | 76) +#define WARN_FORMAT_FILE_ROWCOL ErrCode(ERRCODE_AREA_SW | ERRCODE_WARNING_MASK | ERRCODE_CLASS_READ | 77) #endif |