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/41470
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 64 insertions, 64 deletions

diff --git a/uui/inc/ids.hrc b/uui/inc/ids.hrc
index 27777cf45ebf..d5a418918ec5 100644
--- a/uui/inc/ids.hrc
+++ b/uui/inc/ids.hrc
@@ -25,133 +25,133 @@
 const std::pair<const char*, ErrCode> RID_UUI_ERRHDL[] =
 {
     { NC_("RID_UUI_ERRHDL", "The operation executed on $(ARG1) was aborted."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_ABORT) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_ABORT },
     { NC_("RID_UUI_ERRHDL", "Access to $(ARG1) was denied."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_ACCESSDENIED) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_ACCESSDENIED },
     { NC_("RID_UUI_ERRHDL", "$(ARG1) already exists."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_ALREADYEXISTS) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_ALREADYEXISTS },
     { NC_("RID_UUI_ERRHDL", "Target already exists."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_TARGETALREADYEXISTS) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_TARGETALREADYEXISTS },
     { NC_("RID_UUI_ERRHDL", "You are about to save/export a password protected basic library containing module(s) \n$(ARG1)\nwhich are too large to store in binary format. If you wish users that don't have access to the library password to be able to run macros in those module(s) you must split those modules into a number of smaller modules. Do you wish to continue to save/export this library?"),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_MODULESIZEEXCEEDED) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_MODULESIZEEXCEEDED },
     { NC_("RID_UUI_ERRHDL", "The data from $(ARG1) has an incorrect checksum."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_BADCRC) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_BADCRC },
     { NC_("RID_UUI_ERRHDL", "The object $(ARG1) cannot be created in directory $(ARG2)."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_CANTCREATE) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_CANTCREATE },
     { NC_("RID_UUI_ERRHDL", "Data of $(ARG1) could not be read."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_CANTREAD) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_CANTREAD },
     { NC_("RID_UUI_ERRHDL", "The seek operation on $(ARG1) could not be performed."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_CANTSEEK) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_CANTSEEK },
     { NC_("RID_UUI_ERRHDL", "The tell operation on $(ARG1) could not be performed."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_CANTTELL) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_CANTTELL },
     { NC_("RID_UUI_ERRHDL", "Data for $(ARG1) could not be written."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_CANTWRITE) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_CANTWRITE },
     { NC_("RID_UUI_ERRHDL", "Action impossible: $(ARG1) is the current directory."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_CURRENTDIR) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_CURRENTDIR },
     { NC_("RID_UUI_ERRHDL", "$(ARG1) is not ready."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTREADY) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_NOTREADY },
     { NC_("RID_UUI_ERRHDL", "Action impossible: $(ARG1) and $(ARG2) are different devices (drives)."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTSAMEDEVICE) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_NOTSAMEDEVICE },
     { NC_("RID_UUI_ERRHDL", "General input/output error while accessing $(ARG1)."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_GENERAL) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_GENERAL },
     { NC_("RID_UUI_ERRHDL", "An attempt was made to access $(ARG1) in an invalid way."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_INVALIDACCESS) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_INVALIDACCESS },
     { NC_("RID_UUI_ERRHDL", "$(ARG1) contains invalid characters."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_INVALIDCHAR) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_INVALIDCHAR },
     { NC_("RID_UUI_ERRHDL", "The device (drive) $(ARG1) is invalid."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_INVALIDDEVICE) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_INVALIDDEVICE },
     { NC_("RID_UUI_ERRHDL", "The data from $(ARG1) has an invalid length."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_INVALIDLENGTH) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_INVALIDLENGTH },
     { NC_("RID_UUI_ERRHDL", "The operation on $(ARG1) was started with an invalid parameter."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_INVALIDPARAMETER) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_INVALIDPARAMETER },
     { NC_("RID_UUI_ERRHDL", "The operation cannot be performed because $(ARG1) contains wildcards."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_ISWILDCARD) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_ISWILDCARD },
     { NC_("RID_UUI_ERRHDL", "Error during shared access to $(ARG1)."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_LOCKVIOLATION) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_LOCKVIOLATION },
     { NC_("RID_UUI_ERRHDL", "$(ARG1) contains misplaced characters."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_MISPLACEDCHAR) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_MISPLACEDCHAR },
     { NC_("RID_UUI_ERRHDL", "The name $(ARG1) contains too many characters."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NAMETOOLONG) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_NAMETOOLONG },
     { NC_("RID_UUI_ERRHDL", "$(ARG1) does not exist."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTEXISTS) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_NOTEXISTS },
     { NC_("RID_UUI_ERRHDL", "The path $(ARG1) does not exist."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTEXISTSPATH) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_NOTEXISTSPATH },
     { NC_("RID_UUI_ERRHDL", "The operation on $(ARG1) is not supported on this operating system."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTSUPPORTED) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_NOTSUPPORTED },
     { NC_("RID_UUI_ERRHDL", "$(ARG1) is not a directory."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTADIRECTORY) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_NOTADIRECTORY },
     { NC_("RID_UUI_ERRHDL", "$(ARG1) is not a file."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTAFILE) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_NOTAFILE },
     { NC_("RID_UUI_ERRHDL", "There is no space left on device $(ARG1)."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_OUTOFSPACE) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_OUTOFSPACE },
     { NC_("RID_UUI_ERRHDL", "The operation on $(ARG1) cannot be performed because too many files are already open."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_TOOMANYOPENFILES) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_TOOMANYOPENFILES },
     { NC_("RID_UUI_ERRHDL", "The operation on $(ARG1) cannot be performed because there is no more memory available."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_OUTOFMEMORY) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_OUTOFMEMORY },
     { NC_("RID_UUI_ERRHDL", "The operation on $(ARG1) cannot continue because more data is pending."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_PENDING) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_PENDING },
     { NC_("RID_UUI_ERRHDL", "$(ARG1) cannot be copied into itself."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_RECURSIVE) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_RECURSIVE },
     { NC_("RID_UUI_ERRHDL", "Unknown input/output error while accessing $(ARG1)."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_UNKNOWN) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_UNKNOWN },
     { NC_("RID_UUI_ERRHDL", "$(ARG1) is write protected."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_WRITEPROTECTED) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_WRITEPROTECTED },
     { NC_("RID_UUI_ERRHDL", "$(ARG1) is not in the correct format."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_WRONGFORMAT) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_WRONGFORMAT },
     { NC_("RID_UUI_ERRHDL", "The version of $(ARG1) is not correct."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_WRONGVERSION) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_WRONGVERSION },
     { NC_("RID_UUI_ERRHDL", "Drive $(ARG1) does not exist."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTEXISTS_VOLUME) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_NOTEXISTS_VOLUME },
     { NC_("RID_UUI_ERRHDL", "Folder $(ARG1) does not exist."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTEXISTS_FOLDER) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_NOTEXISTS_FOLDER },
     { NC_("RID_UUI_ERRHDL", "The installed Java version is not supported."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_WRONGJAVA) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_WRONGJAVA },
     { NC_("RID_UUI_ERRHDL", "The installed Java version $(ARG1) is not supported."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_WRONGJAVA_VERSION) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_WRONGJAVA_VERSION },
     { NC_("RID_UUI_ERRHDL", "The installed Java version is not supported, at least version $(ARG1) is required."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_WRONGJAVA_MIN) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_WRONGJAVA_MIN },
     { NC_("RID_UUI_ERRHDL", "The installed Java version $(ARG1) is not supported, at least version $(ARG2) is required."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_WRONGJAVA_VERSION_MIN) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_WRONGJAVA_VERSION_MIN },
     { NC_("RID_UUI_ERRHDL", "The data associated with the partnership is corrupted."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_BADPARTNERSHIP) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_BADPARTNERSHIP },
     { NC_("RID_UUI_ERRHDL", "The data associated with the partnership $(ARG1) is corrupted."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_BADPARTNERSHIP_NAME) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_BADPARTNERSHIP_NAME },
     { NC_("RID_UUI_ERRHDL", "Volume $(ARG1) is not ready."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTREADY_VOLUME) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_NOTREADY_VOLUME },
     { NC_("RID_UUI_ERRHDL", "$(ARG1) is not ready; please insert a storage medium."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTREADY_REMOVABLE) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_NOTREADY_REMOVABLE },
     { NC_("RID_UUI_ERRHDL", "Volume $(ARG1) is not ready; please insert a storage medium."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_NOTREADY_VOLUME_REMOVABLE) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_NOTREADY_VOLUME_REMOVABLE },
     { NC_("RID_UUI_ERRHDL", "Please insert disk $(ARG1)."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_WRONGMEDIUM) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_WRONGMEDIUM },
     { NC_("RID_UUI_ERRHDL", "The object cannot be created in directory $(ARG1)."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_CANTCREATE_NONAME) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_CANTCREATE_NONAME },
     { NC_("RID_UUI_ERRHDL", "%PRODUCTNAME cannot keep files from being overwritten when this transmission protocol is used. Do you want to continue anyway?"),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_UNSUPPORTEDOVERWRITE) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_UNSUPPORTEDOVERWRITE },
     { NC_("RID_UUI_ERRHDL", "The file '$(ARG1)' is corrupt and therefore cannot be opened. %PRODUCTNAME can try to repair the file.\n\nThe corruption could be the result of document manipulation or of structural document damage due to data transmission.\n\nWe recommend that you do not trust the content of the repaired document.\nExecution of macros is disabled for this document.\n\nShould %PRODUCTNAME repair the file?\n"),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_BROKENPACKAGE) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_BROKENPACKAGE },
     { NC_("RID_UUI_ERRHDL", "The file '$(ARG1)' could not be repaired and therefore cannot be opened."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_IO_BROKENPACKAGE_CANTREPAIR) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_IO_BROKENPACKAGE_CANTREPAIR },
     { NC_("RID_UUI_ERRHDL", "Configuration data in '$(ARG1)' is corrupted. Without this data some functions may not operate correctly.\nDo you want to continue startup of %PRODUCTNAME without the corrupted configuration data?"),
-      ErrCode(sal_uInt32(ERRCODE_UUI_CONFIGURATION_BROKENDATA_NOREMOVE) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_CONFIGURATION_BROKENDATA_NOREMOVE },
     { NC_("RID_UUI_ERRHDL", "The personal configuration file '$(ARG1)' is corrupted and must be deleted to continue. Some of your personal settings may be lost.\nDo you want to continue startup of %PRODUCTNAME without the corrupted configuration data?"),
-      ErrCode(sal_uInt32(ERRCODE_UUI_CONFIGURATION_BROKENDATA_WITHREMOVE) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_CONFIGURATION_BROKENDATA_WITHREMOVE },
     { NC_("RID_UUI_ERRHDL", "The configuration data source '$(ARG1)' is unavailable. Without this data some functions may not operate correctly."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_CONFIGURATION_BACKENDMISSING) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_CONFIGURATION_BACKENDMISSING },
     { NC_("RID_UUI_ERRHDL", "The configuration data source '$(ARG1)' is unavailable. Without this data some functions may not operate correctly.\nDo you want to continue startup of %PRODUCTNAME without the missing configuration data?"),
-      ErrCode(sal_uInt32(ERRCODE_UUI_CONFIGURATION_BACKENDMISSING_WITHRECOVER) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_CONFIGURATION_BACKENDMISSING_WITHRECOVER },
     { NC_("RID_UUI_ERRHDL", "The form contains invalid data. Do you still want to continue?"),
-      ErrCode(sal_uInt32(ERRCODE_UUI_INVALID_XFORMS_SUBMISSION_DATA) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_INVALID_XFORMS_SUBMISSION_DATA },
     { NC_("RID_UUI_ERRHDL", "The file $(ARG1) is locked by another user. Currently, another write access to this file cannot be granted."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_LOCKING_LOCKED) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_LOCKING_LOCKED },
     { NC_("RID_UUI_ERRHDL", "The file $(ARG1) is locked by yourself. Currently, another write access to this file cannot be granted."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_LOCKING_LOCKED_SELF) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_LOCKING_LOCKED_SELF },
     { NC_("RID_UUI_ERRHDL", "The file $(ARG1) is currently not locked by yourself."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_LOCKING_NOT_LOCKED) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_LOCKING_NOT_LOCKED },
     { NC_("RID_UUI_ERRHDL", "The previously obtained lock for file $(ARG1) has expired.\nThis can happen due to problems on the server managing the file lock. It cannot be guaranteed that write operations on this file will not overwrite changes done by other users!"),
-      ErrCode(sal_uInt32(ERRCODE_UUI_LOCKING_LOCK_EXPIRED) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_LOCKING_LOCK_EXPIRED },
     { NC_("RID_UUI_ERRHDL", "Component cannot be loaded, possibly broken or incomplete installation.\nFull error message:\n\n $(ARG1)."),
-      ErrCode(sal_uInt32(ERRCODE_UUI_CANNOT_ACTIVATE_FACTORY) & ERRCODE_RES_MASK) },
+      ERRCODE_UUI_CANNOT_ACTIVATE_FACTORY },
     { nullptr, ERRCODE_NONE }
 };