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>

basic/inc/basic.hrc

@@ -24,135 +24,135 @@
 
 std::pair<const char*, ErrCode> RID_BASIC_START[] =
 {
-    { NC_("RID_BASIC_START", "Syntax error."), ErrCode(sal_uInt32(ERRCODE_BASIC_SYNTAX) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Return without Gosub."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_GOSUB) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Incorrect entry; please retry."), ErrCode(sal_uInt32(ERRCODE_BASIC_REDO_FROM_START) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Invalid procedure call."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_ARGUMENT) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Overflow."), ErrCode(sal_uInt32(ERRCODE_BASIC_MATH_OVERFLOW) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Not enough memory."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_MEMORY) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Array already dimensioned."), ErrCode(sal_uInt32(ERRCODE_BASIC_ALREADY_DIM) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Index out of defined range."), ErrCode(sal_uInt32(ERRCODE_BASIC_OUT_OF_RANGE) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Duplicate definition."), ErrCode(sal_uInt32(ERRCODE_BASIC_DUPLICATE_DEF) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Division by zero."), ErrCode(sal_uInt32(ERRCODE_BASIC_ZERODIV) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Variable not defined."), ErrCode(sal_uInt32(ERRCODE_BASIC_VAR_UNDEFINED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Data type mismatch."), ErrCode(sal_uInt32(ERRCODE_BASIC_CONVERSION) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Invalid parameter."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_PARAMETER) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Process interrupted by user."), ErrCode(sal_uInt32(ERRCODE_BASIC_USER_ABORT) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Resume without error."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_RESUME) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Not enough stack memory."), ErrCode(sal_uInt32(ERRCODE_BASIC_STACK_OVERFLOW) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Sub-procedure or function procedure not defined."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROC_UNDEFINED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Error loading DLL file."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_DLL_LOAD) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Wrong DLL call convention."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_DLL_CALL) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Internal error $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_INTERNAL_ERROR) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Invalid file name or file number."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_CHANNEL) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "File not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_FILE_NOT_FOUND) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Incorrect file mode."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_FILE_MODE) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "File already open."), ErrCode(sal_uInt32(ERRCODE_BASIC_FILE_ALREADY_OPEN) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Device I/O error."), ErrCode(sal_uInt32(ERRCODE_BASIC_IO_ERROR) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "File already exists."), ErrCode(sal_uInt32(ERRCODE_BASIC_FILE_EXISTS) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Incorrect record length."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_RECORD_LENGTH) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Disk or hard drive full."), ErrCode(sal_uInt32(ERRCODE_BASIC_DISK_FULL) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Reading exceeds EOF."), ErrCode(sal_uInt32(ERRCODE_BASIC_READ_PAST_EOF) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Incorrect record number."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_RECORD_NUMBER) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Too many files."), ErrCode(sal_uInt32(ERRCODE_BASIC_TOO_MANY_FILES) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Device not available."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_DEVICE) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Access denied."), ErrCode(sal_uInt32(ERRCODE_BASIC_ACCESS_DENIED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Disk not ready."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_READY) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Not implemented."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_IMPLEMENTED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Renaming on different drives impossible."), ErrCode(sal_uInt32(ERRCODE_BASIC_DIFFERENT_DRIVE) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Path/File access error."), ErrCode(sal_uInt32(ERRCODE_BASIC_ACCESS_ERROR) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Path not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_PATH_NOT_FOUND) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Object variable not set."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_OBJECT) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Invalid string pattern."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_PATTERN) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Use of zero not permitted."), ErrCode(sal_uInt32(ERRCODE_BASIC_IS_NULL) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "DDE Error."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_ERROR) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Awaiting response to DDE connection."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_WAITINGACK) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "No DDE channels available."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_OUTOFCHANNELS) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "No application responded to DDE connect initiation."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_NO_RESPONSE) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Too many applications responded to DDE connect initiation."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_MULT_RESPONSES) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "DDE channel locked."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_CHANNEL_LOCKED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "External application cannot execute DDE operation."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_NOTPROCESSED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Timeout while waiting for DDE response."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_TIMEOUT) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "User pressed ESCAPE during DDE operation."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_USER_INTERRUPT) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "External application busy."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_BUSY) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "DDE operation without data."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_NO_DATA) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Data are in wrong format."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_WRONG_DATA_FORMAT) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "External application has been terminated."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_PARTNER_QUIT) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "DDE connection interrupted or modified."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_CONV_CLOSED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "DDE method invoked with no channel open."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_NO_CHANNEL) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Invalid DDE link format."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_INVALID_LINK) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "DDE message has been lost."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_QUEUE_OVERFLOW) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Paste link already performed."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_LINK_ALREADY_EST) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Link mode cannot be set due to invalid link topic."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_LINK_INV_TOPIC) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "DDE requires the DDEML.DLL file."), ErrCode(sal_uInt32(ERRCODE_BASIC_DDE_DLL_NOT_FOUND) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Module cannot be loaded; invalid format."), ErrCode(sal_uInt32(ERRCODE_BASIC_CANNOT_LOAD) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Invalid object index."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_INDEX) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Object is not available."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_ACTIVE_OBJECT) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Incorrect property value."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_PROP_VALUE) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "This property is read-only."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROP_READONLY) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "This property is write only."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROP_WRITEONLY) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Invalid object reference."), ErrCode(sal_uInt32(ERRCODE_BASIC_INVALID_OBJECT) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Property or method not found: $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_METHOD) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Object required."), ErrCode(sal_uInt32(ERRCODE_BASIC_NEEDS_OBJECT) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Invalid use of an object."), ErrCode(sal_uInt32(ERRCODE_BASIC_INVALID_USAGE_OBJECT) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "OLE Automation is not supported by this object."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_OLE) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "This property or method is not supported by the object."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_METHOD) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "OLE Automation Error."), ErrCode(sal_uInt32(ERRCODE_BASIC_OLE_ERROR) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "This action is not supported by given object."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_ACTION) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Named arguments are not supported by given object."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_NAMED_ARGS) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "The current locale setting is not supported by the given object."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_LOCALE) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Named argument not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_NAMED_NOT_FOUND) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Argument is not optional."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_OPTIONAL) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Invalid number of arguments."), ErrCode(sal_uInt32(ERRCODE_BASIC_WRONG_ARGS) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Object is not a list."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_A_COLL) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Invalid ordinal number."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_ORDINAL) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Specified DLL function not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_DLLPROC_NOT_FOUND) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Invalid clipboard format."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_CLIPBD_FORMAT) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Object does not have this property."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROPERTY_NOT_FOUND) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Object does not have this method."), ErrCode(sal_uInt32(ERRCODE_BASIC_METHOD_NOT_FOUND) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Required argument lacking."), ErrCode(sal_uInt32(ERRCODE_BASIC_ARG_MISSING) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Invalid number of arguments."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_NUMBER_OF_ARGS) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Error executing a method."), ErrCode(sal_uInt32(ERRCODE_BASIC_METHOD_FAILED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Unable to set property."), ErrCode(sal_uInt32(ERRCODE_BASIC_SETPROP_FAILED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Unable to determine property."), ErrCode(sal_uInt32(ERRCODE_BASIC_GETPROP_FAILED) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Syntax error."), ERRCODE_BASIC_SYNTAX },
+    { NC_("RID_BASIC_START", "Return without Gosub."), ERRCODE_BASIC_NO_GOSUB },
+    { NC_("RID_BASIC_START", "Incorrect entry; please retry."), ERRCODE_BASIC_REDO_FROM_START },
+    { NC_("RID_BASIC_START", "Invalid procedure call."), ERRCODE_BASIC_BAD_ARGUMENT },
+    { NC_("RID_BASIC_START", "Overflow."), ERRCODE_BASIC_MATH_OVERFLOW },
+    { NC_("RID_BASIC_START", "Not enough memory."), ERRCODE_BASIC_NO_MEMORY },
+    { NC_("RID_BASIC_START", "Array already dimensioned."), ERRCODE_BASIC_ALREADY_DIM },
+    { NC_("RID_BASIC_START", "Index out of defined range."), ERRCODE_BASIC_OUT_OF_RANGE },
+    { NC_("RID_BASIC_START", "Duplicate definition."), ERRCODE_BASIC_DUPLICATE_DEF },
+    { NC_("RID_BASIC_START", "Division by zero."), ERRCODE_BASIC_ZERODIV },
+    { NC_("RID_BASIC_START", "Variable not defined."), ERRCODE_BASIC_VAR_UNDEFINED },
+    { NC_("RID_BASIC_START", "Data type mismatch."), ERRCODE_BASIC_CONVERSION },
+    { NC_("RID_BASIC_START", "Invalid parameter."), ERRCODE_BASIC_BAD_PARAMETER },
+    { NC_("RID_BASIC_START", "Process interrupted by user."), ERRCODE_BASIC_USER_ABORT },
+    { NC_("RID_BASIC_START", "Resume without error."), ERRCODE_BASIC_BAD_RESUME },
+    { NC_("RID_BASIC_START", "Not enough stack memory."), ERRCODE_BASIC_STACK_OVERFLOW },
+    { NC_("RID_BASIC_START", "Sub-procedure or function procedure not defined."), ERRCODE_BASIC_PROC_UNDEFINED },
+    { NC_("RID_BASIC_START", "Error loading DLL file."), ERRCODE_BASIC_BAD_DLL_LOAD },
+    { NC_("RID_BASIC_START", "Wrong DLL call convention."), ERRCODE_BASIC_BAD_DLL_CALL },
+    { NC_("RID_BASIC_START", "Internal error $(ARG1)."), ERRCODE_BASIC_INTERNAL_ERROR },
+    { NC_("RID_BASIC_START", "Invalid file name or file number."), ERRCODE_BASIC_BAD_CHANNEL },
+    { NC_("RID_BASIC_START", "File not found."), ERRCODE_BASIC_FILE_NOT_FOUND },
+    { NC_("RID_BASIC_START", "Incorrect file mode."), ERRCODE_BASIC_BAD_FILE_MODE },
+    { NC_("RID_BASIC_START", "File already open."), ERRCODE_BASIC_FILE_ALREADY_OPEN },
+    { NC_("RID_BASIC_START", "Device I/O error."), ERRCODE_BASIC_IO_ERROR },
+    { NC_("RID_BASIC_START", "File already exists."), ERRCODE_BASIC_FILE_EXISTS },
+    { NC_("RID_BASIC_START", "Incorrect record length."), ERRCODE_BASIC_BAD_RECORD_LENGTH },
+    { NC_("RID_BASIC_START", "Disk or hard drive full."), ERRCODE_BASIC_DISK_FULL },
+    { NC_("RID_BASIC_START", "Reading exceeds EOF."), ERRCODE_BASIC_READ_PAST_EOF },
+    { NC_("RID_BASIC_START", "Incorrect record number."), ERRCODE_BASIC_BAD_RECORD_NUMBER },
+    { NC_("RID_BASIC_START", "Too many files."), ERRCODE_BASIC_TOO_MANY_FILES },
+    { NC_("RID_BASIC_START", "Device not available."), ERRCODE_BASIC_NO_DEVICE },
+    { NC_("RID_BASIC_START", "Access denied."), ERRCODE_BASIC_ACCESS_DENIED },
+    { NC_("RID_BASIC_START", "Disk not ready."), ERRCODE_BASIC_NOT_READY },
+    { NC_("RID_BASIC_START", "Not implemented."), ERRCODE_BASIC_NOT_IMPLEMENTED },
+    { NC_("RID_BASIC_START", "Renaming on different drives impossible."), ERRCODE_BASIC_DIFFERENT_DRIVE },
+    { NC_("RID_BASIC_START", "Path/File access error."), ERRCODE_BASIC_ACCESS_ERROR },
+    { NC_("RID_BASIC_START", "Path not found."), ERRCODE_BASIC_PATH_NOT_FOUND },
+    { NC_("RID_BASIC_START", "Object variable not set."), ERRCODE_BASIC_NO_OBJECT },
+    { NC_("RID_BASIC_START", "Invalid string pattern."), ERRCODE_BASIC_BAD_PATTERN },
+    { NC_("RID_BASIC_START", "Use of zero not permitted."), ERRCODE_BASIC_IS_NULL },
+    { NC_("RID_BASIC_START", "DDE Error."), ERRCODE_BASIC_DDE_ERROR },
+    { NC_("RID_BASIC_START", "Awaiting response to DDE connection."), ERRCODE_BASIC_DDE_WAITINGACK },
+    { NC_("RID_BASIC_START", "No DDE channels available."), ERRCODE_BASIC_DDE_OUTOFCHANNELS },
+    { NC_("RID_BASIC_START", "No application responded to DDE connect initiation."), ERRCODE_BASIC_DDE_NO_RESPONSE },
+    { NC_("RID_BASIC_START", "Too many applications responded to DDE connect initiation."), ERRCODE_BASIC_DDE_MULT_RESPONSES },
+    { NC_("RID_BASIC_START", "DDE channel locked."), ERRCODE_BASIC_DDE_CHANNEL_LOCKED },
+    { NC_("RID_BASIC_START", "External application cannot execute DDE operation."), ERRCODE_BASIC_DDE_NOTPROCESSED },
+    { NC_("RID_BASIC_START", "Timeout while waiting for DDE response."), ERRCODE_BASIC_DDE_TIMEOUT },
+    { NC_("RID_BASIC_START", "User pressed ESCAPE during DDE operation."), ERRCODE_BASIC_DDE_USER_INTERRUPT },
+    { NC_("RID_BASIC_START", "External application busy."), ERRCODE_BASIC_DDE_BUSY },
+    { NC_("RID_BASIC_START", "DDE operation without data."), ERRCODE_BASIC_DDE_NO_DATA },
+    { NC_("RID_BASIC_START", "Data are in wrong format."), ERRCODE_BASIC_DDE_WRONG_DATA_FORMAT },
+    { NC_("RID_BASIC_START", "External application has been terminated."), ERRCODE_BASIC_DDE_PARTNER_QUIT },
+    { NC_("RID_BASIC_START", "DDE connection interrupted or modified."), ERRCODE_BASIC_DDE_CONV_CLOSED },
+    { NC_("RID_BASIC_START", "DDE method invoked with no channel open."), ERRCODE_BASIC_DDE_NO_CHANNEL },
+    { NC_("RID_BASIC_START", "Invalid DDE link format."), ERRCODE_BASIC_DDE_INVALID_LINK },
+    { NC_("RID_BASIC_START", "DDE message has been lost."), ERRCODE_BASIC_DDE_QUEUE_OVERFLOW },
+    { NC_("RID_BASIC_START", "Paste link already performed."), ERRCODE_BASIC_DDE_LINK_ALREADY_EST },
+    { NC_("RID_BASIC_START", "Link mode cannot be set due to invalid link topic."), ERRCODE_BASIC_DDE_LINK_INV_TOPIC },
+    { NC_("RID_BASIC_START", "DDE requires the DDEML.DLL file."), ERRCODE_BASIC_DDE_DLL_NOT_FOUND },
+    { NC_("RID_BASIC_START", "Module cannot be loaded; invalid format."), ERRCODE_BASIC_CANNOT_LOAD },
+    { NC_("RID_BASIC_START", "Invalid object index."), ERRCODE_BASIC_BAD_INDEX },
+    { NC_("RID_BASIC_START", "Object is not available."), ERRCODE_BASIC_NO_ACTIVE_OBJECT },
+    { NC_("RID_BASIC_START", "Incorrect property value."), ERRCODE_BASIC_BAD_PROP_VALUE },
+    { NC_("RID_BASIC_START", "This property is read-only."), ERRCODE_BASIC_PROP_READONLY },
+    { NC_("RID_BASIC_START", "This property is write only."), ERRCODE_BASIC_PROP_WRITEONLY },
+    { NC_("RID_BASIC_START", "Invalid object reference."), ERRCODE_BASIC_INVALID_OBJECT },
+    { NC_("RID_BASIC_START", "Property or method not found: $(ARG1)."), ERRCODE_BASIC_NO_METHOD },
+    { NC_("RID_BASIC_START", "Object required."), ERRCODE_BASIC_NEEDS_OBJECT },
+    { NC_("RID_BASIC_START", "Invalid use of an object."), ERRCODE_BASIC_INVALID_USAGE_OBJECT },
+    { NC_("RID_BASIC_START", "OLE Automation is not supported by this object."), ERRCODE_BASIC_NO_OLE },
+    { NC_("RID_BASIC_START", "This property or method is not supported by the object."), ERRCODE_BASIC_BAD_METHOD },
+    { NC_("RID_BASIC_START", "OLE Automation Error."), ERRCODE_BASIC_OLE_ERROR },
+    { NC_("RID_BASIC_START", "This action is not supported by given object."), ERRCODE_BASIC_BAD_ACTION },
+    { NC_("RID_BASIC_START", "Named arguments are not supported by given object."), ERRCODE_BASIC_NO_NAMED_ARGS },
+    { NC_("RID_BASIC_START", "The current locale setting is not supported by the given object."), ERRCODE_BASIC_BAD_LOCALE },
+    { NC_("RID_BASIC_START", "Named argument not found."), ERRCODE_BASIC_NAMED_NOT_FOUND },
+    { NC_("RID_BASIC_START", "Argument is not optional."), ERRCODE_BASIC_NOT_OPTIONAL },
+    { NC_("RID_BASIC_START", "Invalid number of arguments."), ERRCODE_BASIC_WRONG_ARGS },
+    { NC_("RID_BASIC_START", "Object is not a list."), ERRCODE_BASIC_NOT_A_COLL },
+    { NC_("RID_BASIC_START", "Invalid ordinal number."), ERRCODE_BASIC_BAD_ORDINAL },
+    { NC_("RID_BASIC_START", "Specified DLL function not found."), ERRCODE_BASIC_DLLPROC_NOT_FOUND },
+    { NC_("RID_BASIC_START", "Invalid clipboard format."), ERRCODE_BASIC_BAD_CLIPBD_FORMAT },
+    { NC_("RID_BASIC_START", "Object does not have this property."), ERRCODE_BASIC_PROPERTY_NOT_FOUND },
+    { NC_("RID_BASIC_START", "Object does not have this method."), ERRCODE_BASIC_METHOD_NOT_FOUND },
+    { NC_("RID_BASIC_START", "Required argument lacking."), ERRCODE_BASIC_ARG_MISSING },
+    { NC_("RID_BASIC_START", "Invalid number of arguments."), ERRCODE_BASIC_BAD_NUMBER_OF_ARGS },
+    { NC_("RID_BASIC_START", "Error executing a method."), ERRCODE_BASIC_METHOD_FAILED },
+    { NC_("RID_BASIC_START", "Unable to set property."), ERRCODE_BASIC_SETPROP_FAILED },
+    { NC_("RID_BASIC_START", "Unable to determine property."), ERRCODE_BASIC_GETPROP_FAILED },
      // Compiler errors. These are not runtime errors.
