From 5e21a413c788f839a66d9e4c14e745ed18058db8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 25 Feb 2014 21:31:58 +0100 Subject: cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3 --- ucb/source/ucp/expand/ucpexpand.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'ucb/source/ucp/expand') diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index 5bdbcce7e6c5..3b335b4ff9bb 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -73,20 +73,20 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); // XContentProvider virtual uno::Reference< ucb::XContent > SAL_CALL queryContent( uno::Reference< ucb::XContentIdentifier > const & xIdentifier ) - throw (ucb::IllegalIdentifierException, uno::RuntimeException); + throw (ucb::IllegalIdentifierException, uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL compareContentIds( uno::Reference< ucb::XContentIdentifier > const & xId1, uno::Reference< ucb::XContentIdentifier > const & xId2 ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); }; @@ -142,7 +142,7 @@ static uno::Sequence< OUString > SAL_CALL supportedServices() // XServiceInfo OUString ExpandContentProviderImpl::getImplementationName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { check(); return implName(); @@ -150,14 +150,14 @@ OUString ExpandContentProviderImpl::getImplementationName() uno::Sequence< OUString > ExpandContentProviderImpl::getSupportedServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { check(); return supportedServices(); } sal_Bool ExpandContentProviderImpl::supportsService(OUString const & serviceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } @@ -186,7 +186,7 @@ OUString ExpandContentProviderImpl::expandUri( uno::Reference< ucb::XContent > ExpandContentProviderImpl::queryContent( uno::Reference< ucb::XContentIdentifier > const & xIdentifier ) - throw (ucb::IllegalIdentifierException, uno::RuntimeException) + throw (ucb::IllegalIdentifierException, uno::RuntimeException, std::exception) { check(); OUString uri( expandUri( xIdentifier ) ); @@ -208,7 +208,7 @@ uno::Reference< ucb::XContent > ExpandContentProviderImpl::queryContent( sal_Int32 ExpandContentProviderImpl::compareContentIds( uno::Reference< ucb::XContentIdentifier > const & xId1, uno::Reference< ucb::XContentIdentifier > const & xId2 ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { check(); try -- cgit