diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-22 09:35:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-23 08:58:33 +0200 |
| commit | f871d0e7c99d88b55c38a9878f3ef0bfec4eb089 (patch) | |
| tree | 42ea0722aed24eb088b69bc99fae77971a19f1ea | |
| parent | 52b6c6493837a6bdccffd16d06daba54e932bd07 (diff) | |
inline some ERRCODE_AREA aliases
and drop unused ERRCODE_AREA_OFA_END constant
Change-Id: Ic34ecda7f842c5db93807b3f21aa1062966ca523
Reviewed-on: https://gerrit.libreoffice.org/39089
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/editeng/editdata.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/errcode.hxx | 11 | ||||
| -rw-r--r-- | sfx2/source/appl/appinit.cxx | 2 | ||||
| -rw-r--r-- | uui/source/iahndl-errorhandler.cxx | 2 |
4 files changed, 5 insertions, 12 deletions
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx index be5cc4377077..7d8e931268c2 100644 --- a/include/editeng/editdata.hxx +++ b/include/editeng/editdata.hxx @@ -55,7 +55,7 @@ enum class EEAnchorMode { EDITENG_DLLPUBLIC extern const size_t EE_APPEND; // Error messages for Read / Write Method -#define EE_READWRITE_WRONGFORMAT ErrCode(SVSTREAM_ERRBASE_USER+1) +#define EE_READWRITE_WRONGFORMAT ErrCode(ERRCODE_AREA_SVX+1) #define EDITUNDO_REMOVECHARS 100 #define EDITUNDO_CONNECTPARAS 101 diff --git a/include/vcl/errcode.hxx b/include/vcl/errcode.hxx index 7e74594bdb75..da83195b9c73 100644 --- a/include/vcl/errcode.hxx +++ b/include/vcl/errcode.hxx @@ -144,15 +144,13 @@ inline std::ostream& operator<<(std::ostream& os, const ErrCode& err) #define ErrCode(X) (X) #endif -#define ERRCODE_AREA_TOOLS (0 << ERRCODE_AREA_SHIFT) +#define ERRCODE_AREA_IO (0 << ERRCODE_AREA_SHIFT) #define ERRCODE_AREA_SV (1 << ERRCODE_AREA_SHIFT) #define ERRCODE_AREA_SFX (2 << ERRCODE_AREA_SHIFT) #define ERRCODE_AREA_INET (3 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_IO ERRCODE_AREA_TOOLS #define ERRCODE_AREA_VCL (4 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_LIB1 (8 << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_SVX ERRCODE_AREA_LIB1 +#define ERRCODE_AREA_SVX (8 << ERRCODE_AREA_SHIFT) #define ERRCODE_AREA_SVX_END (ERRCODE_AREA_SO-1) #define ERRCODE_AREA_SO (9 << ERRCODE_AREA_SHIFT) #define ERRCODE_AREA_SO_END (ERRCODE_AREA_SBX-1) @@ -185,8 +183,6 @@ inline std::ostream& operator<<(std::ostream& os, const ErrCode& err) #define ERRCODE_AREA_SW ERRCODE_AREA_APP4 #define ERRCODE_AREA_SW_END (ERRCODE_AREA_APP5-1) -#define ERRCODE_AREA_OFA_END (ERRCODE_AREA_APP6-1) - #define ERRCODE_CLASS_NONE ( 0 << ERRCODE_CLASS_SHIFT) #define ERRCODE_CLASS_ABORT ( 1 << ERRCODE_CLASS_SHIFT) #define ERRCODE_CLASS_GENERAL ( 2 << ERRCODE_CLASS_SHIFT) @@ -279,9 +275,6 @@ inline std::ostream& operator<<(std::ostream& os, const ErrCode& err) #define SVSTREAM_DISK_FULL ERRCODE_IO_OUTOFSPACE -// For the EditEngine: -#define SVSTREAM_ERRBASE_USER ERRCODE_AREA_LIB1 - #define PRINTER_ABORT ERRCODE_IO_ABORT #define PRINTER_GENERALERROR ERRCODE_IO_GENERAL diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index e098600f70a6..931c0b3cbc70 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -211,7 +211,7 @@ void SfxApplication::Initialize_Impl() Help::EnableExtHelp(); pImpl->m_pToolsErrorHdl = new SfxErrorHandler( - RID_ERRHDL, ErrCode(ERRCODE_AREA_TOOLS), ErrCode(ERRCODE_AREA_LIB1)); + RID_ERRHDL, ErrCode(ERRCODE_AREA_IO), ErrCode(ERRCODE_AREA_SVX)); #if HAVE_FEATURE_SCRIPTING pImpl->pBasicResMgr = ResMgr::CreateResMgr("sb"); diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index 72236f972f25..b1a3acb331a3 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -157,7 +157,7 @@ UUIInteractionHelper::handleErrorHandlerRequest( RID_SVXERRCODE, RID_UUI_ERRHDL }; ErrCode nErrorId = nErrorCode.IgnoreWarning(); - Source eSource = nErrorId < ErrCode(ERRCODE_AREA_LIB1) ? + Source eSource = nErrorId < ErrCode(ERRCODE_AREA_SVX) ? SOURCE_DEFAULT : nErrorId >= ErrCode(ERRCODE_AREA_SVX) && nErrorId <= ErrCode(ERRCODE_AREA_SVX_END) ? |