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.hxx | |
| 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.hxx')
| -rwxr-xr-x | uui/source/iahndl.hxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 581099462845..bc7273432c66 100755 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -39,7 +39,7 @@ #include "com/sun/star/beans/Optional.hpp" #include "com/sun/star/task/InteractionClassification.hpp" -#include "tools/solar.h" // USHORT +#include "tools/solar.h" // sal_uInt16 #include "tools/errcode.hxx" // ErrCode #include "tools/rc.hxx" // Resource #include "vcl/wintypes.hxx" // WinBits @@ -215,8 +215,6 @@ private: com::sun::star::task::XInteractionRequest > const & rRequest) SAL_THROW((com::sun::star::uno::RuntimeException)); -// @@@ Todo #i29340#: activate! -#if 0 void handleNameClashResolveRequest( com::sun::star::ucb::NameClashResolveRequest const & rRequest, @@ -225,7 +223,6 @@ private: com::sun::star::task::XInteractionContinuation > > const & rContinuations) SAL_THROW((com::sun::star::uno::RuntimeException)); -#endif bool handleMasterPasswordRequest( |