diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 21:57:21 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 21:57:21 +0000 |
| commit | ff14c046896fb3aea917bd00292cbd651385383d (patch) | |
| tree | 660c829f6e8e7ac9e250ee0693c947698c402ac5 | |
| parent | ed1d9c4291e0974f923efec7c04c0e6e90bb97b6 (diff) | |
INTEGRATION: CWS warnings01 (1.10.26); FILE MERGED
2005/11/14 10:36:06 pl 1.10.26.2: #i55991# removed warnings
2005/10/25 15:56:06 mt 1.10.26.1: #i55991# Warning Free Code
| -rw-r--r-- | toolkit/inc/toolkit/helper/macros.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/toolkit/inc/toolkit/helper/macros.hxx index b43f91155474..29d085117ba9 100644 --- a/toolkit/inc/toolkit/helper/macros.hxx +++ b/toolkit/inc/toolkit/helper/macros.hxx @@ -4,9 +4,9 @@ * * $RCSfile: macros.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2005-09-09 12:55:43 $ + * last change: $Author: hr $ $Date: 2006-06-19 22:57:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -43,7 +43,7 @@ sal_Int64 ClassName::getSomething( const ::com::sun::star::uno::Sequence< sal_In { \ if( ( rIdentifier.getLength() == 16 ) && ( 0 == rtl_compareMemory( ClassName::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) \ { \ - return (sal_Int64)this; \ + return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(this)); \ } \ return 0; \ } \ @@ -65,7 +65,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& ClassName::GetUnoTunnelId() t ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw() \ { \ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( rxIFace, ::com::sun::star::uno::UNO_QUERY ); \ - return xUT.is() ? (ClassName*)xUT->getSomething( ClassName::GetUnoTunnelId() ) : NULL; \ + return xUT.is() ? reinterpret_cast<ClassName*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( ClassName::GetUnoTunnelId() ))) : NULL; \ } #define IMPL_XUNOTUNNEL2( ClassName, BaseClass ) \ @@ -73,7 +73,7 @@ sal_Int64 ClassName::getSomething( const ::com::sun::star::uno::Sequence< sal_In { \ if( ( rIdentifier.getLength() == 16 ) && ( 0 == rtl_compareMemory( ClassName::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) \ { \ - return (sal_Int64)this; \ + return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(this)); \ } \ return BaseClass::getSomething( rIdentifier ); \ } \ @@ -95,7 +95,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& ClassName::GetUnoTunnelId() t ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw() \ { \ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( rxIFace, ::com::sun::star::uno::UNO_QUERY ); \ - return xUT.is() ? (ClassName*)xUT->getSomething( ClassName::GetUnoTunnelId() ) : NULL; \ + return xUT.is() ? reinterpret_cast<ClassName*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( ClassName::GetUnoTunnelId() ))) : NULL; \ } // ------------------------------------------------------------------------------------- @@ -198,9 +198,9 @@ void ClassName::disposing( const ::com::sun::star::lang::EventObject& ) throw(:: #endif #define IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ClassName, InterfaceName, MethodName, EventType ) \ -void ClassName::MethodName( const EventType& e ) throw(::com::sun::star::uno::RuntimeException) \ +void ClassName::MethodName( const EventType& evt ) throw(::com::sun::star::uno::RuntimeException) \ { \ - EventType aMulti( e ); \ + EventType aMulti( evt ); \ aMulti.Source = &GetContext(); \ ::cppu::OInterfaceIteratorHelper aIt( *this ); \ while( aIt.hasMoreElements() ) \ |