diff options
Diffstat (limited to 'dbaccess/source/inc/apitools.hxx')
-rw-r--r-- | dbaccess/source/inc/apitools.hxx | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index 9561bb6d2d5c..e8f30cdd156f 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -45,11 +45,10 @@ public: const css::uno::Reference< css::uno::XInterface >& _xParent); // css::lang::XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // css::uno::XInterface - 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; virtual void SAL_CALL release() throw() override; inline operator css::uno::Reference< css::uno::XInterface > () const @@ -61,23 +60,23 @@ public: // (internal - not to be used outside - usually) #define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ - OUString SAL_CALL classname::getImplementationName( ) throw (css::uno::RuntimeException, std::exception) \ + OUString SAL_CALL classname::getImplementationName( ) \ { \ return OUString(implasciiname); \ } \ #define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ - OUString SAL_CALL classname::getImplementationName( ) throw (css::uno::RuntimeException, std::exception) \ + OUString SAL_CALL classname::getImplementationName( ) \ { \ return getImplementationName_Static(); \ } \ - OUString SAL_CALL classname::getImplementationName_Static( ) throw (css::uno::RuntimeException) \ + OUString SAL_CALL classname::getImplementationName_Static( ) \ { \ return OUString(implasciiname); \ } \ #define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - sal_Bool SAL_CALL classname::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception) \ + sal_Bool SAL_CALL classname::supportsService( const OUString& _rServiceName ) \ { \ css::uno::Sequence< OUString > aSupported(getSupportedServiceNames()); \ const OUString* pSupported = aSupported.getConstArray(); \ @@ -89,22 +88,22 @@ public: } \ #define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ - css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) \ + css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) \ { \ return getSupportedServiceNames_Static(); \ } \ - css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException) \ + css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) \ { \ css::uno::Sequence< OUString > aSupported { serviceasciiname }; \ return aSupported; \ } \ #define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1, serviceasciiname2) \ - css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) \ + css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) \ { \ return getSupportedServiceNames_Static(); \ } \ - css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException) \ + css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) \ { \ css::uno::Sequence< OUString > aSupported(2); \ aSupported[0] = serviceasciiname1; \ @@ -115,7 +114,7 @@ public: #define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \ IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) \ + css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) \ { \ return css::uno::Sequence< OUString > { serviceasciiname }; \ } \ @@ -124,7 +123,7 @@ public: #define IMPLEMENT_SERVICE_INFO2(classname, implasciiname, serviceasciiname1, serviceasciiname2) \ IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) \ + css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) \ { \ return css::uno::Sequence< OUString > { serviceasciiname1, serviceasciiname2 }; \ } @@ -144,7 +143,7 @@ public: #define IMPLEMENT_SERVICE_INFO3(classname, implasciiname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) \ + css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) \ { \ return css::uno::Sequence< OUString > { serviceasciiname1, serviceasciiname2, serviceasciiname3 }; \ } \ @@ -167,13 +166,13 @@ css::uno::Sequence< sal_Int8 > classname::getUnoTunnelImplementationId() \ } \ return pId->getImplementationId(); \ } \ -css::uno::Sequence< sal_Int8 > classname::getImplementationId() throw (css::uno::RuntimeException, std::exception) \ +css::uno::Sequence< sal_Int8 > classname::getImplementationId() \ { \ return css::uno::Sequence<sal_Int8>(); \ } #define IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 ) \ - css::uno::Sequence< css::uno::Type > classname::getTypes() throw (css::uno::RuntimeException, std::exception) \ + css::uno::Sequence< css::uno::Type > classname::getTypes() \ { \ return ::comphelper::concatSequences( \ baseclass1::getTypes( ), \ @@ -182,7 +181,7 @@ css::uno::Sequence< sal_Int8 > classname::getImplementationId() throw (css::uno: } #define IMPLEMENT_GETTYPES3( classname, baseclass1, baseclass2, baseclass3 ) \ - css::uno::Sequence< css::uno::Type > classname::getTypes() throw (css::uno::RuntimeException, std::exception) \ + css::uno::Sequence< css::uno::Type > classname::getTypes() \ { \ return ::comphelper::concatSequences( \ baseclass1::getTypes( ), \ @@ -193,12 +192,12 @@ css::uno::Sequence< sal_Int8 > classname::getImplementationId() throw (css::uno: // helper for declaring/implementing classes based on the OPropertyContainer and an OPropertyArrayUsageHelper #define DECLARE_PROPERTYCONTAINER_DEFAULTS( ) \ - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; \ + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; \ virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; \ virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override #define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname , baseclass1) \ - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL classname::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) \ + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL classname::getPropertySetInfo() \ { \ Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); \ return xInfo; \ |