[Libreoffice-commits] core.git: shell/source

Stephan Bergmann sbergman at redhat.com
Fri Jan 27 11:07:45 UTC 2017


 shell/source/backends/kdebe/kdebackend.cxx |   49 +++++------------------------
 1 file changed, 10 insertions(+), 39 deletions(-)

New commits:
commit df60fbc3614ed7dd66b6ce935ef5236b9ef0ef32
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jan 27 12:07:10 2017 +0100

    Remove dynamic exception specifications from some TDE-only code
    
    Change-Id: Ic5fa5648d0d52bf5a16b5d3c32c549d5fffb2f4f

diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx
index 20059d8..a35c2c4 100644
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -75,66 +75,44 @@ public:
 private:
     virtual ~Service() override {}
 
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual OUString SAL_CALL getImplementationName() override
     { return getServiceImplementationName(); }
 
-    virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override
+    virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return ServiceName == getSupportedServiceNames()[0]; }
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
+    getSupportedServiceNames() override
     { return getServiceSupportedServiceNames(); }
 
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-    getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override
+    getPropertySetInfo() override
     { return css::uno::Reference< css::beans::XPropertySetInfo >(); }
 
     virtual void SAL_CALL setPropertyValue(
-        OUString const &, css::uno::Any const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        OUString const &, css::uno::Any const &) override;
 
     virtual css::uno::Any SAL_CALL getPropertyValue(
-        OUString const & PropertyName)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+        OUString const & PropertyName) override;
 
     virtual void SAL_CALL addPropertyChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &) override
     {}
 
     virtual void SAL_CALL removePropertyChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XPropertyChangeListener > const &) override
     {}
 
     virtual void SAL_CALL addVetoableChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &) override
     {}
 
     virtual void SAL_CALL removeVetoableChangeListener(
         OUString const &,
-        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
+        css::uno::Reference< css::beans::XVetoableChangeListener > const &) override
     {}
 
     bool enabled_;
@@ -152,10 +130,6 @@ Service::Service(): enabled_(false) {
 }
 
 void Service::setPropertyValue(OUString const &, css::uno::Any const &)
-    throw (
-        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     throw css::lang::IllegalArgumentException(
         OUString("setPropertyValue not supported"),
@@ -163,9 +137,6 @@ void Service::setPropertyValue(OUString const &, css::uno::Any const &)
 }
 
 css::uno::Any Service::getPropertyValue(OUString const & PropertyName)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     if ( PropertyName == "EnableATToolSupport" || PropertyName == "ExternalMailer" || PropertyName == "SourceViewFontHeight"
       || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName"


More information about the Libreoffice-commits mailing list