summaryrefslogtreecommitdiff
path: root/binaryurp/source
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 /binaryurp/source
parent6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff)
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'binaryurp/source')
-rw-r--r--binaryurp/source/bridge.cxx12
-rw-r--r--binaryurp/source/bridge.hxx12
-rw-r--r--binaryurp/source/bridgefactory.cxx10
-rw-r--r--binaryurp/source/bridgefactory.hxx10
4 files changed, 22 insertions, 22 deletions
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 435df5395ae0..ac13fa29fec1 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -870,7 +870,7 @@ Bridge::~Bridge() {
}
css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
- OUString const & sInstanceName) throw (css::uno::RuntimeException)
+ OUString const & sInstanceName) throw (css::uno::RuntimeException, std::exception)
{
if (sInstanceName.isEmpty()) {
throw css::uno::RuntimeException(
@@ -909,18 +909,18 @@ css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
css::uno::UNO_REF_NO_ACQUIRE);
}
-OUString Bridge::getName() throw (css::uno::RuntimeException) {
+OUString Bridge::getName() throw (css::uno::RuntimeException, std::exception) {
return name_;
}
-OUString Bridge::getDescription() throw (css::uno::RuntimeException) {
+OUString Bridge::getDescription() throw (css::uno::RuntimeException, std::exception) {
OUStringBuffer b(name_);
b.append(':');
b.append(connection_->getDescription());
return b.makeStringAndClear();
}
-void Bridge::dispose() throw (css::uno::RuntimeException) {
+void Bridge::dispose() throw (css::uno::RuntimeException, std::exception) {
// For terminate(true) not to deadlock, an external protocol must ensure
// that dispose is not called from a thread pool worker thread (that dispose
// is never called from the reader or writer thread is already ensured
@@ -935,7 +935,7 @@ void Bridge::dispose() throw (css::uno::RuntimeException) {
void Bridge::addEventListener(
css::uno::Reference< css::lang::XEventListener > const & xListener)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
assert(xListener.is());
{
@@ -952,7 +952,7 @@ void Bridge::addEventListener(
void Bridge::removeEventListener(
css::uno::Reference< css::lang::XEventListener > const & aListener)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(mutex_);
Listeners::iterator i(
diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx
index b5a4f9d8f705..07c0f927bade 100644
--- a/binaryurp/source/bridge.hxx
+++ b/binaryurp/source/bridge.hxx
@@ -175,26 +175,26 @@ private:
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
SAL_CALL getInstance(OUString const & sInstanceName)
- throw (com::sun::star::uno::RuntimeException);
+ throw (com::sun::star::uno::RuntimeException, std::exception);
virtual OUString SAL_CALL getName()
- throw (com::sun::star::uno::RuntimeException);
+ throw (com::sun::star::uno::RuntimeException, std::exception);
virtual OUString SAL_CALL getDescription()
- throw (com::sun::star::uno::RuntimeException);
+ throw (com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL dispose()
- throw (com::sun::star::uno::RuntimeException);
+ throw (com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL addEventListener(
com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
const & xListener)
- throw (com::sun::star::uno::RuntimeException);
+ throw (com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL removeEventListener(
com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
const & aListener)
- throw (com::sun::star::uno::RuntimeException);
+ throw (com::sun::star::uno::RuntimeException, std::exception);
// Only called from reader_ thread:
void sendCommitChangeRequest();
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index 06adb3a7fde5..4e832a7b2ef8 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -87,19 +87,19 @@ BridgeFactory::BridgeFactory(
BridgeFactory::~BridgeFactory() {}
OUString BridgeFactory::getImplementationName()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return static_getImplementationName();
}
sal_Bool BridgeFactory::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
css::uno::Sequence< OUString > BridgeFactory::getSupportedServiceNames()
- throw (css::uno::RuntimeException)
+ throw (css::uno::RuntimeException, std::exception)
{
return static_getSupportedServiceNames();
}
@@ -139,7 +139,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge(
}
css::uno::Reference< css::bridge::XBridge > BridgeFactory::getBridge(
- OUString const & sName) throw (css::uno::RuntimeException)
+ OUString const & sName) throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard g(*this);
BridgeMap::iterator i(named_.find(sName));
@@ -148,7 +148,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::getBridge(
}
css::uno::Sequence< css::uno::Reference< css::bridge::XBridge > >
-BridgeFactory::getExistingBridges() throw (css::uno::RuntimeException) {
+BridgeFactory::getExistingBridges() throw (css::uno::RuntimeException, std::exception) {
osl::MutexGuard g(*this);
if (unnamed_.size() > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx
index 79150bcffed1..075975c53a0d 100644
--- a/binaryurp/source/bridgefactory.hxx
+++ b/binaryurp/source/bridgefactory.hxx
@@ -84,13 +84,13 @@ private:
virtual ~BridgeFactory();
virtual OUString SAL_CALL getImplementationName()
- throw (com::sun::star::uno::RuntimeException);
+ throw (com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (com::sun::star::uno::RuntimeException);
+ throw (com::sun::star::uno::RuntimeException, std::exception);
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
+ getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception);
virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge >
SAL_CALL createBridge(
@@ -108,12 +108,12 @@ private:
virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge >
SAL_CALL getBridge(
OUString const & sName)
- throw (com::sun::star::uno::RuntimeException);
+ throw (com::sun::star::uno::RuntimeException, std::exception);
virtual
com::sun::star::uno::Sequence<
com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > >
- SAL_CALL getExistingBridges() throw (com::sun::star::uno::RuntimeException);
+ SAL_CALL getExistingBridges() throw (com::sun::star::uno::RuntimeException, std::exception);
typedef
std::list<