diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-27 08:38:48 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-27 08:39:31 +0100 |
commit | 72ef2d526b3df881647791ca5ea4b1815b508d3b (patch) | |
tree | 0c101ab8b6c7d1d1724cb93c262c6cfd2a1ab15a /shell/source | |
parent | c6d114be1fcf9f73c638e52f33278ca3dd53e2aa (diff) |
std::exception retrofit sequel
Change-Id: I7461c320e98b9a3605db26f4d58200789e1477df
Diffstat (limited to 'shell/source')
-rw-r--r-- | shell/source/backends/macbe/macbackend.hxx | 20 | ||||
-rw-r--r-- | shell/source/backends/macbe/macbackend.mm | 10 |
2 files changed, 15 insertions, 15 deletions
diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx index 386582d2e726..d7c3fab3ab9d 100644 --- a/shell/source/backends/macbe/macbackend.hxx +++ b/shell/source/backends/macbe/macbackend.hxx @@ -40,13 +40,13 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(const OUString& aServiceName) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); /** Provides the implementation name. @@ -64,7 +64,7 @@ public: // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw (css::uno::RuntimeException) + getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( @@ -73,20 +73,20 @@ public: css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException); + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); virtual css::uno::Any SAL_CALL getPropertyValue( OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException); + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); virtual void SAL_CALL addPropertyChangeListener( OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {} virtual void SAL_CALL removePropertyChangeListener( @@ -94,7 +94,7 @@ public: css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {} virtual void SAL_CALL addVetoableChangeListener( @@ -102,7 +102,7 @@ public: css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {} virtual void SAL_CALL removeVetoableChangeListener( @@ -110,7 +110,7 @@ public: css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) {} protected: diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm index 25bbe8d506bc..578295b580e9 100644 --- a/shell/source/backends/macbe/macbackend.mm +++ b/shell/source/backends/macbe/macbackend.mm @@ -205,7 +205,7 @@ void MacOSXBackend::setPropertyValue( throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { throw css::lang::IllegalArgumentException( rtl::OUString( @@ -217,7 +217,7 @@ css::uno::Any MacOSXBackend::getPropertyValue( rtl::OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if ( PropertyName == "WorkPathVariable" ) { @@ -443,7 +443,7 @@ rtl::OUString SAL_CALL MacOSXBackend::getBackendName(void) rtl::OUString SAL_CALL MacOSXBackend::getImplementationName(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return getBackendName(); } @@ -457,13 +457,13 @@ uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getBackendServiceNames(void } sal_Bool SAL_CALL MacOSXBackend::supportsService(const rtl::OUString& aServiceName) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, aServiceName); } uno::Sequence<rtl::OUString> SAL_CALL MacOSXBackend::getSupportedServiceNames(void) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return getBackendServiceNames(); } |