summaryrefslogtreecommitdiff
path: root/desktop/source/offacc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-25 21:31:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-26 18:22:20 +0100
commit5e21a413c788f839a66d9e4c14e745ed18058db8 (patch)
treed4451246461346a425ad6f796e08bf1514cdd942 /desktop/source/offacc
parent6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff)
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'desktop/source/offacc')
-rw-r--r--desktop/source/offacc/acceptor.cxx10
-rw-r--r--desktop/source/offacc/acceptor.hxx10
2 files changed, 10 insertions, 10 deletions
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 68a26d565fc9..872ef673261b 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -125,7 +125,7 @@ void Acceptor::run()
// XInitialize
void Acceptor::initialize( const Sequence<Any>& aArguments )
- throw( Exception )
+ throw( Exception, std::exception )
{
// prevent multiple initialization
osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -181,7 +181,7 @@ OUString Acceptor::impl_getImplementationName()
return OUString("com.sun.star.office.comp.Acceptor");
}
OUString Acceptor::getImplementationName()
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return Acceptor::impl_getImplementationName();
}
@@ -192,13 +192,13 @@ Sequence<OUString> Acceptor::impl_getSupportedServiceNames()
return aSequence;
}
Sequence<OUString> Acceptor::getSupportedServiceNames()
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return Acceptor::impl_getSupportedServiceNames();
}
sal_Bool Acceptor::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
@@ -225,7 +225,7 @@ AccInstanceProvider::~AccInstanceProvider()
}
Reference<XInterface> AccInstanceProvider::getInstance (const OUString& aName )
- throw ( NoSuchElementException )
+ throw ( NoSuchElementException, std::exception )
{
Reference<XInterface> rInstance;
diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx
index 70ba7b286a72..11fbf3d8b25e 100644
--- a/desktop/source/offacc/acceptor.hxx
+++ b/desktop/source/offacc/acceptor.hxx
@@ -76,16 +76,16 @@ public:
// XService info
static OUString impl_getImplementationName();
virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
static css::uno::Sequence<OUString> impl_getSupportedServiceNames();
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL supportsService( const OUString& aName )
- throw (css::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
// XInitialize
virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments )
- throw ( css::uno::Exception );
+ throw ( css::uno::Exception, std::exception );
static css::uno::Reference<css::uno::XInterface> impl_getInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aFactory );
};
@@ -103,7 +103,7 @@ public:
// XInstanceProvider
virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getInstance (const OUString& aName )
- throw ( css::container::NoSuchElementException );
+ throw ( css::container::NoSuchElementException, std::exception );
};