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>

3 files changed, 26 insertions, 26 deletions

diff --git a/sw/inc/error.hrc b/sw/inc/error.hrc
index 9c054be65f71..7f6b8d3f61c7 100644
--- a/sw/inc/error.hrc
+++ b/sw/inc/error.hrc
@@ -24,8 +24,8 @@
 
 #define NC_(Context, String) (Context "\004" u8##String)
 
-#define ERR_CODE( class, err )  ErrCode(ErrCodeArea::Sw, class | sal_uInt32(err))
-#define WARN_CODE( class, err ) ErrCode(ErrCodeArea::Sw, class | sal_uInt32(err))
+#define ERR_CODE( class, err )  ErrCode(ErrCodeArea::Sw, class, err.GetRest())
+#define WARN_CODE( class, err ) ErrCode(ErrCodeArea::Sw, class, err.GetRest())
 
 const ErrMsgCode RID_SW_ERRHDL[] =
 {
@@ -41,16 +41,16 @@ const ErrMsgCode RID_SW_ERRHDL[] =
     { NC_("RID_SW_ERRHDL", "Wrong AutoText document version.") , ERR_SWG_OLD_GLOSSARY },
     { NC_("RID_SW_ERRHDL", "Error in writing sub-document $(ARG1)."), ERR_WRITE_ERROR_FILE },
     // Import-/Export-Errors
-    { NC_("RID_SW_ERRHDL", "Internal error in %PRODUCTNAME Writer file format.") , ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_INTERNAL_ERROR ) },
-    { NC_("RID_SW_ERRHDL", "Internal error in %PRODUCTNAME Writer file format.") , ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_INTERNAL_ERROR ) },
+    { NC_("RID_SW_ERRHDL", "Internal error in %PRODUCTNAME Writer file format.") , ERR_CODE ( ErrCodeClass::Read , ERR_SWG_INTERNAL_ERROR ) },
+    { NC_("RID_SW_ERRHDL", "Internal error in %PRODUCTNAME Writer file format.") , ERR_CODE ( ErrCodeClass::Write , ERR_SWG_INTERNAL_ERROR ) },
     { NC_("RID_SW_ERRHDL", "$(ARG1) has changed.") , ERR_TXTBLOCK_NEWFILE_ERROR },
     { NC_("RID_SW_ERRHDL", "$(ARG1) does not exist.") , ERR_AUTOPATH_ERROR },
     { NC_("RID_SW_ERRHDL", "Cells cannot be further split.") , ERR_TBLSPLIT_ERROR },
     { NC_("RID_SW_ERRHDL", "Additional columns cannot be inserted.") , ERR_TBLINSCOL_ERROR },
     { NC_("RID_SW_ERRHDL", "The structure of a linked table cannot be modified.") , ERR_TBLDDECHG_ERROR },
 
-    { NC_("RID_SW_ERRHDL", "Not all attributes could be read.") , WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_FEATURES_LOST ) },
-    { NC_("RID_SW_ERRHDL", "Not all attributes could be recorded.") , WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_FEATURES_LOST ) },
+    { NC_("RID_SW_ERRHDL", "Not all attributes could be read.") , WARN_CODE ( ErrCodeClass::Read , WARN_SWG_FEATURES_LOST ) },
+    { NC_("RID_SW_ERRHDL", "Not all attributes could be recorded.") , WARN_CODE ( ErrCodeClass::Write , WARN_SWG_FEATURES_LOST ) },
     { NC_("RID_SW_ERRHDL", "Document could not be completely saved.") , WARN_SWG_POOR_LOAD },
     { NC_("RID_SW_ERRHDL", "This HTML document contains %PRODUCTNAME Basic macros.\nThey were not saved with the current export settings."), WARN_SWG_HTML_NO_MACROS },
     { NC_("RID_SW_ERRHDL", "Error in writing sub-document $(ARG1)."), WARN_WRITE_ERROR_FILE },
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
 
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 3846182a7034..40784ad9a7bc 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -284,7 +284,7 @@ ErrCode SwASCIIParser::ReadChars()
         hConverter = rtl_createTextToUnicodeConverter( currentCharSet );
         OSL_ENSURE( hConverter, "no string convert available" );
         if (!hConverter)
-            return ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_READ);
+            return ErrCode(ErrCodeArea::Sw, ErrCodeClass::Read, 0);
         bSwapUnicode = false;
         hContext = rtl_createTextToUnicodeContext( hConverter );
     }