1 files changed, 20 insertions, 39 deletions

diff --git a/connectivity/source/drivers/postgresql/pq_statement.hxx b/connectivity/source/drivers/postgresql/pq_statement.hxx
index 437eac12c0e6..0ac5e40a711e 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.hxx
@@ -98,35 +98,25 @@ public:
 public: // XInterface
     virtual void SAL_CALL acquire() throw() override { Statement_BASE::acquire(); }
     virtual void SAL_CALL release() throw() override { Statement_BASE::release(); }
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType )
-        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & reqType ) override;
 
 public: // XCloseable
-    virtual void SAL_CALL close(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL close(  ) override;
 
 public: // XStatement
     virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(
-        const OUString& sql )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL execute( const OUString& sql )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+        const OUString& sql ) override;
+    virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override;
+    virtual sal_Bool SAL_CALL execute( const OUString& sql ) override;
+    virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection(  ) override;
 
 public: // XWarningsSupplier
-    virtual css::uno::Any SAL_CALL getWarnings(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL clearWarnings(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getWarnings(  ) override;
+    virtual void SAL_CALL clearWarnings(  ) override;
 
 public: // XTypeProvider, first implemented by OPropertySetHelper
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) override;
-    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8> SAL_CALL getImplementationId() override;
 
 public: // OPropertySetHelper
     virtual cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
@@ -135,13 +125,11 @@ public: // OPropertySetHelper
         css::uno::Any & rConvertedValue,
         css::uno::Any & rOldValue,
         sal_Int32 nHandle,
-        const css::uno::Any& rValue )
-        throw (css::lang::IllegalArgumentException) override;
+        const css::uno::Any& rValue ) override;
 
     virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
         sal_Int32 nHandle,
-        const css::uno::Any& rValue )
-        throw (css::uno::Exception, std::exception) override;
+        const css::uno::Any& rValue ) override;
 
     using ::cppu::OPropertySetHelper::getFastPropertyValue;
 
@@ -150,37 +138,30 @@ public: // OPropertySetHelper
         sal_Int32 nHandle ) const override;
 
     // XPropertySet
-    css::uno::Reference < css::beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo()
-        throw(css::uno::RuntimeException, std::exception) override;
+    css::uno::Reference < css::beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo() override;
 
 public: // XGeneratedResultSet
     virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
-    getGeneratedValues(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    getGeneratedValues(  ) override;
 
 public: // XMultipleResults
-    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getUpdateCount(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL getMoreResults(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet(  ) override;
+    virtual sal_Int32 SAL_CALL getUpdateCount(  ) override;
+    virtual sal_Bool SAL_CALL getMoreResults(  ) override;
 
 public: // OComponentHelper
     virtual void SAL_CALL disposing() override;
 
 public: // XResultSetMetaDataSupplier (is required by framework (see
         // dbaccess/source/core/api/preparedstatement.cxx::getMetaData() )
-    virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  )
-        throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData(  ) override;
 
 private:
     /// @throws css::sdbc::SQLException
     /// @throws css::uno::RuntimeException
-    void checkClosed() throw (css::sdbc::SQLException, css::uno::RuntimeException);
+    void checkClosed();
     /// @throws css::sdbc::SQLException
-    void raiseSQLException( const OUString & sql, const char * errorMsg )
-        throw ( css::sdbc::SQLException );
+    void raiseSQLException( const OUString & sql, const char * errorMsg );
 };