summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2017-08-23 19:25:02 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-25 09:03:42 +0200
commit7ca950ec744b7af1d15724ec2abc296573a641e4 (patch)
treec224a4bb30c6379c4716035d3ae413bd91c0e26d /svx
parent5bd31bf44301fdb1938d38eae7317745f35d9db1 (diff)
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>
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/svxerr.hrc42
1 files changed, 21 insertions, 21 deletions
diff --git a/svx/inc/svxerr.hrc b/svx/inc/svxerr.hrc
index 65a80b73d8b7..cd43053542e0 100644
--- a/svx/inc/svxerr.hrc
+++ b/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 }
};