diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
tree | d4451246461346a425ad6f796e08bf1514cdd942 /include/comphelper/uno3.hxx | |
parent | Fixup whitespace changes, remove commented code. (diff) | |
download | core-5e21a413c788f839a66d9e4c14e745ed18058db8.tar.gz core-5e21a413c788f839a66d9e4c14e745ed18058db8.zip |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'include/comphelper/uno3.hxx')
-rw-r--r-- | include/comphelper/uno3.hxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx index ffe0be0a6a99..70ec09c031ea 100644 --- a/include/comphelper/uno3.hxx +++ b/include/comphelper/uno3.hxx @@ -53,7 +53,7 @@ namespace comphelper #define DECLARE_UNO3_AGG_DEFAULTS(classname, baseclass) \ virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ virtual void SAL_CALL release() throw() { baseclass::release(); } \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \ + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) \ { return baseclass::queryInterface(_rType); } \ void SAL_CALL PUT_SEMICOLON_AT_THE_END() @@ -124,19 +124,19 @@ namespace comphelper #define DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS(classname, baseclass, implhelper) \ virtual void SAL_CALL acquire() throw() { baseclass::acquire(); } \ virtual void SAL_CALL release() throw() { baseclass::release(); } \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException) \ + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) \ { return baseclass::queryInterface(_rType); } \ - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException) \ + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) \ { \ implhelper::dispose(); \ } \ virtual void SAL_CALL addEventListener( \ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ { \ implhelper::addEventListener(xListener); \ } \ virtual void SAL_CALL removeEventListener( \ - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > const & xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ { \ implhelper::removeEventListener(xListener); \ } \ @@ -149,7 +149,7 @@ namespace comphelper //= forwarding/merging XInterface funtionality //===================================================================== #define DECLARE_XINTERFACE( ) \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); \ + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); \ virtual void SAL_CALL acquire() throw(); \ virtual void SAL_CALL release() throw(); @@ -159,7 +159,7 @@ namespace comphelper #define IMPLEMENT_FORWARD_XINTERFACE2( classname, refcountbase, baseclass2 ) \ IMPLEMENT_FORWARD_REFCOUNT( classname, refcountbase ) \ - ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ { \ ::com::sun::star::uno::Any aReturn = refcountbase::queryInterface( _rType ); \ if ( !aReturn.hasValue() ) \ @@ -169,7 +169,7 @@ namespace comphelper #define IMPLEMENT_FORWARD_XINTERFACE3( classname, refcountbase, baseclass2, baseclass3 ) \ IMPLEMENT_FORWARD_REFCOUNT( classname, refcountbase ) \ - ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Any SAL_CALL classname::queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ { \ ::com::sun::star::uno::Any aReturn = refcountbase::queryInterface( _rType ); \ if ( !aReturn.hasValue() ) \ @@ -185,21 +185,21 @@ namespace comphelper //= forwarding/merging XTypeProvider funtionality //===================================================================== #define DECLARE_XTYPEPROVIDER( ) \ - 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< sal_Int8 > SAL_CALL getImplementationId( ) 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, std::exception); \ + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); #define IMPLEMENT_GET_IMPLEMENTATION_ID( classname ) \ namespace \ { \ class the##classname##ImplementationId : public rtl::Static< ::cppu::OImplementationId, the##classname##ImplementationId> {}; \ } \ - ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL classname::getImplementationId( ) throw (::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL classname::getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ { \ return the##classname##ImplementationId::get().getImplementationId(); \ } #define IMPLEMENT_FORWARD_XTYPEPROVIDER2( classname, baseclass1, baseclass2 ) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL classname::getTypes( ) throw (::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL classname::getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ { \ return ::comphelper::concatSequences( \ baseclass1::getTypes(), \ @@ -210,7 +210,7 @@ namespace comphelper IMPLEMENT_GET_IMPLEMENTATION_ID( classname ) #define IMPLEMENT_FORWARD_XTYPEPROVIDER3( classname, baseclass1, baseclass2, baseclass3 ) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL classname::getTypes( ) throw (::com::sun::star::uno::RuntimeException) \ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL classname::getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ { \ return ::comphelper::concatSequences( \ baseclass1::getTypes(), \ |