diff options
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/inc/comphelper/proxyaggregation.hxx | 4 | ||||
| -rw-r--r-- | comphelper/source/misc/accessiblewrapper.cxx | 2 | ||||
| -rw-r--r-- | comphelper/source/misc/proxyaggregation.cxx | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/comphelper/inc/comphelper/proxyaggregation.hxx b/comphelper/inc/comphelper/proxyaggregation.hxx index 2d78b865b547..2c01a7a3587f 100644 --- a/comphelper/inc/comphelper/proxyaggregation.hxx +++ b/comphelper/inc/comphelper/proxyaggregation.hxx @@ -175,10 +175,8 @@ namespace comphelper //========================================================================= //= OComponentProxyAggregation //========================================================================= - typedef ::cppu::WeakComponentImplHelperBase OComponentProxyAggregation_CBase; - class COMPHELPER_DLLPUBLIC OComponentProxyAggregation :public OBaseMutex - ,public OComponentProxyAggregation_CBase + ,public cppu::WeakComponentImplHelperBase ,public OComponentProxyAggregationHelper { protected: diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 897f0fd771c3..4996cb2d5d84 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -663,7 +663,7 @@ namespace comphelper void SAL_CALL OAccessibleContextWrapper::dispose() throw( RuntimeException ) { // simply disambiguate - OComponentProxyAggregation_CBase::dispose(); + WeakComponentImplHelperBase::dispose(); } //............................................................................. diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx index 9a19cf5c99d0..86d0082fbb2f 100644 --- a/comphelper/source/misc/proxyaggregation.cxx +++ b/comphelper/source/misc/proxyaggregation.cxx @@ -191,7 +191,7 @@ namespace comphelper //------------------------------------------------------------------------- OComponentProxyAggregation::OComponentProxyAggregation( const Reference< XComponentContext >& _rxContext, const Reference< XComponent >& _rxComponent ) - :OComponentProxyAggregation_CBase( m_aMutex ) + :WeakComponentImplHelperBase( m_aMutex ) ,OComponentProxyAggregationHelper( _rxContext, rBHelper ) { OSL_ENSURE( _rxComponent.is(), "OComponentProxyAggregation::OComponentProxyAggregation: accessible is no XComponent!" ); @@ -206,7 +206,7 @@ namespace comphelper } //------------------------------------------------------------------------- - IMPLEMENT_FORWARD_XINTERFACE2( OComponentProxyAggregation, OComponentProxyAggregation_CBase, OComponentProxyAggregationHelper ) + IMPLEMENT_FORWARD_XINTERFACE2( OComponentProxyAggregation, WeakComponentImplHelperBase, OComponentProxyAggregationHelper ) //------------------------------------------------------------------------- IMPLEMENT_GET_IMPLEMENTATION_ID( OComponentProxyAggregation ) @@ -216,7 +216,7 @@ namespace comphelper { Sequence< Type > aTypes( OComponentProxyAggregationHelper::getTypes() ); - // append XComponent, coming from OComponentProxyAggregation_CBase + // append XComponent, coming from WeakComponentImplHelperBase sal_Int32 nLen = aTypes.getLength(); aTypes.realloc( nLen + 1 ); aTypes[ nLen ] = ::getCppuType( static_cast< Reference< XComponent >* >( NULL ) ); @@ -256,7 +256,7 @@ namespace comphelper void SAL_CALL OComponentProxyAggregation::dispose() throw( RuntimeException ) { // simply disambiguate - OComponentProxyAggregation_CBase::dispose(); + WeakComponentImplHelperBase::dispose(); } |