cppu/inc/com/sun/star/uno/Reference.hxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a842b5690e77de51d933bd9a4224303abba1d870
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Sun Sep 30 19:59:02 2012 +0200
Make Reference::iset_throw work with multiple-inheritance interfaces
Change-Id: Ia8a644c613de17279abdab533a6314ba6c0e0aec
diff --git a/cppu/inc/com/sun/star/uno/Reference.hxx
b/cppu/inc/com/sun/star/uno/Reference.hxx
index 100a430..aa39810 100644
--- a/cppu/inc/com/sun/star/uno/Reference.hxx
+++ b/cppu/inc/com/sun/star/uno/Reference.hxx
@@ -91,7 +91,7 @@ inline interface_type * Reference< interface_type
>::iset_throw(
{
if (pInterface)
{
- pInterface->acquire();
+ castToXInterface(pInterface)->acquire();
return pInterface;
}
throw RuntimeException(
@@ -184,13 +184,13 @@ inline Reference< interface_type >::Reference( const Any
& rAny, UnoReference_Qu
template< class interface_type >
inline Reference< interface_type >::Reference( const Reference< interface_type
> & rRef, UnoReference_SetThrow ) SAL_THROW( (RuntimeException) )
{
- _pInterface = iset_throw( rRef.get() );
+ _pInterface = castToXInterface( iset_throw( rRef.get() ) );
}
//__________________________________________________________________________________________________
template< class interface_type >
inline Reference< interface_type >::Reference( interface_type * pInterface,
UnoReference_SetThrow ) SAL_THROW( (RuntimeException) )
{
- _pInterface = iset_throw( pInterface );
+ _pInterface = castToXInterface( iset_throw( pInterface ) );
}
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
