diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2017-08-19 18:31:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-22 11:08:15 +0200 |
| commit | 158595543053c158a9bcb95f679e7b8a3c2e4e89 (patch) | |
| tree | d15d673725cc0f4644034957b8e521875eea51e4 /sw | |
| parent | 87848afb9981234071efa6e2c061e1e55a712654 (diff) | |
Convert ErrCode area to scoped enum
Change-Id: Ifa365bbac3c7eb21da9381ec8bb3be6b6785016b
Reviewed-on: https://gerrit.libreoffice.org/41402
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/error.hrc | 4 | ||||
| -rw-r--r-- | sw/inc/swerror.h | 40 | ||||
| -rw-r--r-- | sw/source/filter/ascii/parasc.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/app/swmodule.cxx | 4 |
4 files changed, 25 insertions, 25 deletions
diff --git a/sw/inc/error.hrc b/sw/inc/error.hrc index 77d6baa5ae64..9c054be65f71 100644 --- a/sw/inc/error.hrc +++ b/sw/inc/error.hrc @@ -24,8 +24,8 @@ #define NC_(Context, String) (Context "\004" u8##String) -#define ERR_CODE( class, err ) ErrCode(class | (sal_uInt32(err) - ERRCODE_AREA_SW)) -#define WARN_CODE( class, err ) ErrCode(class | (sal_uInt32(err) - (ERRCODE_AREA_SW | ERRCODE_WARNING_MASK))) +#define ERR_CODE( class, err ) ErrCode(ErrCodeArea::Sw, class | sal_uInt32(err)) +#define WARN_CODE( class, err ) ErrCode(ErrCodeArea::Sw, class | sal_uInt32(err)) const ErrMsgCode RID_SW_ERRHDL[] = { diff --git a/sw/inc/swerror.h b/sw/inc/swerror.h index a4094786be30..afa2a4ef660a 100644 --- a/sw/inc/swerror.h +++ b/sw/inc/swerror.h @@ -23,26 +23,26 @@ #include <vcl/errcode.hxx> // Import & Export -#define ERR_SWG_FILE_FORMAT_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_READ | 1 ) -#define ERR_SWG_READ_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_READ | 2 ) -#define ERR_WW6_NO_WW6_FILE_ERR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_READ | 8 ) -#define ERR_FORMAT_ROWCOL ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_READ | 12) -#define ERR_WW8_NO_WW8_FILE_ERR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_READ | 14) -#define ERR_FORMAT_FILE_ROWCOL ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_READ | 15) -#define ERR_SWG_WRITE_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_WRITE | 30 ) -#define ERR_SWG_OLD_GLOSSARY ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_WRITE | 31 ) -#define ERR_WRITE_ERROR_FILE ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_WRITE | 35 ) -#define ERR_SWG_INTERNAL_ERROR ErrCode(ERRCODE_AREA_SW | 50 ) -#define ERR_TXTBLOCK_NEWFILE_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_LOCKING | 55 ) -#define ERR_AUTOPATH_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_PATH | 55 ) -#define ERR_TBLSPLIT_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_NONE | 56 ) -#define ERR_TBLINSCOL_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_NONE | 57 ) -#define ERR_TBLDDECHG_ERROR ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_NONE | 58 ) -#define WARN_SWG_FEATURES_LOST ErrCode(ERRCODE_AREA_SW | ERRCODE_WARNING_MASK | 72 ) -#define WARN_SWG_POOR_LOAD ErrCode(ERRCODE_AREA_SW | ERRCODE_WARNING_MASK | ERRCODE_CLASS_WRITE | 74 ) -#define WARN_SWG_HTML_NO_MACROS ErrCode(ERRCODE_AREA_SW | ERRCODE_WARNING_MASK | ERRCODE_CLASS_WRITE | 75) -#define WARN_WRITE_ERROR_FILE ErrCode(ERRCODE_AREA_SW | ERRCODE_WARNING_MASK | ERRCODE_CLASS_WRITE | 76) -#define WARN_FORMAT_FILE_ROWCOL ErrCode(ERRCODE_AREA_SW | ERRCODE_WARNING_MASK | ERRCODE_CLASS_READ | 77) +#define ERR_SWG_FILE_FORMAT_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_READ | 1 ) +#define ERR_SWG_READ_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_READ | 2 ) +#define ERR_WW6_NO_WW6_FILE_ERR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_READ | 8 ) +#define ERR_FORMAT_ROWCOL ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_READ | 12) +#define ERR_WW8_NO_WW8_FILE_ERR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_READ | 14) +#define ERR_FORMAT_FILE_ROWCOL ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_READ | 15) +#define ERR_SWG_WRITE_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_WRITE | 30 ) +#define ERR_SWG_OLD_GLOSSARY ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_WRITE | 31 ) +#define ERR_WRITE_ERROR_FILE ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_WRITE | 35 ) +#define ERR_SWG_INTERNAL_ERROR ErrCode(ErrCodeArea::Sw, 50 ) +#define ERR_TXTBLOCK_NEWFILE_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_LOCKING | 55 ) +#define ERR_AUTOPATH_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_PATH | 55 ) +#define ERR_TBLSPLIT_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_NONE | 56 ) +#define ERR_TBLINSCOL_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_NONE | 57 ) +#define ERR_TBLDDECHG_ERROR ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_NONE | 58 ) +#define WARN_SWG_FEATURES_LOST ErrCode(ErrCodeArea::Sw, ERRCODE_WARNING_MASK | 72 ) +#define WARN_SWG_POOR_LOAD ErrCode(ErrCodeArea::Sw, ERRCODE_WARNING_MASK | ERRCODE_CLASS_WRITE | 74 ) +#define WARN_SWG_HTML_NO_MACROS ErrCode(ErrCodeArea::Sw, ERRCODE_WARNING_MASK | ERRCODE_CLASS_WRITE | 75) +#define WARN_WRITE_ERROR_FILE ErrCode(ErrCodeArea::Sw, ERRCODE_WARNING_MASK | ERRCODE_CLASS_WRITE | 76) +#define WARN_FORMAT_FILE_ROWCOL ErrCode(ErrCodeArea::Sw, ERRCODE_WARNING_MASK | ERRCODE_CLASS_READ | 77) #endif diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 8aa20bea92aa..3846182a7034 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -284,7 +284,7 @@ ErrCode SwASCIIParser::ReadChars() hConverter = rtl_createTextToUnicodeConverter( currentCharSet ); OSL_ENSURE( hConverter, "no string convert available" ); if (!hConverter) - return ErrCode(ERRCODE_AREA_SW | ERRCODE_CLASS_READ); + return ErrCode(ErrCodeArea::Sw, ERRCODE_CLASS_READ); bSwapUnicode = false; hContext = rtl_createTextToUnicodeContext( hConverter ); } diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 636098cbd202..962f7e7f14f1 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -172,8 +172,8 @@ SwModule::SwModule( SfxObjectFactory* pWebFact, SetName( "StarWriter" ); SvxErrorHandler::ensure(); m_pErrorHandler = new SfxErrorHandler( RID_SW_ERRHDL, - ErrCode(ERRCODE_AREA_SW), - ErrCode(ERRCODE_AREA_SW_END), + ErrCodeArea::Sw, + ErrCodeArea::Sw, GetResLocale() ); m_pModuleConfig = new SwModuleOptions; |