include/tools/errcode.hxx | 2 -- uui/source/iahndl-errorhandler.cxx | 12 +++--------- 2 files changed, 3 insertions(+), 11 deletions(-)
New commits: commit 5ddf5d8dc60cdc44515e5f551bf1a61a4f1e62bc Author: Caolán McNamara <[email protected]> Date: Mon Feb 6 19:40:10 2017 +0000 there is no cnt (chaos) resource file anymore Change-Id: I97f0606c6003ca12c651841ec26145728fc5c808 diff --git a/include/tools/errcode.hxx b/include/tools/errcode.hxx index f9859d38..6eaef4b 100644 --- a/include/tools/errcode.hxx +++ b/include/tools/errcode.hxx @@ -97,8 +97,6 @@ inline sal_uInt32 ERRCODE_TOERROR( ErrCode x ) #define ERRCODE_AREA_UUI_END CAST_TO_UINT32((14UL << ERRCODE_AREA_SHIFT) - 1) #define ERRCODE_AREA_LIB2 CAST_TO_UINT32(14UL << ERRCODE_AREA_SHIFT) #define ERRCODE_AREA_LIB2_END CAST_TO_UINT32((15UL << ERRCODE_AREA_SHIFT) - 1) -#define ERRCODE_AREA_CHAOS CAST_TO_UINT32(15UL << ERRCODE_AREA_SHIFT) -#define ERRCODE_AREA_CHAOS_END CAST_TO_UINT32((16UL << ERRCODE_AREA_SHIFT) - 1) #define ERRCODE_AREA_APP1 CAST_TO_UINT32(32UL << ERRCODE_AREA_SHIFT) #define ERRCODE_AREA_APP2 CAST_TO_UINT32(40UL << ERRCODE_AREA_SHIFT) diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index 856bdef..a549cc2 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -151,21 +151,15 @@ UUIInteractionHelper::handleErrorHandlerRequest( OUString aMessage; { - enum Source { SOURCE_DEFAULT, SOURCE_CNT, SOURCE_SVX, SOURCE_UUI }; - static char const * const aManager[4] = { "ofa", "cnt", "svx", "uui" }; - static sal_uInt16 const aId[4] + enum Source { SOURCE_DEFAULT, SOURCE_SVX, SOURCE_UUI }; + static char const * const aManager[3] = { "ofa", "svx", "uui" }; + static sal_uInt16 const aId[3] = { RID_ERRHDL, - RID_CHAOS_START + 12, - // cf. chaos/source/inc/cntrids.hrc, where - // #define RID_CHAOS_ERRHDL (RID_CHAOS_START + 12) RID_SVXERRCODE, RID_UUI_ERRHDL }; ErrCode nErrorId = nErrorCode & ~ERRCODE_WARNING_MASK; Source eSource = nErrorId < ERRCODE_AREA_LIB1 ? SOURCE_DEFAULT : - nErrorId >= ERRCODE_AREA_CHAOS - && nErrorId < ERRCODE_AREA_CHAOS_END ? - SOURCE_CNT : nErrorId >= ERRCODE_AREA_SVX && nErrorId <= ERRCODE_AREA_SVX_END ? SOURCE_SVX :
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
