cppu/source/threadpool/threadpool.cxx | 2 +-
cppu/source/typelib/static_types.cxx | 2 +-
cppu/source/typelib/typelib.cxx | 2 +-
cppu/source/uno/destr.hxx | 2 +-
cppu/source/uno/lbenv.cxx | 2 +-
cppu/source/uno/lbmap.cxx | 2 +-
cppu/source/uno/prim.hxx | 2 +-
cppuhelper/source/propshlp.cxx | 10 +++++-----
cppuhelper/source/weak.cxx | 2 +-
include/cppuhelper/compbase1.hxx | 6 +++---
include/cppuhelper/compbase10.hxx | 6 +++---
include/cppuhelper/compbase11.hxx | 6 +++---
include/cppuhelper/compbase12.hxx | 6 +++---
include/cppuhelper/compbase2.hxx | 6 +++---
include/cppuhelper/compbase3.hxx | 6 +++---
include/cppuhelper/compbase4.hxx | 6 +++---
include/cppuhelper/compbase5.hxx | 6 +++---
include/cppuhelper/compbase6.hxx | 6 +++---
include/cppuhelper/compbase7.hxx | 6 +++---
include/cppuhelper/compbase8.hxx | 6 +++---
include/cppuhelper/compbase9.hxx | 6 +++---
include/cppuhelper/implbase1.hxx | 8 ++++----
include/cppuhelper/implbase10.hxx | 22 +++++++++++-----------
include/cppuhelper/implbase11.hxx | 24 ++++++++++++------------
include/cppuhelper/implbase12.hxx | 26 +++++++++++++-------------
include/cppuhelper/implbase13.hxx | 28 ++++++++++++++--------------
include/cppuhelper/implbase2.hxx | 10 +++++-----
include/cppuhelper/implbase3.hxx | 12 ++++++------
include/cppuhelper/implbase4.hxx | 14 +++++++-------
include/cppuhelper/implbase5.hxx | 12 ++++++------
include/cppuhelper/implbase6.hxx | 14 +++++++-------
include/cppuhelper/implbase7.hxx | 16 ++++++++--------
include/cppuhelper/implbase8.hxx | 22 +++++++++++-----------
include/cppuhelper/implbase9.hxx | 20 ++++++++++----------
include/cppuhelper/implbase_ex.hxx | 5 +++++
include/cppuhelper/interfacecontainer.hxx | 14 +++++++-------
include/uno/mapping.hxx | 2 +-
37 files changed, 176 insertions(+), 171 deletions(-)
New commits:
commit 9685276b975aa37d16ba81dd8294b5717e3823df
Author: Noel Grandin <n...@peralex.com>
Date: Thu Sep 11 15:25:48 2014 +0200
cppu and cppuhelper: loplugin: cstylecast
Add a macro in include/cppuhelper/implbase_ex.hxx
to make initialising the type_entry classes a little less verbose.
Change-Id: I0904b5b9db269c92bc89e7ce3d6c8b09350c9897
diff --git a/cppu/source/threadpool/threadpool.cxx
b/cppu/source/threadpool/threadpool.cxx
index b0e64ff..c54b539 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -381,7 +381,7 @@ struct uno_ThreadPool_Hash
{
sal_Size operator () ( const uno_ThreadPool &a ) const
{
- return (sal_Size) a;
+ return reinterpret_cast<sal_Size>( a );
}
};
diff --git a/cppu/source/typelib/static_types.cxx
b/cppu/source/typelib/static_types.cxx
index 3886745..82640a0 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -70,7 +70,7 @@ struct AlignSize_Impl
#endif
// the value of the maximal alignment
-static sal_Int32 nMaxAlignment = (sal_Int32)( (sal_Size)(&((AlignSize_Impl *)
16)->dDouble) - 16);
+static sal_Int32 nMaxAlignment = (sal_Int32)(
reinterpret_cast<sal_Size>(&(reinterpret_cast<AlignSize_Impl *>(16))->dDouble)
- 16);
static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment )
{
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 7a6ec94..09fa10f 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -79,7 +79,7 @@ struct AlignSize_Impl
#endif
// the value of the maximal alignment
-static sal_Int32 nMaxAlignment = (sal_Int32)( (sal_Size)(&((AlignSize_Impl *)
16)->dDouble) - 16);
+static sal_Int32 nMaxAlignment = (sal_Int32)(
reinterpret_cast<sal_Size>(&(reinterpret_cast<AlignSize_Impl *>(16))->dDouble)
- 16);
static inline sal_Int32 adjustAlignment( sal_Int32 nRequestedAlignment )
{
diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx
index 46a71c2..9cce1c6 100644
--- a/cppu/source/uno/destr.hxx
+++ b/cppu/source/uno/destr.hxx
@@ -129,7 +129,7 @@ inline void _destructAny(
break;
}
#if OSL_DEBUG_LEVEL > 0
- pAny->pData = (void *)0xdeadbeef;
+ pAny->pData = reinterpret_cast<void *>(0xdeadbeef);
#endif
::typelib_typedescriptionreference_release( pType );
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index c38a9b7..5adecc3 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -98,7 +98,7 @@ struct FctPtrHash :
public ::std::unary_function< const void *, ::std::size_t >
{
::std::size_t operator () ( const void * pKey ) const
- { return (::std::size_t) pKey; }
+ { return reinterpret_cast<::std::size_t>( pKey ); }
};
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 162f438..7c0d765 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -129,7 +129,7 @@ struct FctOUStringHash : public std::unary_function< const
OUString &, size_t >
struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t >
{
size_t operator()( uno_Mapping * pKey ) const
- { return (size_t)pKey; }
+ { return reinterpret_cast<size_t>(pKey); }
};
typedef boost::unordered_map<
diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx
index 265e2cd..545f239 100644
--- a/cppu/source/uno/prim.hxx
+++ b/cppu/source/uno/prim.hxx
@@ -134,7 +134,7 @@ inline typelib_TypeDescriptionReference * _getVoidType()
#if OSL_DEBUG_LEVEL > 0
#define CONSTRUCT_EMPTY_ANY( pAny ) \
(pAny)->pType = _getVoidType(); \
-(pAny)->pData = (void *)0xdeadbeef;
+(pAny)->pData = reinterpret_cast<void *>(0xdeadbeef);
#else
#define CONSTRUCT_EMPTY_ANY( pAny ) \
(pAny)->pType = _getVoidType(); \
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 94500ba..c57a61d 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -701,12 +701,12 @@ void OPropertySetHelper::fire
{
if( bVetoable ) // fire change Events?
{
- ((XVetoableChangeListener
*)pL)->vetoableChange(
+ static_cast<XVetoableChangeListener
*>(pL)->vetoableChange(
pEvts[i] );
}
else
{
- ((XPropertyChangeListener
*)pL)->propertyChange(
+ static_cast<XPropertyChangeListener
*>(pL)->propertyChange(
pEvts[i] );
}
}
@@ -753,12 +753,12 @@ void OPropertySetHelper::fire
{
if( bVetoable ) // fire change Events?
{
- ((XVetoableChangeListener
*)pL)->vetoableChange(
+ static_cast<XVetoableChangeListener
*>(pL)->vetoableChange(
pEvts[i] );
}
else
{
- ((XPropertyChangeListener
*)pL)->propertyChange(
+ static_cast<XPropertyChangeListener
*>(pL)->propertyChange(
pEvts[i] );
}
}
@@ -798,7 +798,7 @@ void OPropertySetHelper::fire
while( aIt.hasMoreElements() )
{
XPropertiesChangeListener * pL =
- (XPropertiesChangeListener *)aIt.next();
+ static_cast<XPropertiesChangeListener *>(aIt.next());
try
{
try
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index 65018b7..57ae161 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -109,7 +109,7 @@ void SAL_CALL OWeakConnectionPoint::dispose()
throw(::com::sun::star::uno::Runti
{
try
{
- ((XReference *)aIt.next())->dispose();
+ static_cast<XReference *>(aIt.next())->dispose();
}
catch (com::sun::star::lang::DisposedException &) {}
catch (RuntimeException &)
diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx
index 449409e..b710ecc 100644
--- a/include/cppuhelper/compbase1.hxx
+++ b/include/cppuhelper/compbase1.hxx
@@ -51,7 +51,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -89,7 +89,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -131,7 +131,7 @@ namespace cppu
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return WeakAggComponentImplHelperBase::queryInterface( rType ); }
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, (WeakAggComponentImplHelperBase *)this ); }
+ { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase10.hxx
b/include/cppuhelper/compbase10.hxx
index 3c03b02..2e9cb53 100644
--- a/include/cppuhelper/compbase10.hxx
+++ b/include/cppuhelper/compbase10.hxx
@@ -51,7 +51,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -89,7 +89,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -131,7 +131,7 @@ namespace cppu
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return WeakAggComponentImplHelperBase::queryInterface( rType ); }
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, (WeakAggComponentImplHelperBase *)this ); }
+ { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase11.hxx
b/include/cppuhelper/compbase11.hxx
index 4eb4410b..873fb1d 100644
--- a/include/cppuhelper/compbase11.hxx
+++ b/include/cppuhelper/compbase11.hxx
@@ -51,7 +51,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -89,7 +89,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -131,7 +131,7 @@ namespace cppu
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return WeakAggComponentImplHelperBase::queryInterface( rType ); }
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, (WeakAggComponentImplHelperBase *)this ); }
+ { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase12.hxx
b/include/cppuhelper/compbase12.hxx
index 5c82466..25222bf 100644
--- a/include/cppuhelper/compbase12.hxx
+++ b/include/cppuhelper/compbase12.hxx
@@ -51,7 +51,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -89,7 +89,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -131,7 +131,7 @@ namespace cppu
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return WeakAggComponentImplHelperBase::queryInterface( rType ); }
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, (WeakAggComponentImplHelperBase *)this ); }
+ { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase2.hxx b/include/cppuhelper/compbase2.hxx
index 380ca4e..02b7db3 100644
--- a/include/cppuhelper/compbase2.hxx
+++ b/include/cppuhelper/compbase2.hxx
@@ -51,7 +51,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -89,7 +89,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -132,7 +132,7 @@ namespace cppu
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return WeakAggComponentImplHelperBase::queryInterface( rType ); }
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, (WeakAggComponentImplHelperBase *)this ); }
+ { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase3.hxx b/include/cppuhelper/compbase3.hxx
index 230c5f8..e32deec 100644
--- a/include/cppuhelper/compbase3.hxx
+++ b/include/cppuhelper/compbase3.hxx
@@ -51,7 +51,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -89,7 +89,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -131,7 +131,7 @@ namespace cppu
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return WeakAggComponentImplHelperBase::queryInterface( rType ); }
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, (WeakAggComponentImplHelperBase *)this ); }
+ { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase4.hxx b/include/cppuhelper/compbase4.hxx
index 64bfb717..de1a3b7 100644
--- a/include/cppuhelper/compbase4.hxx
+++ b/include/cppuhelper/compbase4.hxx
@@ -51,7 +51,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -89,7 +89,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -131,7 +131,7 @@ namespace cppu
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return WeakAggComponentImplHelperBase::queryInterface( rType ); }
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, (WeakAggComponentImplHelperBase *)this ); }
+ { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase5.hxx b/include/cppuhelper/compbase5.hxx
index 99bff1e..250b557 100644
--- a/include/cppuhelper/compbase5.hxx
+++ b/include/cppuhelper/compbase5.hxx
@@ -51,7 +51,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -89,7 +89,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -131,7 +131,7 @@ namespace cppu
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return WeakAggComponentImplHelperBase::queryInterface( rType ); }
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, (WeakAggComponentImplHelperBase *)this ); }
+ { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase6.hxx b/include/cppuhelper/compbase6.hxx
index 8c2a215..39c10e7 100644
--- a/include/cppuhelper/compbase6.hxx
+++ b/include/cppuhelper/compbase6.hxx
@@ -51,7 +51,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -89,7 +89,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -131,7 +131,7 @@ namespace cppu
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return WeakAggComponentImplHelperBase::queryInterface( rType ); }
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, (WeakAggComponentImplHelperBase *)this ); }
+ { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase7.hxx b/include/cppuhelper/compbase7.hxx
index f84c3ea..15c8330 100644
--- a/include/cppuhelper/compbase7.hxx
+++ b/include/cppuhelper/compbase7.hxx
@@ -51,7 +51,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -89,7 +89,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -131,7 +131,7 @@ namespace cppu
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return WeakAggComponentImplHelperBase::queryInterface( rType ); }
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, (WeakAggComponentImplHelperBase *)this ); }
+ { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase8.hxx b/include/cppuhelper/compbase8.hxx
index e4f80ea..2bbc00e 100644
--- a/include/cppuhelper/compbase8.hxx
+++ b/include/cppuhelper/compbase8.hxx
@@ -51,7 +51,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -89,7 +89,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -131,7 +131,7 @@ namespace cppu
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return WeakAggComponentImplHelperBase::queryInterface( rType ); }
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, (WeakAggComponentImplHelperBase *)this ); }
+ { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/compbase9.hxx b/include/cppuhelper/compbase9.hxx
index 235c364..ac269a4 100644
--- a/include/cppuhelper/compbase9.hxx
+++ b/include/cppuhelper/compbase9.hxx
@@ -51,7 +51,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -89,7 +89,7 @@ namespace cppu
: WeakComponentImplHelperBase( rMutex )
{}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakComponentImplHelper_query( rType, cd::get(), this,
(WeakComponentImplHelperBase *)this ); }
+ { return WeakComponentImplHelper_query( rType, cd::get(), this,
static_cast<WeakComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -130,7 +130,7 @@ namespace cppu
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return WeakAggComponentImplHelperBase::queryInterface( rType ); }
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
::com::sun::star::uno::Type const & rType ) throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, (WeakAggComponentImplHelperBase *)this ); }
+ { return WeakAggComponentImplHelper_queryAgg( rType, cd::get(),
this, static_cast<WeakAggComponentImplHelperBase *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ WeakAggComponentImplHelperBase::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx
index 47a3b43..f430ada 100644
--- a/include/cppuhelper/implbase1.hxx
+++ b/include/cppuhelper/implbase1.hxx
@@ -44,8 +44,8 @@ namespace cppu
1 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{
- { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *)
16) - 16 },
- { { com::sun::star::lang::XTypeProvider::static_type },
((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc1),
+
CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider)
}
};
return reinterpret_cast< class_data * >(&s_cd);
@@ -102,7 +102,7 @@ namespace cppu
struct cd : public rtl::StaticAggregate< class_data, ImplClassData1<
Ifc1, WeakImplHelper1< Ifc1 > > > {};
public:
virtual com::sun::star::uno::Any SAL_CALL queryInterface(
com::sun::star::uno::Type const & rType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakImplHelper_query( rType, cd::get(), this,
(OWeakObject *)this ); }
+ { return WeakImplHelper_query( rType, cd::get(), this,
static_cast<OWeakObject *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ OWeakObject::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -136,7 +136,7 @@ namespace cppu
virtual com::sun::star::uno::Any SAL_CALL queryInterface(
com::sun::star::uno::Type const & rType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OWeakAggObject::queryInterface( rType ); }
virtual com::sun::star::uno::Any SAL_CALL queryAggregation(
com::sun::star::uno::Type const & rType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggImplHelper_queryAgg( rType, cd::get(), this,
(OWeakAggObject *)this ); }
+ { return WeakAggImplHelper_queryAgg( rType, cd::get(), this,
static_cast<OWeakAggObject *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ OWeakAggObject::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/implbase10.hxx
b/include/cppuhelper/implbase10.hxx
index 02e4caf..a3a7d68 100644
--- a/include/cppuhelper/implbase10.hxx
+++ b/include/cppuhelper/implbase10.hxx
@@ -45,17 +45,17 @@ namespace cppu
10 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{
- { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *)
16) - 16 },
- { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *)
16) - 16 },
- { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *)
16) - 16 },
- { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *)
16) - 16 },
- { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *)
16) - 16 },
- { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *)
16) - 16 },
- { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *)
16) - 16 },
- { { Ifc8::static_type }, ((sal_IntPtr)(Ifc8 *) (Impl *)
16) - 16 },
- { { Ifc9::static_type }, ((sal_IntPtr)(Ifc9 *) (Impl *)
16) - 16 },
- { { Ifc10::static_type }, ((sal_IntPtr)(Ifc10 *) (Impl *)
16) - 16 },
- { { com::sun::star::lang::XTypeProvider::static_type },
((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc1),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc2),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc3),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc4),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc5),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc6),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc7),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc8),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc9),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc10),
+
CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider)
}
};
return reinterpret_cast< class_data * >(&s_cd);
diff --git a/include/cppuhelper/implbase11.hxx
b/include/cppuhelper/implbase11.hxx
index efa1200..c0ec01e 100644
--- a/include/cppuhelper/implbase11.hxx
+++ b/include/cppuhelper/implbase11.hxx
@@ -45,18 +45,18 @@ namespace cppu
11 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{
- { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *)
16) - 16 },
- { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *)
16) - 16 },
- { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *)
16) - 16 },
- { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *)
16) - 16 },
- { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *)
16) - 16 },
- { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *)
16) - 16 },
- { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *)
16) - 16 },
- { { Ifc8::static_type }, ((sal_IntPtr)(Ifc8 *) (Impl *)
16) - 16 },
- { { Ifc9::static_type }, ((sal_IntPtr)(Ifc9 *) (Impl *)
16) - 16 },
- { { Ifc10::static_type }, ((sal_IntPtr)(Ifc10 *) (Impl *)
16) - 16 },
- { { Ifc11::static_type }, ((sal_IntPtr)(Ifc11 *) (Impl *)
16) - 16 },
- { { com::sun::star::lang::XTypeProvider::static_type },
((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc1),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc2),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc3),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc4),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc5),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc6),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc7),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc8),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc9),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc10),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc11),
+
CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider)
}
};
return reinterpret_cast< class_data * >(&s_cd);
diff --git a/include/cppuhelper/implbase12.hxx
b/include/cppuhelper/implbase12.hxx
index 90c0a93..65ca838 100644
--- a/include/cppuhelper/implbase12.hxx
+++ b/include/cppuhelper/implbase12.hxx
@@ -45,19 +45,19 @@ namespace cppu
12 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{
- { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *)
16) - 16 },
- { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *)
16) - 16 },
- { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *)
16) - 16 },
- { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *)
16) - 16 },
- { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *)
16) - 16 },
- { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *)
16) - 16 },
- { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *)
16) - 16 },
- { { Ifc8::static_type }, ((sal_IntPtr)(Ifc8 *) (Impl *)
16) - 16 },
- { { Ifc9::static_type }, ((sal_IntPtr)(Ifc9 *) (Impl *)
16) - 16 },
- { { Ifc10::static_type }, ((sal_IntPtr)(Ifc10 *) (Impl *)
16) - 16 },
- { { Ifc11::static_type }, ((sal_IntPtr)(Ifc11 *) (Impl *)
16) - 16 },
- { { Ifc12::static_type }, ((sal_IntPtr)(Ifc12 *) (Impl *)
16) - 16 },
- { { com::sun::star::lang::XTypeProvider::static_type },
((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc1),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc2),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc3),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc4),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc5),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc6),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc7),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc8),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc9),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc10),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc11),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc12),
+
CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider)
}
};
return reinterpret_cast< class_data * >(&s_cd);
diff --git a/include/cppuhelper/implbase13.hxx
b/include/cppuhelper/implbase13.hxx
index 2bed904..f62b962 100644
--- a/include/cppuhelper/implbase13.hxx
+++ b/include/cppuhelper/implbase13.hxx
@@ -45,20 +45,20 @@ namespace cppu
13 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{
- { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *)
16) - 16 },
- { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *)
16) - 16 },
- { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *)
16) - 16 },
- { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *)
16) - 16 },
- { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *)
16) - 16 },
- { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *)
16) - 16 },
- { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *)
16) - 16 },
- { { Ifc8::static_type }, ((sal_IntPtr)(Ifc8 *) (Impl *)
16) - 16 },
- { { Ifc9::static_type }, ((sal_IntPtr)(Ifc9 *) (Impl *)
16) - 16 },
- { { Ifc10::static_type }, ((sal_IntPtr)(Ifc10 *) (Impl *)
16) - 16 },
- { { Ifc11::static_type }, ((sal_IntPtr)(Ifc11 *) (Impl *)
16) - 16 },
- { { Ifc12::static_type }, ((sal_IntPtr)(Ifc12 *) (Impl *)
16) - 16 },
- { { Ifc13::static_type }, ((sal_IntPtr)(Ifc13 *) (Impl *)
16) - 16 },
- { { com::sun::star::lang::XTypeProvider::static_type },
((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc1),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc2),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc3),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc4),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc5),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc6),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc7),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc8),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc9),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc10),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc11),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc12),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc13),
+
CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider)
}
};
return reinterpret_cast< class_data * >(&s_cd);
diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx
index 6e1301f..87d981d 100644
--- a/include/cppuhelper/implbase2.hxx
+++ b/include/cppuhelper/implbase2.hxx
@@ -44,9 +44,9 @@ namespace cppu
2 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{
- { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *)
16) - 16 },
- { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *)
16) - 16 },
- { { com::sun::star::lang::XTypeProvider::static_type },
((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc1),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc2),
+
CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider)
}
};
return reinterpret_cast< class_data * >(&s_cd);
@@ -99,7 +99,7 @@ namespace cppu
struct cd : public rtl::StaticAggregate< class_data, ImplClassData2 <
Ifc1, Ifc2, WeakImplHelper2<Ifc1, Ifc2> > > {};
public:
virtual com::sun::star::uno::Any SAL_CALL queryInterface(
com::sun::star::uno::Type const & rType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakImplHelper_query( rType, cd::get(), this,
(OWeakObject *)this ); }
+ { return WeakImplHelper_query( rType, cd::get(), this,
static_cast<OWeakObject *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ OWeakObject::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -133,7 +133,7 @@ namespace cppu
virtual com::sun::star::uno::Any SAL_CALL queryInterface(
com::sun::star::uno::Type const & rType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OWeakAggObject::queryInterface( rType ); }
virtual com::sun::star::uno::Any SAL_CALL queryAggregation(
com::sun::star::uno::Type const & rType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggImplHelper_queryAgg( rType, cd::get(), this,
(OWeakAggObject *)this ); }
+ { return WeakAggImplHelper_queryAgg( rType, cd::get(), this,
static_cast<OWeakAggObject *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ OWeakAggObject::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx
index ac7ff40..fb49dc9 100644
--- a/include/cppuhelper/implbase3.hxx
+++ b/include/cppuhelper/implbase3.hxx
@@ -44,10 +44,10 @@ namespace cppu
3 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{
- { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *)
16) - 16 },
- { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *)
16) - 16 },
- { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *)
16) - 16 },
- { { com::sun::star::lang::XTypeProvider::static_type },
((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc1),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc2),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc3),
+
CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider)
}
};
return reinterpret_cast< class_data * >(&s_cd);
@@ -100,7 +100,7 @@ namespace cppu
struct cd : public rtl::StaticAggregate< class_data, ImplClassData3 <
Ifc1, Ifc2, Ifc3, WeakImplHelper3<Ifc1, Ifc2, Ifc3> > > {};
public:
virtual com::sun::star::uno::Any SAL_CALL queryInterface(
com::sun::star::uno::Type const & rType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakImplHelper_query( rType, cd::get(), this,
(OWeakObject *)this ); }
+ { return WeakImplHelper_query( rType, cd::get(), this,
static_cast<OWeakObject *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ OWeakObject::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -134,7 +134,7 @@ namespace cppu
virtual com::sun::star::uno::Any SAL_CALL queryInterface(
com::sun::star::uno::Type const & rType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OWeakAggObject::queryInterface( rType ); }
virtual com::sun::star::uno::Any SAL_CALL queryAggregation(
com::sun::star::uno::Type const & rType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggImplHelper_queryAgg( rType, cd::get(), this,
(OWeakAggObject *)this ); }
+ { return WeakAggImplHelper_queryAgg( rType, cd::get(), this,
static_cast<OWeakAggObject *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ OWeakAggObject::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx
index cc1606a..2674b29 100644
--- a/include/cppuhelper/implbase4.hxx
+++ b/include/cppuhelper/implbase4.hxx
@@ -45,11 +45,11 @@ namespace cppu
4 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{
- { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *)
16) - 16 },
- { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *)
16) - 16 },
- { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *)
16) - 16 },
- { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *)
16) - 16 },
- { { com::sun::star::lang::XTypeProvider::static_type },
((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc1),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc2),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc3),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc4),
+
CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider)
}
};
return reinterpret_cast< class_data * >(&s_cd);
@@ -102,7 +102,7 @@ namespace cppu
struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 <
Ifc1, Ifc2, Ifc3, Ifc4, WeakImplHelper4<Ifc1, Ifc2, Ifc3, Ifc4> > > {};
public:
virtual com::sun::star::uno::Any SAL_CALL queryInterface(
com::sun::star::uno::Type const & rType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakImplHelper_query( rType, cd::get(), this,
(OWeakObject *)this ); }
+ { return WeakImplHelper_query( rType, cd::get(), this,
static_cast<OWeakObject *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ OWeakObject::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -136,7 +136,7 @@ namespace cppu
virtual com::sun::star::uno::Any SAL_CALL queryInterface(
com::sun::star::uno::Type const & rType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OWeakAggObject::queryInterface( rType ); }
virtual com::sun::star::uno::Any SAL_CALL queryAggregation(
com::sun::star::uno::Type const & rType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggImplHelper_queryAgg( rType, cd::get(), this,
(OWeakAggObject *)this ); }
+ { return WeakAggImplHelper_queryAgg( rType, cd::get(), this,
static_cast<OWeakAggObject *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ OWeakAggObject::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx
index 91ba45a..89aa381 100644
--- a/include/cppuhelper/implbase5.hxx
+++ b/include/cppuhelper/implbase5.hxx
@@ -45,12 +45,12 @@ namespace cppu
5 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{
- { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *)
16) - 16 },
- { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *)
16) - 16 },
- { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *)
16) - 16 },
- { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *)
16) - 16 },
- { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *)
16) - 16 },
- { { com::sun::star::lang::XTypeProvider::static_type },
((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc1),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc2),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc3),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc4),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc5),
+
CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider)
}
};
return reinterpret_cast< class_data * >(&s_cd);
diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx
index 83719bc..0f4d9bd 100644
--- a/include/cppuhelper/implbase6.hxx
+++ b/include/cppuhelper/implbase6.hxx
@@ -45,13 +45,13 @@ namespace cppu
6 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{
- { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *)
16) - 16 },
- { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *)
16) - 16 },
- { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *)
16) - 16 },
- { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *)
16) - 16 },
- { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *)
16) - 16 },
- { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *)
16) - 16 },
- { { com::sun::star::lang::XTypeProvider::static_type },
((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc1),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc2),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc3),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc4),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc5),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc6),
+
CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider)
}
};
return reinterpret_cast< class_data * >(&s_cd);
diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx
index 671a21c..b20356c 100644
--- a/include/cppuhelper/implbase7.hxx
+++ b/include/cppuhelper/implbase7.hxx
@@ -45,14 +45,14 @@ namespace cppu
7 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{
- { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *)
16) - 16 },
- { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *)
16) - 16 },
- { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *)
16) - 16 },
- { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *)
16) - 16 },
- { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *)
16) - 16 },
- { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *)
16) - 16 },
- { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *)
16) - 16 },
- { { com::sun::star::lang::XTypeProvider::static_type },
((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc1),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc2),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc3),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc4),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc5),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc6),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc7),
+
CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider)
}
};
return reinterpret_cast< class_data * >(&s_cd);
diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx
index 085e1af..c2c3620 100644
--- a/include/cppuhelper/implbase8.hxx
+++ b/include/cppuhelper/implbase8.hxx
@@ -45,15 +45,15 @@ namespace cppu
8 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{
- { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *)
16) - 16 },
- { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *)
16) - 16 },
- { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *)
16) - 16 },
- { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *)
16) - 16 },
- { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *)
16) - 16 },
- { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *)
16) - 16 },
- { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *)
16) - 16 },
- { { Ifc8::static_type }, ((sal_IntPtr)(Ifc8 *) (Impl *)
16) - 16 },
- { { com::sun::star::lang::XTypeProvider::static_type },
((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc1),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc2),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc3),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc4),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc5),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc6),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc7),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc8),
+
CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider)
}
};
return reinterpret_cast< class_data * >(&s_cd);
@@ -106,7 +106,7 @@ namespace cppu
struct cd : public rtl::StaticAggregate< class_data, ImplClassData8<
Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, WeakImplHelper8<Ifc1, Ifc2,
Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8> > > {};
public:
virtual com::sun::star::uno::Any SAL_CALL queryInterface(
com::sun::star::uno::Type const & rType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakImplHelper_query( rType, cd::get(), this,
(OWeakObject *)this ); }
+ { return WeakImplHelper_query( rType, cd::get(), this,
static_cast<OWeakObject *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ OWeakObject::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
@@ -140,7 +140,7 @@ namespace cppu
virtual com::sun::star::uno::Any SAL_CALL queryInterface(
com::sun::star::uno::Type const & rType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OWeakAggObject::queryInterface( rType ); }
virtual com::sun::star::uno::Any SAL_CALL queryAggregation(
com::sun::star::uno::Type const & rType ) throw
(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
- { return WeakAggImplHelper_queryAgg( rType, cd::get(), this,
(OWeakAggObject *)this ); }
+ { return WeakAggImplHelper_queryAgg( rType, cd::get(), this,
static_cast<OWeakAggObject *>(this) ); }
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ OWeakAggObject::acquire(); }
virtual void SAL_CALL release() throw () SAL_OVERRIDE
diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx
index 0fd528a..d677106 100644
--- a/include/cppuhelper/implbase9.hxx
+++ b/include/cppuhelper/implbase9.hxx
@@ -45,16 +45,16 @@ namespace cppu
9 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
{
- { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *)
16) - 16 },
- { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *)
16) - 16 },
- { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *)
16) - 16 },
- { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *)
16) - 16 },
- { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *)
16) - 16 },
- { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *)
16) - 16 },
- { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *)
16) - 16 },
- { { Ifc8::static_type }, ((sal_IntPtr)(Ifc8 *) (Impl *)
16) - 16 },
- { { Ifc9::static_type }, ((sal_IntPtr)(Ifc9 *) (Impl *)
16) - 16 },
- { { com::sun::star::lang::XTypeProvider::static_type },
((sal_IntPtr)(com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc1),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc2),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc3),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc4),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc5),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc6),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc7),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc8),
+ CPPUHELPER_DETAIL_TYPEENTRY(Ifc9),
+
CPPUHELPER_DETAIL_TYPEENTRY(com::sun::star::lang::XTypeProvider)
}
};
return reinterpret_cast< class_data * >(&s_cd);
diff --git a/include/cppuhelper/implbase_ex.hxx
b/include/cppuhelper/implbase_ex.hxx
index e9d871a..efbe8dc 100644
--- a/include/cppuhelper/implbase_ex.hxx
+++ b/include/cppuhelper/implbase_ex.hxx
@@ -66,6 +66,11 @@ struct type_entry
sal_IntPtr m_offset;
};
+/** in the future, this can be a constexpr template method */
+#define CPPUHELPER_DETAIL_TYPEENTRY(Ifc) \
+ { { Ifc::static_type }, \
+ reinterpret_cast<sal_IntPtr>( static_cast<Ifc *>( reinterpret_cast<Impl
*>(16) )) - 16 }
+
/** identical dummy struct for casting class_dataN to class_data
*/
struct class_data
diff --git a/include/cppuhelper/interfacecontainer.hxx
b/include/cppuhelper/interfacecontainer.hxx
index 759f440..d8038ee 100644
--- a/include/cppuhelper/interfacecontainer.hxx
+++ b/include/cppuhelper/interfacecontainer.hxx
@@ -41,7 +41,7 @@ inline OMultiTypeInterfaceContainerHelperVar< key , hashImpl
, equalImpl >::~OMu
while( iter != end )
{
- delete (OInterfaceContainerHelper*)(*iter).second;
+ delete static_cast<OInterfaceContainerHelper*>((*iter).second);
(*iter).second = 0;
++iter;
}
@@ -66,7 +66,7 @@ inline ::com::sun::star::uno::Sequence< key >
OMultiTypeInterfaceContainerHelper
while( iter != end )
{
// are interfaces added to this container?
- if( ((OInterfaceContainerHelper*)(*iter).second)->getLength() )
+ if(
static_cast<OInterfaceContainerHelper*>((*iter).second)->getLength() )
// yes, put the type in the array
pArray[i++] = (*iter).first;
iter++;
@@ -89,7 +89,7 @@ OInterfaceContainerHelper *
OMultiTypeInterfaceContainerHelperVar< key , hashImp
typename InterfaceMap::iterator iter = find( rKey );
if( iter != m_pMap->end() )
- return (OInterfaceContainerHelper*) (*iter).second;
+ return static_cast<OInterfaceContainerHelper*>( (*iter).second );
return 0;
}
@@ -108,7 +108,7 @@ sal_Int32 OMultiTypeInterfaceContainerHelperVar< key ,
hashImpl , equalImpl >::a
return pLC->addInterface( rListener );
}
else
- return ((OInterfaceContainerHelper*)(*iter).second)->addInterface(
rListener );
+ return
static_cast<OInterfaceContainerHelper*>((*iter).second)->addInterface(
rListener );
}
@@ -123,7 +123,7 @@ inline sal_Int32 OMultiTypeInterfaceContainerHelperVar< key
, hashImpl , equalIm
typename InterfaceMap::iterator iter = find( rKey );
// container found?
if( iter != m_pMap->end() )
- return ((OInterfaceContainerHelper*)(*iter).second)->removeInterface(
rListener );
+ return
static_cast<OInterfaceContainerHelper*>((*iter).second)->removeInterface(
rListener );
// no container with this id. Always return 0
return 0;
@@ -150,7 +150,7 @@ void OMultiTypeInterfaceContainerHelperVar< key , hashImpl
, equalImpl >::dispos
typename InterfaceMap::size_type i = 0;
while( iter != end )
{
- ppListenerContainers[i++] =
(OInterfaceContainerHelper*)(*iter).second;
+ ppListenerContainers[i++] =
static_cast<OInterfaceContainerHelper*>((*iter).second);
++iter;
}
}
@@ -176,7 +176,7 @@ void OMultiTypeInterfaceContainerHelperVar< key , hashImpl
, equalImpl >::clear(
while( iter != end )
{
- ((OInterfaceContainerHelper*)(*iter).second)->clear();
+ static_cast<OInterfaceContainerHelper*>((*iter).second)->clear();
++iter;
}
}
diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx
index a75b315..2291bc2 100644
--- a/include/uno/mapping.hxx
+++ b/include/uno/mapping.hxx
@@ -301,7 +301,7 @@ inline bool mapToCpp( Reference< C > * ppRet, uno_Interface
* pUnoI )
::rtl::OUString( CPPU_CURRENT_LANGUAGE_BINDING_NAME ) );
OSL_ASSERT( aMapping.is() );
aMapping.mapInterface(
- (void **)ppRet, pUnoI, ::cppu::getTypeFavourUnsigned( ppRet ) );
+ reinterpret_cast<void **>(ppRet), pUnoI,
::cppu::getTypeFavourUnsigned( ppRet ) );
return (0 != *ppRet);
}
/** Deprecated. This function DOES NOT WORK with Purpose Environments
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
