no need to use ERRCODE_RES_MASK here

the relevant usage sites already call GetRest() before comparing

Change-Id: I5e8ce3a3c2b6972810aa527356f6350c61b8bd63
Reviewed-on: https://gerrit.libreoffice.org/41470Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

include/vcl/errcode.hxx

@@ -116,7 +116,7 @@ public:
         return m_value & ERRCODE_CLASS_MASK;
     }
 
-    sal_uInt16 GetRest() const {
+    constexpr sal_uInt16 GetRest() const {
         return m_value & ERRCODE_RES_MASK;
     }
 

sc/inc/scerrors.hrc

@@ -28,81 +28,81 @@ const ErrMsgCode RID_ERRHDLSC[] =
 {
     // ERRORS -----------------------------------------------------
     { NC_("RID_ERRHDLSC", "Impossible to connect to the file.") ,
-      ErrCode(sal_uInt32(SCERR_IMPORT_CONNECT) & ERRCODE_RES_MASK) },
+      SCERR_IMPORT_CONNECT },
     { NC_("RID_ERRHDLSC", "File could not be opened.") ,
-      ErrCode(sal_uInt32(SCERR_IMPORT_OPEN) & ERRCODE_RES_MASK) },
+      SCERR_IMPORT_OPEN },
     { NC_("RID_ERRHDLSC", "An unknown error has occurred.") ,
-      ErrCode(sal_uInt32(SCERR_IMPORT_UNKNOWN) & ERRCODE_RES_MASK) },
+      SCERR_IMPORT_UNKNOWN },
     { NC_("RID_ERRHDLSC", "Not enough memory while importing.") ,
-      ErrCode(sal_uInt32(SCERR_IMPORT_OUTOFMEM) & ERRCODE_RES_MASK) },
+      SCERR_IMPORT_OUTOFMEM },
     { NC_("RID_ERRHDLSC", "Unknown Lotus1-2-3 file format.") ,
-      ErrCode(sal_uInt32(SCERR_IMPORT_UNKNOWN_WK) & ERRCODE_RES_MASK) },
+      SCERR_IMPORT_UNKNOWN_WK },
     { NC_("RID_ERRHDLSC", "Error in file structure while importing.") ,
-      ErrCode(sal_uInt32(SCERR_IMPORT_FORMAT) & ERRCODE_RES_MASK) },
+      SCERR_IMPORT_FORMAT },
     { NC_("RID_ERRHDLSC", "There is no filter available for this file type.") ,
-      ErrCode(sal_uInt32(SCERR_IMPORT_NI) & ERRCODE_RES_MASK) },
+      SCERR_IMPORT_NI },
     { NC_("RID_ERRHDLSC", "Unknown or unsupported Excel file format.") ,
-      ErrCode(sal_uInt32(SCERR_IMPORT_UNKNOWN_BIFF) & ERRCODE_RES_MASK) },
+      SCERR_IMPORT_UNKNOWN_BIFF },
     { NC_("RID_ERRHDLSC", "Excel file format not yet implemented.") ,
-      ErrCode(sal_uInt32(SCERR_IMPORT_NI_BIFF) & ERRCODE_RES_MASK) },
+      SCERR_IMPORT_NI_BIFF },
     { NC_("RID_ERRHDLSC", "This file is password-protected.") ,
-      ErrCode(sal_uInt32(SCERR_IMPORT_FILEPASSWD) & ERRCODE_RES_MASK) },
+      SCERR_IMPORT_FILEPASSWD },
     { NC_("RID_ERRHDLSC", "Internal import error.") ,
-      ErrCode(sal_uInt32(SCERR_IMPORT_INTERNAL) & ERRCODE_RES_MASK) },
+      SCERR_IMPORT_INTERNAL },
     { NC_("RID_ERRHDLSC", "The file contains data after row 8192 and therefore can not be read.") ,
-      ErrCode(sal_uInt32(SCERR_IMPORT_8K_LIMIT) & ERRCODE_RES_MASK) },
+      SCERR_IMPORT_8K_LIMIT },
     { NC_("RID_ERRHDLSC", "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."),
-      ErrCode(sal_uInt32(SCERR_IMPORT_FILE_ROWCOL) & ERRCODE_RES_MASK) },
+      SCERR_IMPORT_FILE_ROWCOL },
     { NC_("RID_ERRHDLSC", "File format error found at $(ARG1)(row,col).") ,
-      ErrCode(sal_uInt32(SCERR_IMPORT_FORMAT_ROWCOL) & ERRCODE_RES_MASK) },
+      SCERR_IMPORT_FORMAT_ROWCOL },
 
     // Export ----------------------------------------------------
     { NC_("RID_ERRHDLSC", "Connection to the file could not be established.") ,
-      ErrCode(sal_uInt32(SCERR_EXPORT_CONNECT) & ERRCODE_RES_MASK) },
+      SCERR_EXPORT_CONNECT },
     { NC_("RID_ERRHDLSC", "Data could not be written.") ,
-      ErrCode(sal_uInt32(SCERR_EXPORT_DATA) & ERRCODE_RES_MASK) },
+      SCERR_EXPORT_DATA },
     { NC_("RID_ERRHDLSC", "$(ARG1)") ,
-      ErrCode(sal_uInt32(SCERR_EXPORT_SQLEXCEPTION) & ERRCODE_RES_MASK) },
+      SCERR_EXPORT_SQLEXCEPTION },
     { NC_("RID_ERRHDLSC", "Cell $(ARG1) contains characters that are not representable in the selected target character set \"$(ARG2)\".") ,
-      ErrCode(sal_uInt32(SCERR_EXPORT_ENCODING) & ERRCODE_RES_MASK) },
+      SCERR_EXPORT_ENCODING },
     { NC_("RID_ERRHDLSC", "Cell $(ARG1) contains a string that is longer in the selected target character set \"$(ARG2)\" than the given field width.") ,
-      ErrCode(sal_uInt32(SCERR_EXPORT_FIELDWIDTH) & ERRCODE_RES_MASK) },
+      SCERR_EXPORT_FIELDWIDTH },
 
     // WARNINGS ---------------------------------------------------
     { NC_("RID_ERRHDLSC", "Only the active sheet was saved.") ,
-      ErrCode(sal_uInt32(SCWARN_EXPORT_ASCII) & ERRCODE_RES_MASK) },
+      SCWARN_EXPORT_ASCII },
     { NC_("RID_ERRHDLSC", "The maximum number of rows has been exceeded. Excess rows were not imported!") ,
-      ErrCode(sal_uInt32(SCWARN_IMPORT_RANGE_OVERFLOW) & ERRCODE_RES_MASK) },
+      SCWARN_IMPORT_RANGE_OVERFLOW },
     { NC_("RID_ERRHDLSC", "The data could not be loaded completely because the maximum number of rows per sheet was exceeded.") ,
-      ErrCode(sal_uInt32(SCWARN_IMPORT_ROW_OVERFLOW) & ERRCODE_RES_MASK) },
+      SCWARN_IMPORT_ROW_OVERFLOW },
     { NC_("RID_ERRHDLSC", "The data could not be loaded completely because the maximum number of columns per sheet was exceeded.") ,
-      ErrCode(sal_uInt32(SCWARN_IMPORT_COLUMN_OVERFLOW) & ERRCODE_RES_MASK) },
+      SCWARN_IMPORT_COLUMN_OVERFLOW },
     { NC_("RID_ERRHDLSC", "Not all sheets have been loaded because the maximum number of sheets was exceeded.\n\nPlease be warned that re-saving this document will permanently delete those sheets that have not been loaded!") ,
-      ErrCode(sal_uInt32(SCWARN_IMPORT_SHEET_OVERFLOW) & ERRCODE_RES_MASK) },
+      SCWARN_IMPORT_SHEET_OVERFLOW },
     { NC_("RID_ERRHDLSC", "The data could not be loaded completely because the maximum number of characters per cell was exceeded.") ,
-      ErrCode(sal_uInt32(SCWARN_IMPORT_CELL_OVERFLOW) & ERRCODE_RES_MASK) },
+      SCWARN_IMPORT_CELL_OVERFLOW },
     { NC_("RID_ERRHDLSC", "Corresponding FM3-File could not be opened.") ,
-      ErrCode(sal_uInt32(SCWARN_IMPORT_OPEN_FM3) & ERRCODE_RES_MASK) },
+      SCWARN_IMPORT_OPEN_FM3 },
     { NC_("RID_ERRHDLSC", "Error in file structure of corresponding FM3-File.") ,
-      ErrCode(sal_uInt32(SCWARN_IMPORT_WRONG_FM3) & ERRCODE_RES_MASK) },
+      SCWARN_IMPORT_WRONG_FM3 },
     { NC_("RID_ERRHDLSC", "Document too complex for automatic calculation. Press F9 to recalculate.") ,
-      ErrCode(sal_uInt32(SCWARN_CORE_HARD_RECALC) & ERRCODE_RES_MASK) },
+      SCWARN_CORE_HARD_RECALC },
     { NC_("RID_ERRHDLSC", "The document contains more rows than supported in the selected format.\nAdditional rows were not saved.") ,
-      ErrCode(sal_uInt32(SCWARN_EXPORT_MAXROW) & ERRCODE_RES_MASK) },
+      SCWARN_EXPORT_MAXROW },
     { NC_("RID_ERRHDLSC", "The document contains more columns than supported in the selected format.\nAdditional columns were not saved.") ,
-      ErrCode(sal_uInt32(SCWARN_EXPORT_MAXCOL) & ERRCODE_RES_MASK) },
+      SCWARN_EXPORT_MAXCOL },
     { NC_("RID_ERRHDLSC", "The document contains more sheets than supported in the selected format.\nAdditional sheets were not saved.") ,
-      ErrCode(sal_uInt32(SCWARN_EXPORT_MAXTAB) & ERRCODE_RES_MASK) },
+      SCWARN_EXPORT_MAXTAB },
     { NC_("RID_ERRHDLSC", "The document contains information not recognized by this program version.\nResaving the document will delete this information!") ,
-      ErrCode(sal_uInt32(SCWARN_IMPORT_INFOLOST) & ERRCODE_RES_MASK) },
+      SCWARN_IMPORT_INFOLOST },
     { NC_("RID_ERRHDLSC", "Not all cell contents could be saved in the specified format.") ,
-      ErrCode(sal_uInt32(SCWARN_EXPORT_DATALOST) & ERRCODE_RES_MASK) },
+      SCWARN_EXPORT_DATALOST },
     { NC_("RID_ERRHDLSC", "The following characters could not be converted to the selected character set\nand were written as Ӓ surrogates:\n\n$(ARG1)"),
-      ErrCode(sal_uInt32(SCWARN_EXPORT_NONCONVERTIBLE_CHARS) & ERRCODE_RES_MASK) },
+      SCWARN_EXPORT_NONCONVERTIBLE_CHARS },
     { NC_("RID_ERRHDLSC", "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."),
-      ErrCode(sal_uInt32(SCWARN_IMPORT_FILE_ROWCOL) & ERRCODE_RES_MASK) },
+      SCWARN_IMPORT_FILE_ROWCOL },
     { NC_("RID_ERRHDLSC", "Not all attributes could be read.") ,
-      ErrCode(sal_uInt32(SCWARN_IMPORT_FEATURES_LOST) & ERRCODE_RES_MASK) },
+      SCWARN_IMPORT_FEATURES_LOST },
     { nullptr, ERRCODE_NONE }
 };
 

