mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inline some ERRCODE_AREA aliases

Browse Source 
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>
This commit is contained in:
Noel Grandin 2017-06-22 09:35:58 +02:00
parent 52b6c64938
commit f871d0e7c9
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/editeng/editdata.hxx
View File

@ -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

11
include/vcl/errcode.hxx
View File

@ -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

2
sfx2/source/appl/appinit.cxx
View File

@ -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");

2
uui/source/iahndl-errorhandler.cxx
View File

@ -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) ?