mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark overriding cppuhelper class template member functions as SAL_OVERRIDE

Browse Source 
Change-Id: I51942d37eacd11000c08a784d8a995bd8f9f972c
This commit is contained in:
Stephan Bergmann
2014-03-11 18:31:48 +01:00
parent b710952a3a
commit 8fb6f4a74b
26 changed files with 579 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
include/cppuhelper/implbase4.hxx
View File

@@ -73,11 +73,11 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, ImplHelper4<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)
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 ImplHelper_query( rType, cd::get(), this ); }
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception)
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return ImplHelper_getTypes( cd::get() ); }
virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception)
virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return ImplHelper_getImplementationId( cd::get() ); }
#if !defined _MSC_VER // public -> protected changes mangled names there
@@ -101,15 +101,15 @@ 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)
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 ); }
virtual void SAL_CALL acquire() throw ()
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ OWeakObject::acquire(); }
virtual void SAL_CALL release() throw ()
virtual void SAL_CALL release() throw () SAL_OVERRIDE
{ OWeakObject::release(); }
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception)
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return WeakImplHelper_getTypes( cd::get() ); }
virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception)
virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
@@ -133,17 +133,17 @@ namespace cppu
{
struct cd : public rtl::StaticAggregate< class_data, ImplClassData4 < Ifc1, Ifc2, Ifc3, Ifc4, WeakAggImplHelper4<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)
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)
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 ); }
virtual void SAL_CALL acquire() throw ()
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ OWeakAggObject::acquire(); }
virtual void SAL_CALL release() throw ()
virtual void SAL_CALL release() throw () SAL_OVERRIDE
{ OWeakAggObject::release(); }
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception)
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return WeakAggImplHelper_getTypes( cd::get() ); }
virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception)
virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
@@ -197,20 +197,20 @@ namespace cppu
BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
public:
ImplInheritanceHelper4() {}
virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{
com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
if (aRet.hasValue())
return aRet;
return BaseClass::queryInterface( rType );
}
virtual void SAL_CALL acquire() throw ()
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ BaseClass::acquire(); }
virtual void SAL_CALL release() throw ()
virtual void SAL_CALL release() throw () SAL_OVERRIDE
{ BaseClass::release(); }
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException)
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{ return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException)
virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and
@@ -265,22 +265,22 @@ namespace cppu
BaseClass(arg1, arg2, arg3, arg4, arg5, arg6) {}
public:
AggImplInheritanceHelper4() {}
virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{ return BaseClass::queryInterface( rType ); }
virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException)
virtual com::sun::star::uno::Any SAL_CALL queryAggregation( com::sun::star::uno::Type const & rType ) throw (com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{
com::sun::star::uno::Any aRet( ImplHelper_queryNoXInterface( rType, cd::get(), this ) );
if (aRet.hasValue())
return aRet;
return BaseClass::queryAggregation( rType );
}
virtual void SAL_CALL acquire() throw ()
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ BaseClass::acquire(); }
virtual void SAL_CALL release() throw ()
virtual void SAL_CALL release() throw () SAL_OVERRIDE
{ BaseClass::release(); }
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception)
virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return ImplInhHelper_getTypes( cd::get(), BaseClass::getTypes() ); }
virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception)
virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return ImplHelper_getImplementationId( cd::get() ); }
};
}