summaryrefslogtreecommitdiffstats
path: root/binaryurp
diff options
context:
space:
mode:
Diffstat (limited to 'binaryurp')
-rw-r--r--binaryurp/source/bridge.cxx10
-rw-r--r--binaryurp/source/bridge.hxx18
-rw-r--r--binaryurp/source/bridgefactory.cxx10
-rw-r--r--binaryurp/source/bridgefactory.hxx19
4 files changed, 18 insertions, 39 deletions
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index d47b83410708..a47fbaa9a3cb 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -848,7 +848,7 @@ Bridge::~Bridge() {
}
css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
- OUString const & sInstanceName) throw (css::uno::RuntimeException, std::exception)
+ OUString const & sInstanceName)
{
if (sInstanceName.isEmpty()) {
throw css::uno::RuntimeException(
@@ -885,18 +885,18 @@ css::uno::Reference< css::uno::XInterface > Bridge::getInstance(
SAL_NO_ACQUIRE);
}
-OUString Bridge::getName() throw (css::uno::RuntimeException, std::exception) {
+OUString Bridge::getName() {
return name_;
}
-OUString Bridge::getDescription() throw (css::uno::RuntimeException, std::exception) {
+OUString Bridge::getDescription() {
OUStringBuffer b(name_);
b.append(':');
b.append(connection_->getDescription());
return b.makeStringAndClear();
}
-void Bridge::dispose() throw (css::uno::RuntimeException, std::exception) {
+void Bridge::dispose() {
// 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
@@ -911,7 +911,6 @@ void Bridge::dispose() throw (css::uno::RuntimeException, std::exception) {
void Bridge::addEventListener(
css::uno::Reference< css::lang::XEventListener > const & xListener)
- throw (css::uno::RuntimeException, std::exception)
{
assert(xListener.is());
{
@@ -928,7 +927,6 @@ void Bridge::addEventListener(
void Bridge::removeEventListener(
css::uno::Reference< css::lang::XEventListener > const & aListener)
- 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 517b69b81552..89bfac393a90 100644
--- a/binaryurp/source/bridge.hxx
+++ b/binaryurp/source/bridge.hxx
@@ -175,27 +175,21 @@ private:
virtual ~Bridge() override;
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
- SAL_CALL getInstance(OUString const & sInstanceName)
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ SAL_CALL getInstance(OUString const & sInstanceName) override;
- virtual OUString SAL_CALL getName()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getName() override;
- virtual OUString SAL_CALL getDescription()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getDescription() override;
- virtual void SAL_CALL dispose()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
virtual void SAL_CALL addEventListener(
com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
- const & xListener)
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ const & xListener) override;
virtual void SAL_CALL removeEventListener(
com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
- const & aListener)
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ const & aListener) override;
// Only called from reader_ thread:
void sendCommitChangeRequest();
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index 6e7e756e2a12..7f2f02a05d57 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -84,19 +84,16 @@ BridgeFactory::BridgeFactory():
BridgeFactory::~BridgeFactory() {}
OUString BridgeFactory::getImplementationName()
- throw (css::uno::RuntimeException, std::exception)
{
return static_getImplementationName();
}
sal_Bool BridgeFactory::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
css::uno::Sequence< OUString > BridgeFactory::getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
return static_getSupportedServiceNames();
}
@@ -106,9 +103,6 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge(
css::uno::Reference< css::connection::XConnection > const & aConnection,
css::uno::Reference< css::bridge::XInstanceProvider > const &
anInstanceProvider)
- throw (
- css::bridge::BridgeExistsException, css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception)
{
rtl::Reference< Bridge > b;
{
@@ -141,7 +135,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge(
}
css::uno::Reference< css::bridge::XBridge > BridgeFactory::getBridge(
- OUString const & sName) throw (css::uno::RuntimeException, std::exception)
+ OUString const & sName)
{
osl::MutexGuard g(m_aMutex);
BridgeMap::iterator i(named_.find(sName));
@@ -150,7 +144,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::getBridge(
}
css::uno::Sequence< css::uno::Reference< css::bridge::XBridge > >
-BridgeFactory::getExistingBridges() throw (css::uno::RuntimeException, std::exception) {
+BridgeFactory::getExistingBridges() {
osl::MutexGuard g(m_aMutex);
if (unnamed_.size() > SAL_MAX_INT32) {
throw css::uno::RuntimeException(
diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx
index 05e39b3dcfec..4d392c1e6a10 100644
--- a/binaryurp/source/bridgefactory.hxx
+++ b/binaryurp/source/bridgefactory.hxx
@@ -82,14 +82,12 @@ private:
virtual ~BridgeFactory() override;
- virtual OUString SAL_CALL getImplementationName()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ getSupportedServiceNames() override;
virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge >
SAL_CALL createBridge(
@@ -98,21 +96,16 @@ private:
com::sun::star::connection::XConnection > const & aConnection,
com::sun::star::uno::Reference<
com::sun::star::bridge::XInstanceProvider > const &
- anInstanceProvider)
- throw (
- com::sun::star::bridge::BridgeExistsException,
- com::sun::star::lang::IllegalArgumentException,
- com::sun::star::uno::RuntimeException, std::exception) override;
+ anInstanceProvider) override;
virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge >
SAL_CALL getBridge(
- OUString const & sName)
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ OUString const & sName) override;
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, std::exception) override;
+ SAL_CALL getExistingBridges() override;
void SAL_CALL disposing() override;
generated by cgit (git 2.34.1) at 2024-05-14 17:19:05 +0000