diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 10:38:14 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 10:38:14 +0000 |
| commit | 6dc9b12523c4aab2d7ed559c069cec5da247f7a0 (patch) | |
| tree | a3833eb039f96dc37f78036b8cc04bef52c0ef95 | |
| parent | 0e33c7b7911637fce339ca06dbb628ca4eb8408d (diff) | |
INTEGRATION: CWS warnings01 (1.4.32); FILE MERGED
2005/10/28 14:48:44 cd 1.4.32.1: #i55991# Warning free code changes for gcc
| -rw-r--r-- | framework/source/uielement/itemcontainer.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/uielement/itemcontainer.cxx b/framework/source/uielement/itemcontainer.cxx index 39be55da4993..75a7fb5901ad 100644 --- a/framework/source/uielement/itemcontainer.cxx +++ b/framework/source/uielement/itemcontainer.cxx @@ -4,9 +4,9 @@ * * $RCSfile: itemcontainer.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-09 01:54:04 $ + * last change: $Author: hr $ $Date: 2006-06-19 11:38:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -187,9 +187,8 @@ Reference< XIndexAccess > ItemContainer::deepCopyContainer( const Reference< XIn sal_Int64 ItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException) { if( ( rIdentifier.getLength() == 16 ) && ( 0 == rtl_compareMemory( ItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) - { - return (sal_Int64)this; - } + return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this )); + return 0; } @@ -212,7 +211,8 @@ const Sequence< sal_Int8 >& ItemContainer::GetUnoTunnelId() throw() ItemContainer* ItemContainer::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() ? (ItemContainer*)xUT->getSomething( ItemContainer::GetUnoTunnelId() ) : NULL; + return xUT.is() ? reinterpret_cast< ItemContainer* >(sal::static_int_cast< sal_IntPtr >( + xUT->getSomething( ItemContainer::GetUnoTunnelId() ))) : NULL; } // XElementAccess |