summaryrefslogtreecommitdiff
path: root/sw/inc/swerror.h
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2017-08-27 13:07:55 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-27 21:24:16 +0200
commitae8e1ad2e322cfa9522f793edc961203e28c1f22 (patch)
treee04c03d53101a78810511f509c81bc1cb186795b /sw/inc/swerror.h
parentd96b243c5d363f66e574fe68879e59244c338c22 (diff)
convert code-class in ErrCode to scoped enum
Change-Id: I9aa8703921308d6fee8bae9ee2d7b29e19181cc7 Reviewed-on: https://gerrit.libreoffice.org/41601 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.h38
1 files changed, 19 insertions, 19 deletions
diff --git a/sw/inc/swerror.h b/sw/inc/swerror.h
index afa2a4ef660a..840542fe8043 100644
--- a/sw/inc/swerror.h
+++ b/sw/inc/swerror.h
@@ -23,26 +23,26 @@
#include <vcl/errcode.hxx>
// Import & Export
-#define ERR_SWG_FILE_FORMAT_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_READ | 1 )
-#define ERR_SWG_READ_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_READ | 2 )
-#define ERR_WW6_NO_WW6_FILE_ERR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_READ | 8 )
-#define ERR_FORMAT_ROWCOL ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_READ | 12)
-#define ERR_WW8_NO_WW8_FILE_ERR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_READ | 14)
-#define ERR_FORMAT_FILE_ROWCOL ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_READ | 15)
-#define ERR_SWG_WRITE_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_WRITE | 30 )
-#define ERR_SWG_OLD_GLOSSARY ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_WRITE | 31 )
-#define ERR_WRITE_ERROR_FILE ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_WRITE | 35 )
+#define ERR_SWG_FILE_FORMAT_ERROR ErrCode(ErrCodeArea::Sw, ErrCodeClass::Read, 1 )
+#define ERR_SWG_READ_ERROR ErrCode(ErrCodeArea::Sw, ErrCodeClass::Read, 2 )
+#define ERR_WW6_NO_WW6_FILE_ERR ErrCode(ErrCodeArea::Sw, ErrCodeClass::Read, 8 )
+#define ERR_FORMAT_ROWCOL ErrCode(ErrCodeArea::Sw, ErrCodeClass::Read, 12)
+#define ERR_WW8_NO_WW8_FILE_ERR ErrCode(ErrCodeArea::Sw, ErrCodeClass::Read, 14)
+#define ERR_FORMAT_FILE_ROWCOL ErrCode(ErrCodeArea::Sw, ErrCodeClass::Read, 15)
+#define ERR_SWG_WRITE_ERROR ErrCode(ErrCodeArea::Sw, ErrCodeClass::Write, 30 )
+#define ERR_SWG_OLD_GLOSSARY ErrCode(ErrCodeArea::Sw, ErrCodeClass::Write, 31 )
+#define ERR_WRITE_ERROR_FILE ErrCode(ErrCodeArea::Sw, ErrCodeClass::Write, 35 )
#define ERR_SWG_INTERNAL_ERROR ErrCode(ErrCodeArea::Sw, 50 )
-#define ERR_TXTBLOCK_NEWFILE_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_LOCKING | 55 )
-#define ERR_AUTOPATH_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_PATH | 55 )
-#define ERR_TBLSPLIT_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_NONE | 56 )
-#define ERR_TBLINSCOL_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_NONE | 57 )
-#define ERR_TBLDDECHG_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_NONE | 58 )
-#define WARN_SWG_FEATURES_LOST ErrCode(ErrCodeArea::Sw, ERRCODE_WARNING_MASK | 72 )
-#define WARN_SWG_POOR_LOAD ErrCode(ErrCodeArea::Sw, ERRCODE_WARNING_MASK | ERRCODE_CLASS_WRITE | 74 )
-#define WARN_SWG_HTML_NO_MACROS ErrCode(ErrCodeArea::Sw, ERRCODE_WARNING_MASK | ERRCODE_CLASS_WRITE | 75)
-#define WARN_WRITE_ERROR_FILE ErrCode(ErrCodeArea::Sw, ERRCODE_WARNING_MASK | ERRCODE_CLASS_WRITE | 76)
-#define WARN_FORMAT_FILE_ROWCOL ErrCode(ErrCodeArea::Sw, ERRCODE_WARNING_MASK | ERRCODE_CLASS_READ | 77)
+#define ERR_TXTBLOCK_NEWFILE_ERROR ErrCode(ErrCodeArea::Sw, ErrCodeClass::Locking, 55 )
+#define ERR_AUTOPATH_ERROR ErrCode(ErrCodeArea::Sw, ErrCodeClass::Path, 55 )
+#define ERR_TBLSPLIT_ERROR ErrCode(ErrCodeArea::Sw, ErrCodeClass::NONE, 56 )
+#define ERR_TBLINSCOL_ERROR ErrCode(ErrCodeArea::Sw, ErrCodeClass::NONE, 57 )
+#define ERR_TBLDDECHG_ERROR ErrCode(ErrCodeArea::Sw, ErrCodeClass::NONE, 58 )
+#define WARN_SWG_FEATURES_LOST ErrCode(WarningFlag::Yes, ErrCodeArea::Sw, ErrCodeClass::NONE, 72 )
+#define WARN_SWG_POOR_LOAD ErrCode(WarningFlag::Yes, ErrCodeArea::Sw, ErrCodeClass::Write, 74 )
+#define WARN_SWG_HTML_NO_MACROS ErrCode(WarningFlag::Yes, ErrCodeArea::Sw, ErrCodeClass::Write, 75)
+#define WARN_WRITE_ERROR_FILE ErrCode(WarningFlag::Yes, ErrCodeArea::Sw, ErrCodeClass::Write, 76)
+#define WARN_FORMAT_FILE_ROWCOL ErrCode(WarningFlag::Yes, ErrCodeArea::Sw, ErrCodeClass::Read, 77)
#endif