svx/inc/svxerr.hrc

@@ -31,17 +31,17 @@
 const ErrMsgCode RID_SVXERRCTX[] =
 {
     { NC_("RID_SVXERRCTX", "$(ERR) executing the thesaurus.") ,
-      ErrCode(sal_uInt32(ERRCTX_SVX_LINGU_THESAURUS) & ERRCODE_RES_MASK) },
+      ErrCode(ERRCTX_SVX_LINGU_THESAURUS) },
     { NC_("RID_SVXERRCTX", "$(ERR) executing the spellcheck.") ,
-      ErrCode(sal_uInt32(ERRCTX_SVX_LINGU_SPELLING) & ERRCODE_RES_MASK) },
+      ErrCode(ERRCTX_SVX_LINGU_SPELLING) },
     { NC_("RID_SVXERRCTX", "$(ERR) executing the hyphenation.") ,
-      ErrCode(sal_uInt32(ERRCTX_SVX_LINGU_HYPHENATION) & ERRCODE_RES_MASK) },
+      ErrCode(ERRCTX_SVX_LINGU_HYPHENATION) },
     { NC_("RID_SVXERRCTX", "$(ERR) creating a dictionary.") ,
-      ErrCode(sal_uInt32(ERRCTX_SVX_LINGU_DICTIONARY) & ERRCODE_RES_MASK) },
+      ErrCode(ERRCTX_SVX_LINGU_DICTIONARY) },
     { NC_("RID_SVXERRCTX", "$(ERR) setting background attribute.") ,
-      ErrCode(sal_uInt32(ERRCTX_SVX_BACKGROUND) & ERRCODE_RES_MASK) },
+      ErrCode(ERRCTX_SVX_BACKGROUND) },
     { NC_("RID_SVXERRCTX", "$(ERR) loading the graphics.") ,
-      ErrCode(sal_uInt32(ERRCTX_SVX_IMPORT_GRAPHIC) & ERRCODE_RES_MASK) },
+      ErrCode(ERRCTX_SVX_IMPORT_GRAPHIC) },
     { nullptr, ERRCODE_NONE }
 };
 
