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 /stoc/source/proxy_factory/proxyfac.cxx | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'stoc/source/proxy_factory/proxyfac.cxx')
-rw-r--r-- | stoc/source/proxy_factory/proxyfac.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index 30d70ca37b50..482af9ca33de 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -79,16 +79,16 @@ struct FactoryImpl : public ::cppu::WeakImplHelper2< lang::XServiceInfo, // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (RuntimeException); + throw (RuntimeException, std::exception); // XProxyFactory virtual Reference< XAggregation > SAL_CALL createProxy( Reference< XInterface > const & xTarget ) - throw (RuntimeException); + throw (RuntimeException, std::exception); }; @@ -170,7 +170,7 @@ struct ProxyRoot : public ::cppu::OWeakAggObject { // XAggregation virtual Any SAL_CALL queryAggregation( Type const & rType ) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual ~ProxyRoot(); inline ProxyRoot( ::rtl::Reference< FactoryImpl > const & factory, @@ -325,7 +325,7 @@ inline ProxyRoot::ProxyRoot( Any ProxyRoot::queryAggregation( Type const & rType ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Any ret( OWeakAggObject::queryAggregation( rType ) ); if (! ret.hasValue()) @@ -429,7 +429,7 @@ FactoryImpl::~FactoryImpl() {} Reference< XAggregation > FactoryImpl::createProxy( Reference< XInterface > const & xTarget ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return new ProxyRoot( this, xTarget ); } @@ -437,19 +437,19 @@ Reference< XAggregation > FactoryImpl::createProxy( // XServiceInfo OUString FactoryImpl::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return proxyfac_getImplementationName(); } sal_Bool FactoryImpl::supportsService( const OUString & rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > FactoryImpl::getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return proxyfac_getSupportedServiceNames(); } |