comphelper/inc/comphelper/proxyaggregation.hxx | 4 +---
comphelper/source/misc/accessiblewrapper.cxx | 2 +-
comphelper/source/misc/proxyaggregation.cxx | 8 ++++----
3 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit 048e64e71fad3187d2165ed6eb0a42fdcd6e0caa
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Mar 28 15:35:05 2013 +0100
Drop redundant typedef
Change-Id: I13f1858babb1fb2b4120bcbf0e2e04a2a1f4bf88
diff --git a/comphelper/inc/comphelper/proxyaggregation.hxx
b/comphelper/inc/comphelper/proxyaggregation.hxx
index 2d78b86..2c01a7a 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 897f0fd..4996cb2 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 9a19cf5..86d0082 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();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
