summaryrefslogtreecommitdiff
path: root/framework/inc/macros
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /framework/inc/macros
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework/inc/macros')
-rw-r--r--framework/inc/macros/xinterface.hxx4
-rw-r--r--framework/inc/macros/xserviceinfo.hxx15
-rw-r--r--framework/inc/macros/xtypeprovider.hxx8
3 files changed, 13 insertions, 14 deletions
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index 0d85f59e0740..4a57c3d69f8c 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -66,7 +66,7 @@ ________________________________________________________________________________
#define PRIVATE_DEFINE_XINTERFACE( CLASS, BASECLASS, INTERFACES ) \
PRIVATE_DEFINE_XINTERFACE_ACQUIRE_RELEASE( CLASS, BASECLASS ) \
- css::uno::Any SAL_CALL CLASS::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception ) \
+ css::uno::Any SAL_CALL CLASS::queryInterface( const css::uno::Type& aType ) \
{ \
/* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ \
/* Ask for my own supported interfaces ... */ \
@@ -128,7 +128,7 @@ ________________________________________________________________________________
// declaration of XInterface
#define FWK_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;
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index a8d8b935d23d..8127651fabc0 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -49,17 +49,17 @@ namespace framework{
#define PRIVATE_DEFINE_XSERVICEINFO_BASE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) \
\
- OUString SAL_CALL CLASS::getImplementationName() throw( css::uno::RuntimeException, std::exception ) \
+ OUString SAL_CALL CLASS::getImplementationName() \
{ \
return impl_getStaticImplementationName(); \
} \
\
- sal_Bool SAL_CALL CLASS::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) \
+ sal_Bool SAL_CALL CLASS::supportsService( const OUString& sServiceName ) \
{ \
return cppu::supportsService(this, sServiceName); \
} \
\
- css::uno::Sequence< OUString > SAL_CALL CLASS::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) \
+ css::uno::Sequence< OUString > SAL_CALL CLASS::getSupportedServiceNames() \
{ \
return impl_getStaticSupportedServiceNames(); \
} \
@@ -81,7 +81,7 @@ namespace framework{
/* use right EXTERNAL handling of them. That's why you should do nothing in your ctor, which could*/ \
/* work on your ref count! All other things are allowed. Do work with your own reference - please */ \
/* use "impl_initService()" method. */ \
- css::uno::Reference< css::uno::XInterface > SAL_CALL CLASS::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception ) \
+ css::uno::Reference< css::uno::XInterface > SAL_CALL CLASS::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) \
{ \
/* create new instance of service */ \
CLASS* pClass = new CLASS( xServiceManager ); \
@@ -100,7 +100,6 @@ namespace framework{
/* work on your ref count! All other things are allowed. Do work with your own reference - please */ \
/* use "impl_initService()" method. */ \
css::uno::Reference< css::uno::XInterface > SAL_CALL CLASS::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager )\
- throw( css::uno::Exception ) \
{ \
/* retrieve component context from the given service manager */ \
css::uno::Reference< css::uno::XComponentContext > xComponentContext( \
@@ -141,9 +140,9 @@ namespace framework{
#define DECLARE_XSERVICEINFO_NOFACTORY \
/* interface XServiceInfo */ \
- virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException, std::exception ) override; \
- virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; \
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException, std::exception ) override; \
+ virtual OUString SAL_CALL getImplementationName ( ) override; \
+ virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) override; \
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) override; \
/* Helper for XServiceInfo */ \
static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); \
static OUString SAL_CALL impl_getStaticImplementationName ( ); \
diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index dfc97395813d..93b161a8576f 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -51,7 +51,7 @@ ________________________________________________________________________________
// implementation of XTypeProvider::getImplementationId()
#define PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \
- css::uno::Sequence< sal_Int8 > SAL_CALL CLASS::getImplementationId() throw( css::uno::RuntimeException, std::exception ) \
+ css::uno::Sequence< sal_Int8 > SAL_CALL CLASS::getImplementationId() \
{ \
return css::uno::Sequence<sal_Int8>(); \
}
@@ -83,7 +83,7 @@ ________________________________________________________________________________
#define PRIVATE_DEFINE_XTYPEPROVIDER( CLASS, TYPES ) \
PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \
- css::uno::Sequence< css::uno::Type > SAL_CALL CLASS::getTypes() throw( css::uno::RuntimeException, std::exception ) \
+ css::uno::Sequence< css::uno::Type > SAL_CALL CLASS::getTypes() \
{ \
/* Optimize this method ! */ \
/* We initialize a static variable only one time. */ \
@@ -112,8 +112,8 @@ ________________________________________________________________________________
// declaration of XTypeProvider
#define FWK_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;
// public
// implementation of XTypeProvider
generated by cgit (git 2.34.1) at 2024-12-29 02:48:10 +0000