-    { NC_("RID_BASIC_START", "Unexpected symbol: $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNEXPECTED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Expected: $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_EXPECTED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Symbol expected."), ErrCode(sal_uInt32(ERRCODE_BASIC_SYMBOL_EXPECTED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Variable expected."), ErrCode(sal_uInt32(ERRCODE_BASIC_VAR_EXPECTED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Label expected."), ErrCode(sal_uInt32(ERRCODE_BASIC_LABEL_EXPECTED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Value cannot be applied."), ErrCode(sal_uInt32(ERRCODE_BASIC_LVALUE_EXPECTED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Variable $(ARG1) already defined."), ErrCode(sal_uInt32(ERRCODE_BASIC_VAR_DEFINED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Sub procedure or function procedure $(ARG1) already defined."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROC_DEFINED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Label $(ARG1) already defined."), ErrCode(sal_uInt32(ERRCODE_BASIC_LABEL_DEFINED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Variable $(ARG1) not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNDEF_VAR) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Array or procedure $(ARG1) not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNDEF_ARRAY) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Procedure $(ARG1) not found."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNDEF_PROC) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Label $(ARG1) undefined."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNDEF_LABEL) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Unknown data type $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_UNDEF_TYPE) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Exit $(ARG1) expected."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_EXIT) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Statement block still open: $(ARG1) missing."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_BLOCK) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Parentheses do not match."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_BRACKETS) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Symbol $(ARG1) already defined differently."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_DECLARATION) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Parameters do not correspond to procedure."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_PARAMETERS) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Invalid character in number."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_CHAR_IN_NUMBER) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Array must be dimensioned."), ErrCode(sal_uInt32(ERRCODE_BASIC_MUST_HAVE_DIMS) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Else/Endif without If."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_IF) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "$(ARG1) not allowed within a procedure."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_IN_SUBR) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "$(ARG1) not allowed outside a procedure."), ErrCode(sal_uInt32(ERRCODE_BASIC_NOT_IN_MAIN) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Dimension specifications do not match."), ErrCode(sal_uInt32(ERRCODE_BASIC_WRONG_DIMS) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Unknown option: $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_BAD_OPTION) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Constant $(ARG1) redefined."), ErrCode(sal_uInt32(ERRCODE_BASIC_CONSTANT_REDECLARED) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Program too large."), ErrCode(sal_uInt32(ERRCODE_BASIC_PROG_TOO_LARGE) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Strings or arrays not permitted."), ErrCode(sal_uInt32(ERRCODE_BASIC_NO_STRINGS_ARRAYS) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "An exception occurred $(ARG1)."), ErrCode(sal_uInt32(ERRCODE_BASIC_EXCEPTION) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "This array is fixed or temporarily locked."), ErrCode(sal_uInt32(ERRCODE_BASIC_ARRAY_FIX) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Out of string space."), ErrCode(sal_uInt32(ERRCODE_BASIC_STRING_OVERFLOW) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Expression Too Complex."), ErrCode(sal_uInt32(ERRCODE_BASIC_EXPR_TOO_COMPLEX) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Can't perform requested operation."), ErrCode(sal_uInt32(ERRCODE_BASIC_OPER_NOT_PERFORM) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "Too many DLL application clients."), ErrCode(sal_uInt32(ERRCODE_BASIC_TOO_MANY_DLL) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "For loop not initialized."), ErrCode(sal_uInt32(ERRCODE_BASIC_LOOP_NOT_INIT) & ERRCODE_RES_MASK) },
-    { NC_("RID_BASIC_START", "$(ARG1)"), ErrCode(sal_uInt32(ERRCODE_BASIC_COMPAT) & ERRCODE_RES_MASK) },
+    { NC_("RID_BASIC_START", "Unexpected symbol: $(ARG1)."), ERRCODE_BASIC_UNEXPECTED },
+    { NC_("RID_BASIC_START", "Expected: $(ARG1)."), ERRCODE_BASIC_EXPECTED },
+    { NC_("RID_BASIC_START", "Symbol expected."), ERRCODE_BASIC_SYMBOL_EXPECTED },
+    { NC_("RID_BASIC_START", "Variable expected."), ERRCODE_BASIC_VAR_EXPECTED },
+    { NC_("RID_BASIC_START", "Label expected."), ERRCODE_BASIC_LABEL_EXPECTED },
+    { NC_("RID_BASIC_START", "Value cannot be applied."), ERRCODE_BASIC_LVALUE_EXPECTED },
+    { NC_("RID_BASIC_START", "Variable $(ARG1) already defined."), ERRCODE_BASIC_VAR_DEFINED },
+    { NC_("RID_BASIC_START", "Sub procedure or function procedure $(ARG1) already defined."), ERRCODE_BASIC_PROC_DEFINED },
+    { NC_("RID_BASIC_START", "Label $(ARG1) already defined."), ERRCODE_BASIC_LABEL_DEFINED },
+    { NC_("RID_BASIC_START", "Variable $(ARG1) not found."), ERRCODE_BASIC_UNDEF_VAR },
+    { NC_("RID_BASIC_START", "Array or procedure $(ARG1) not found."), ERRCODE_BASIC_UNDEF_ARRAY },
+    { NC_("RID_BASIC_START", "Procedure $(ARG1) not found."), ERRCODE_BASIC_UNDEF_PROC },
+    { NC_("RID_BASIC_START", "Label $(ARG1) undefined."), ERRCODE_BASIC_UNDEF_LABEL },
+    { NC_("RID_BASIC_START", "Unknown data type $(ARG1)."), ERRCODE_BASIC_UNDEF_TYPE },
+    { NC_("RID_BASIC_START", "Exit $(ARG1) expected."), ERRCODE_BASIC_BAD_EXIT },
+    { NC_("RID_BASIC_START", "Statement block still open: $(ARG1) missing."), ERRCODE_BASIC_BAD_BLOCK },
+    { NC_("RID_BASIC_START", "Parentheses do not match."), ERRCODE_BASIC_BAD_BRACKETS },
+    { NC_("RID_BASIC_START", "Symbol $(ARG1) already defined differently."), ERRCODE_BASIC_BAD_DECLARATION },
+    { NC_("RID_BASIC_START", "Parameters do not correspond to procedure."), ERRCODE_BASIC_BAD_PARAMETERS },
+    { NC_("RID_BASIC_START", "Invalid character in number."), ERRCODE_BASIC_BAD_CHAR_IN_NUMBER },
+    { NC_("RID_BASIC_START", "Array must be dimensioned."), ERRCODE_BASIC_MUST_HAVE_DIMS },
+    { NC_("RID_BASIC_START", "Else/Endif without If."), ERRCODE_BASIC_NO_IF },
+    { NC_("RID_BASIC_START", "$(ARG1) not allowed within a procedure."), ERRCODE_BASIC_NOT_IN_SUBR },
+    { NC_("RID_BASIC_START", "$(ARG1) not allowed outside a procedure."), ERRCODE_BASIC_NOT_IN_MAIN },
+    { NC_("RID_BASIC_START", "Dimension specifications do not match."), ERRCODE_BASIC_WRONG_DIMS },
+    { NC_("RID_BASIC_START", "Unknown option: $(ARG1)."), ERRCODE_BASIC_BAD_OPTION },
+    { NC_("RID_BASIC_START", "Constant $(ARG1) redefined."), ERRCODE_BASIC_CONSTANT_REDECLARED },
+    { NC_("RID_BASIC_START", "Program too large."), ERRCODE_BASIC_PROG_TOO_LARGE },
+    { NC_("RID_BASIC_START", "Strings or arrays not permitted."), ERRCODE_BASIC_NO_STRINGS_ARRAYS },
+    { NC_("RID_BASIC_START", "An exception occurred $(ARG1)."), ERRCODE_BASIC_EXCEPTION },
+    { NC_("RID_BASIC_START", "This array is fixed or temporarily locked."), ERRCODE_BASIC_ARRAY_FIX },
+    { NC_("RID_BASIC_START", "Out of string space."), ERRCODE_BASIC_STRING_OVERFLOW },
+    { NC_("RID_BASIC_START", "Expression Too Complex."), ERRCODE_BASIC_EXPR_TOO_COMPLEX },
+    { NC_("RID_BASIC_START", "Can't perform requested operation."), ERRCODE_BASIC_OPER_NOT_PERFORM },
+    { NC_("RID_BASIC_START", "Too many DLL application clients."), ERRCODE_BASIC_TOO_MANY_DLL },
+    { NC_("RID_BASIC_START", "For loop not initialized."), ERRCODE_BASIC_LOOP_NOT_INIT },
+    { NC_("RID_BASIC_START", "$(ARG1)"), ERRCODE_BASIC_COMPAT },
     { nullptr, ERRCODE_NONE }
 };
 

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 }
 };
 

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 }
 };