diff options
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 5b4cb63a3542..05756fe709b5 100644 --- a/include/comphelper/uno3.hxx +++ b/include/comphelper/uno3.hxx @@ -41,7 +41,7 @@ namespace comphelper #define DECLARE_UNO3_AGG_DEFAULTS(classname, baseclass) \ virtual void SAL_CALL acquire() throw() override { baseclass::acquire(); } \ virtual void SAL_CALL release() throw() override { baseclass::release(); } \ - virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override \ + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) override \ { return baseclass::queryInterface(_rType); } /** Use this macro to forward XComponent methods to base class @@ -69,19 +69,19 @@ namespace comphelper #define DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS(classname, baseclass, implhelper) \ virtual void SAL_CALL acquire() throw() override { baseclass::acquire(); } \ virtual void SAL_CALL release() throw() override { baseclass::release(); } \ - virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override \ + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) override \ { return baseclass::queryInterface(_rType); } \ - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override \ + virtual void SAL_CALL dispose() override \ { \ implhelper::dispose(); \ } \ virtual void SAL_CALL addEventListener( \ - css::uno::Reference< css::lang::XEventListener > const & xListener ) throw (css::uno::RuntimeException, std::exception) override \ + css::uno::Reference< css::lang::XEventListener > const & xListener ) override \ { \ implhelper::addEventListener(xListener); \ } \ virtual void SAL_CALL removeEventListener( \ - css::uno::Reference< css::lang::XEventListener > const & xListener ) throw (css::uno::RuntimeException, std::exception) override \ + css::uno::Reference< css::lang::XEventListener > const & xListener ) override \ { \ implhelper::removeEventListener(xListener); \ } @@ -91,7 +91,7 @@ namespace comphelper //= forwarding/merging XInterface funtionality #define DECLARE_XINTERFACE( ) \ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; \ + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; \ virtual void SAL_CALL acquire() throw() override; \ virtual void SAL_CALL release() throw() override; @@ -101,7 +101,7 @@ namespace comphelper #define IMPLEMENT_FORWARD_XINTERFACE2( classname, refcountbase, baseclass2 ) \ IMPLEMENT_FORWARD_REFCOUNT( classname, refcountbase ) \ - css::uno::Any SAL_CALL classname::queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) \ + css::uno::Any SAL_CALL classname::queryInterface( const css::uno::Type& _rType ) \ { \ css::uno::Any aReturn = refcountbase::queryInterface( _rType ); \ if ( !aReturn.hasValue() ) \ @@ -111,7 +111,7 @@ namespace comphelper #define IMPLEMENT_FORWARD_XINTERFACE3( classname, refcountbase, baseclass2, baseclass3 ) \ IMPLEMENT_FORWARD_REFCOUNT( classname, refcountbase ) \ - css::uno::Any SAL_CALL classname::queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) \ + css::uno::Any SAL_CALL classname::queryInterface( const css::uno::Type& _rType ) \ { \ css::uno::Any aReturn = refcountbase::queryInterface( _rType ); \ if ( !aReturn.hasValue() ) \ @@ -127,17 +127,17 @@ namespace comphelper //= forwarding/merging XTypeProvider funtionality #define DECLARE_XTYPEPROVIDER( ) \ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; \ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; \ + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; #define IMPLEMENT_GET_IMPLEMENTATION_ID( classname ) \ - css::uno::Sequence< sal_Int8 > SAL_CALL classname::getImplementationId( ) throw (css::uno::RuntimeException, std::exception) \ + css::uno::Sequence< sal_Int8 > SAL_CALL classname::getImplementationId( ) \ { \ return css::uno::Sequence<sal_Int8>(); \ } #define IMPLEMENT_FORWARD_XTYPEPROVIDER2( classname, baseclass1, baseclass2 ) \ - css::uno::Sequence< css::uno::Type > SAL_CALL classname::getTypes( ) throw (css::uno::RuntimeException, std::exception) \ + css::uno::Sequence< css::uno::Type > SAL_CALL classname::getTypes( ) \ { \ return ::comphelper::concatSequences( \ baseclass1::getTypes(), \ @@ -148,7 +148,7 @@ namespace comphelper IMPLEMENT_GET_IMPLEMENTATION_ID( classname ) #define IMPLEMENT_FORWARD_XTYPEPROVIDER3( classname, baseclass1, baseclass2, baseclass3 ) \ - css::uno::Sequence< css::uno::Type > SAL_CALL classname::getTypes( ) throw (css::uno::RuntimeException, std::exception) \ + css::uno::Sequence< css::uno::Type > SAL_CALL classname::getTypes( ) \ { \ return ::comphelper::concatSequences( \ baseclass1::getTypes(), \ |