diff options
| author | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
|---|---|---|
| committer | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
| commit | fa1f3c352c6126b24ab5af87ea4ebea742c546c2 (patch) | |
| tree | 5a5240e4969fee626bb060bd386fceb957081f90 /uui/source/iahndl-errorhandler.cxx | |
| parent | d0097a3f35e5e2c68d293d604a2f6f51b2d822a5 (diff) | |
| parent | 3c21373571fd0cf89391502aa132c5f420cd75c6 (diff) | |
removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xmloff, linguistic, vcl, svtools, accessibility, fpicker, uui and framework
Diffstat (limited to 'uui/source/iahndl-errorhandler.cxx')
| -rw-r--r-- | uui/source/iahndl-errorhandler.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index 3176171c4865..0e5b011c7bf2 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -48,7 +48,7 @@ using namespace com::sun::star; namespace { -USHORT +sal_uInt16 executeErrorDialog( Window * pParent, task::InteractionClassification eClassification, @@ -112,7 +112,7 @@ executeErrorDialog( uno::Reference< uno::XInterface >()); } - USHORT aResult = xBox->Execute(); + sal_uInt16 aResult = xBox->Execute(); switch( aResult ) { case BUTTONID_OK: @@ -164,7 +164,7 @@ UUIInteractionHelper::handleErrorHandlerRequest( CREATEVERSIONRESMGR_NAME(cnt), CREATEVERSIONRESMGR_NAME(svx), CREATEVERSIONRESMGR_NAME(uui) }; - static USHORT const aId[4] + static sal_uInt16 const aId[4] = { RID_ERRHDL, RID_CHAOS_START + 12, // cf. chaos/source/inc/cntrids.hrc, where @@ -276,7 +276,7 @@ UUIInteractionHelper::handleErrorHandlerRequest( } } - USHORT nResult = executeErrorDialog( + sal_uInt16 nResult = executeErrorDialog( getParentProperty(), eClassification, aContext, aMessage, nButtonMask ); switch (nResult) |