@@ -49,23 +49,23 @@ const ErrMsgCode RID_SVXERRCTX[] =
 const ErrMsgCode RID_SVXERRCODE[] =
 {
     { NC_("RID_SVXERRCODE", "No thesaurus available for the current language.\nPlease check your installation and install the desired language.") ,
-      ErrCode(sal_uInt32(ERRCODE_SVX_LINGU_THESAURUSNOTEXISTS) & ERRCODE_RES_MASK) },
+      ERRCODE_SVX_LINGU_THESAURUSNOTEXISTS },
     { NC_("RID_SVXERRCODE", "$(ARG1) is not supported by the spellcheck function or is not presently active.\nPlease check your installation and, if necessary, install the required language module\n or activate it under 'Tools - Options -  Language Settings - Writing Aids'."),
-      ErrCode(sal_uInt32(ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS) & ERRCODE_RES_MASK) },
+      ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS },
     { NC_("RID_SVXERRCODE", "Spellcheck is not available.") ,
-      ErrCode(sal_uInt32(ERRCODE_SVX_LINGU_LINGUNOTEXISTS) & ERRCODE_RES_MASK) },
+      ERRCODE_SVX_LINGU_LINGUNOTEXISTS },
     { NC_("RID_SVXERRCODE", "Hyphenation not available.") ,
-      ErrCode(sal_uInt32(ERRCODE_SVX_LINGU_HYPHENNOTEXISTS) & ERRCODE_RES_MASK) },
+      ERRCODE_SVX_LINGU_HYPHENNOTEXISTS },
     { NC_("RID_SVXERRCODE", "The custom dictionary $(ARG1) cannot be read.") ,
-      ErrCode(sal_uInt32(ERRCODE_SVX_LINGU_DICT_NOTREADABLE) & ERRCODE_RES_MASK) },
+      ERRCODE_SVX_LINGU_DICT_NOTREADABLE },
     { NC_("RID_SVXERRCODE", "The custom dictionary $(ARG1) cannot be created.") ,
-      ErrCode(sal_uInt32(ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE) & ERRCODE_RES_MASK) },
+      ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE },
     { NC_("RID_SVXERRCODE", "The graphic $(ARG1) could not be found.") ,
-      ErrCode(sal_uInt32(ERRCODE_SVX_GRAPHIC_NOTREADABLE) & ERRCODE_RES_MASK) },
+      ERRCODE_SVX_GRAPHIC_NOTREADABLE },
     { NC_("RID_SVXERRCODE", "An unlinked graphic could not be loaded."),
-      ErrCode(sal_uInt32(ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT) & ERRCODE_RES_MASK) },
+      ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT },
     { NC_("RID_SVXERRCODE", "A language has not been fixed for the selected term."),
-      ErrCode(sal_uInt32(ERRCODE_SVX_LINGU_NOLANGUAGE) & ERRCODE_RES_MASK) },
+      ERRCODE_SVX_LINGU_NOLANGUAGE },
     { NC_("RID_SVXERRCODE", "The form layer wasn't loaded as the required IO-services (com.sun.star.io.*) could not be instantiated."),
       ErrCode((sal_uInt32(ERRCODE_SVX_FORMS_NOIOSERVICES) | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK) },
     { NC_("RID_SVXERRCODE", "The form layer wasn't written as the required IO services (com.sun.star.io.*) could not be instantiated."),
@@ -77,17 +77,17 @@ const ErrMsgCode RID_SVXERRCODE[] =
     { NC_("RID_SVXERRCODE", "An error occurred while reading one of the bullets. Not all of the bullets were loaded."),
       ErrCode((sal_uInt32(ERRCODE_SVX_BULLETITEM_NOBULLET) | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK) },
     { NC_("RID_SVXERRCODE", "All changes to the Basic Code are lost. The original VBA Macro Code is saved instead."),
-      ErrCode(sal_uInt32(ERRCODE_SVX_MODIFIED_VBASIC_STORAGE) & ERRCODE_RES_MASK) },
+      ERRCODE_SVX_MODIFIED_VBASIC_STORAGE },
     { NC_("RID_SVXERRCODE", "The original VBA Basic Code contained in the document will not be saved."),
-      ErrCode(sal_uInt32(ERRCODE_SVX_VBASIC_STORAGE_EXIST) & ERRCODE_RES_MASK) },
+      ERRCODE_SVX_VBASIC_STORAGE_EXIST },
     { NC_("RID_SVXERRCODE", "The password is incorrect. The document cannot be opened."),
-      ErrCode(sal_uInt32(ERRCODE_SVX_WRONGPASS) & ERRCODE_RES_MASK) },
+      ERRCODE_SVX_WRONGPASS },
     { NC_("RID_SVXERRCODE", "The encryption method used in this document is not supported. Only Microsoft Office 97/2000 compatible password encryption is supported."),
-      ErrCode(sal_uInt32(ERRCODE_SVX_READ_FILTER_CRYPT) & ERRCODE_RES_MASK) },
+      ERRCODE_SVX_READ_FILTER_CRYPT },
     { NC_("RID_SVXERRCODE", "The loading of password-encrypted Microsoft PowerPoint presentations is not supported."),
-      ErrCode(sal_uInt32(ERRCODE_SVX_READ_FILTER_PPOINT) & ERRCODE_RES_MASK) },
+      ERRCODE_SVX_READ_FILTER_PPOINT },
     { NC_("RID_SVXERRCODE", "Password protection is not supported when documents are saved in a Microsoft Office format.\nDo you want to save the document without password protection?"),
-      ErrCode(sal_uInt32(ERRCODE_SVX_EXPORT_FILTER_CRYPT) & ERRCODE_RES_MASK) },
+      ERRCODE_SVX_EXPORT_FILTER_CRYPT },
     { nullptr, ERRCODE_NONE }
 };