summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2017-08-23 19:56:49 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-27 14:45:43 +0200
commit243c371b77f7b02d9b4cdf775a6d07ef5d67ead3 (patch)
tree28f8c313a781c2d6ff1981d5f243b6002e05189c
parentb312834555658064dd9491484695f84959e0b059 (diff)
remove some unused svx error codes
which seem to be unused ever since initial import Change-Id: I19460961876c73a0754c54b1a5c0ff8cc6311e4e Reviewed-on: https://gerrit.libreoffice.org/41490 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--include/svx/svxerr.hxx13
-rw-r--r--svx/inc/svxerr.hrc16
2 files changed, 2 insertions, 27 deletions
diff --git a/include/svx/svxerr.hxx b/include/svx/svxerr.hxx
index e1a8b6438598..cd0e72560d19 100644
--- a/include/svx/svxerr.hxx
+++ b/include/svx/svxerr.hxx
@@ -20,17 +20,13 @@
#define INCLUDED_SVX_SVXERR_HXX
#include <vcl/errcode.hxx>
+#include <svtools/ehdl.hxx>
+#include <svx/svxdllapi.h>
-#define ERRCODE_SVX_LINGU_THESAURUSNOTEXISTS ErrCode( ErrCodeArea::Svx, 1UL | ERRCODE_CLASS_NOTEXISTS)
#define ERRCODE_SVX_LINGU_LINGUNOTEXISTS ErrCode( ErrCodeArea::Svx, 3UL | ERRCODE_CLASS_NOTEXISTS )
-#define ERRCODE_SVX_LINGU_HYPHENNOTEXISTS ErrCode( ErrCodeArea::Svx, 4UL | ERRCODE_CLASS_NOTEXISTS )
-#define ERRCODE_SVX_LINGU_DICT_NOTREADABLE ErrCode( ErrCodeArea::Svx, 5UL | ERRCODE_CLASS_READ )
#define ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE ErrCode( ErrCodeArea::Svx, 6UL | ERRCODE_CLASS_WRITE )
#define ERRCODE_SVX_GRAPHIC_NOTREADABLE ErrCode( ErrCodeArea::Svx, 7UL | ERRCODE_CLASS_READ )
#define ERRCODE_SVX_LINGU_NOLANGUAGE ErrCode( ErrCodeArea::Svx, 9UL | ERRCODE_CLASS_NOTEXISTS )
-#define ERRCODE_SVX_FORMS_NOIOSERVICES ErrCode( ErrCodeArea::Svx, 10UL )
-#define ERRCODE_SVX_FORMS_READWRITEFAILED ErrCode( ErrCodeArea::Svx, 11UL )
-#define ERRCODE_SVX_BULLETITEM_NOBULLET ErrCode( ErrCodeArea::Svx, 12UL )
#define ERRCODE_SVX_MODIFIED_VBASIC_STORAGE ErrCode( ErrCodeArea::Svx, 13UL | ERRCODE_CLASS_WRITE | ERRCODE_WARNING_MASK )
#define ERRCODE_SVX_VBASIC_STORAGE_EXIST ErrCode( ErrCodeArea::Svx, 14UL | ERRCODE_CLASS_WRITE | ERRCODE_WARNING_MASK )
/** Error message: "Wrong password." */
@@ -51,11 +47,6 @@
#define ERRCTX_SVX_BACKGROUND 5
#define ERRCTX_SVX_IMPORT_GRAPHIC 6
-// class SvxErrorHandler -------------------------------------------------
-
-#include <svtools/ehdl.hxx>
-#include <svx/svxdllapi.h>
-
class SVX_DLLPUBLIC SvxErrorHandler : private SfxErrorHandler
{
public:
diff --git a/svx/inc/svxerr.hrc b/svx/inc/svxerr.hrc
index 9daf310c5c7d..0259fa403bfb 100644
--- a/svx/inc/svxerr.hrc
+++ b/svx/inc/svxerr.hrc
@@ -48,16 +48,10 @@ const ErrMsgCode RID_SVXERRCTX[] =
// Error-Code ------------------------------------------------------------
const ErrMsgCode RID_SVXERRCODE[] =
{
- { NC_("RID_SVXERRCODE", "No thesaurus available for the current language.\nPlease check your installation and install the desired language.") ,
- 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\nor activate it under 'Tools - Options - Language Settings - Writing Aids'."),
ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS },
{ NC_("RID_SVXERRCODE", "Spellcheck is not available.") ,
ERRCODE_SVX_LINGU_LINGUNOTEXISTS },
- { NC_("RID_SVXERRCODE", "Hyphenation not available.") ,
- ERRCODE_SVX_LINGU_HYPHENNOTEXISTS },
- { NC_("RID_SVXERRCODE", "The custom dictionary $(ARG1) cannot be read.") ,
- ERRCODE_SVX_LINGU_DICT_NOTREADABLE },
{ NC_("RID_SVXERRCODE", "The custom dictionary $(ARG1) cannot be created.") ,
ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE },
{ NC_("RID_SVXERRCODE", "The graphic $(ARG1) could not be found.") ,
@@ -66,16 +60,6 @@ const ErrMsgCode RID_SVXERRCODE[] =
ERRCODE_SVX_GRAPHIC_WRONG_FILEFORMAT },
{ NC_("RID_SVXERRCODE", "A language has not been fixed for the selected term."),
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."),
- ErrCode((sal_uInt32(ERRCODE_SVX_FORMS_NOIOSERVICES) | ERRCODE_CLASS_WRITE) & ERRCODE_RES_MASK) },
- { NC_("RID_SVXERRCODE", "An error occurred while reading the form controls. The form layer has not been loaded."),
- ErrCode((sal_uInt32(ERRCODE_SVX_FORMS_READWRITEFAILED) | ERRCODE_CLASS_READ) & ERRCODE_RES_MASK) },
- { NC_("RID_SVXERRCODE", "An error occurred while writing the form controls. The form layer has not been saved."),
- ErrCode((sal_uInt32(ERRCODE_SVX_FORMS_READWRITEFAILED) | ERRCODE_CLASS_WRITE) & ERRCODE_RES_MASK) },
- { 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_SVX_MODIFIED_VBASIC_STORAGE },
{ NC_("RID_SVXERRCODE", "The original VBA Basic Code contained in the document will not be saved."),