From 05e78bde26d8b8b257ed22a0ce20c5b386a629d1 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 7 Feb 2017 11:26:27 +0200 Subject: create ErrorHandlerFlags scoped enum for error handling flags Change-Id: I30c80979c87bad7bc98f36a158c31c88d80d1caf Reviewed-on: https://gerrit.libreoffice.org/33991 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/svtools/ehdl.hxx | 4 ++-- include/svtools/sfxecode.hxx | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'include/svtools') diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index cb73990d31ce..2865e26c8a6c 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -54,7 +54,7 @@ public: virtual ~SfxErrorHandler() override; protected: - bool GetErrorString(sal_uLong lErrId, OUString &, sal_uInt16&) const; + bool GetErrorString(sal_uLong lErrId, OUString &, ErrorHandlerFlags&) const; private: @@ -66,7 +66,7 @@ private: pFreeMgr; SVT_DLLPRIVATE static void GetClassString(sal_uLong lErrId, OUString &); - virtual bool CreateString( const ErrorInfo *, OUString &, sal_uInt16 &) const override; + virtual bool CreateString( const ErrorInfo *, OUString &, ErrorHandlerFlags &) const override; }; #endif diff --git a/include/svtools/sfxecode.hxx b/include/svtools/sfxecode.hxx index 99083f298ec3..77c3ee43bfaa 100644 --- a/include/svtools/sfxecode.hxx +++ b/include/svtools/sfxecode.hxx @@ -34,7 +34,6 @@ #define ERRCODE_SFX_WRONGPASSWORD (ERRCODE_AREA_SFX|ERRCODE_CLASS_READ|11) #define ERRCODE_SFX_DOCUMENTREADONLY (ERRCODE_AREA_SFX|ERRCODE_CLASS_WRITE|12) #define ERRCODE_SFX_OLEGENERAL (ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|14) -#define ERRCODE_SFXMSG_STYLEREPLACE (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|13) #define ERRCODE_SFX_TEMPLATENOTFOUND (ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|15) #define ERRCODE_SFX_ISRELATIVE (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NOTEXISTS|16) #define ERRCODE_SFX_FORCEDOCLOAD (ERRCODE_WARNING_MASK|ERRCODE_AREA_SFX|ERRCODE_CLASS_NONE|17) -- cgit