diff options
Diffstat (limited to 'include/cppuhelper/implbase4.hxx')
| -rw-r--r-- | include/cppuhelper/implbase4.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx index cc1606a1be27..2674b292f575 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 |