Remove dynamic exception specifications from !LIBO_INTERNAL_ONLY

...only odk/examples/ remains to be clean up

Change-Id: I875a1e8d6750b6b007bd75126b8010273e1f32d5

17 files changed, 381 insertions, 813 deletions

diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index 98b6d7b70dcc..8732d9d32f97 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -86,7 +86,6 @@ void SAL_CALL OConnection::release()
 }
 
 void OConnection::construct(const rtl::OUString& url, const Sequence< PropertyValue >& info)
-    throw(SQLException)
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -198,13 +197,12 @@ void OConnection::construct(const rtl::OUString& url, const Sequence< PropertyVa
     stmt->executeUpdate("SET NAMES utf8");
 }
 
-rtl::OUString OConnection::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+rtl::OUString OConnection::getImplementationName()
 {
     return rtl::OUString("com.sun.star.sdbc.drivers.mysqlc.OConnection");
 }
 
 css::uno::Sequence<rtl::OUString> OConnection::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence<rtl::OUString> s(1);
     s[0] = "com.sun.star.sdbc.Connection";
@@ -212,13 +210,11 @@ css::uno::Sequence<rtl::OUString> OConnection::getSupportedServiceNames()
 }
 
 sal_Bool OConnection::supportsService(rtl::OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 Reference< XStatement > SAL_CALL OConnection::createStatement()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -237,7 +233,6 @@ Reference< XStatement > SAL_CALL OConnection::createStatement()
 }
 
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(const rtl::OUString& _sSql)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -257,7 +252,6 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(const rtl
 }
 
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall(const rtl::OUString& /*_sSql*/ )
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -267,7 +261,6 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall(const rtl::OUS
 }
 
 rtl::OUString SAL_CALL OConnection::nativeSQL(const rtl::OUString& _sSql)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -283,7 +276,6 @@ rtl::OUString SAL_CALL OConnection::nativeSQL(const rtl::OUString& _sSql)
 }
 
 void SAL_CALL OConnection::setAutoCommit(sal_Bool autoCommit)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -295,7 +287,6 @@ void SAL_CALL OConnection::setAutoCommit(sal_Bool autoCommit)
 }
 
 sal_Bool SAL_CALL OConnection::getAutoCommit()
-    throw(SQLException, RuntimeException, std::exception)
 {
     // you have to distinguish which if you are in autocommit mode or not
     // at normal case true should be fine here
@@ -313,7 +304,6 @@ sal_Bool SAL_CALL OConnection::getAutoCommit()
 }
 
 void SAL_CALL OConnection::commit()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -325,7 +315,6 @@ void SAL_CALL OConnection::commit()
 }
 
 void SAL_CALL OConnection::rollback()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -337,7 +326,6 @@ void SAL_CALL OConnection::rollback()
 }
 
 sal_Bool SAL_CALL OConnection::isClosed()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -346,7 +334,6 @@ sal_Bool SAL_CALL OConnection::isClosed()
 }
 
 Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -365,7 +352,6 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData()
 }
 
 void SAL_CALL OConnection::setReadOnly(sal_Bool readOnly)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -374,7 +360,6 @@ void SAL_CALL OConnection::setReadOnly(sal_Bool readOnly)
 }
 
 sal_Bool SAL_CALL OConnection::isReadOnly()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -384,7 +369,6 @@ sal_Bool SAL_CALL OConnection::isReadOnly()
 }
 
 void SAL_CALL OConnection::setCatalog(const rtl::OUString& catalog)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -398,7 +382,6 @@ void SAL_CALL OConnection::setCatalog(const rtl::OUString& catalog)
 }
 
 rtl::OUString SAL_CALL OConnection::getCatalog()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -413,7 +396,6 @@ rtl::OUString SAL_CALL OConnection::getCatalog()
 }
 
 void SAL_CALL OConnection::setTransactionIsolation(sal_Int32 level)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -447,7 +429,6 @@ void SAL_CALL OConnection::setTransactionIsolation(sal_Int32 level)
 }
 
 sal_Int32 SAL_CALL OConnection::getTransactionIsolation()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -468,7 +449,6 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation()
 }
 
 Reference<XNameAccess> SAL_CALL OConnection::getTypeMap()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -478,7 +458,6 @@ Reference<XNameAccess> SAL_CALL OConnection::getTypeMap()
 }
 
 void SAL_CALL OConnection::setTypeMap(const Reference<XNameAccess >& typeMap)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -488,7 +467,6 @@ void SAL_CALL OConnection::setTypeMap(const Reference<XNameAccess >& typeMap)
 
 // XCloseable
 void SAL_CALL OConnection::close()
-    throw(SQLException, RuntimeException, std::exception)
 {
     /*
       we need block, because the mutex is a local variable,
@@ -504,7 +482,6 @@ void SAL_CALL OConnection::close()
 
 // XWarningsSupplier
 Any SAL_CALL OConnection::getWarnings()
-    throw(SQLException, RuntimeException, std::exception)
 {
     Any x = Any();
     // when you collected some warnings -> return it
@@ -512,7 +489,6 @@ Any SAL_CALL OConnection::getWarnings()
 }
 
 void SAL_CALL OConnection::clearWarnings()
-    throw(SQLException, RuntimeException, std::exception)
 {
     // you should clear your collected warnings here#
 }
@@ -538,7 +514,6 @@ void OConnection::disposing()
 }
 
 sal_Int32 OConnection::getMysqlVersion()
-    throw(SQLException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx
index 5f1a6a33beed..4d2d74f22f37 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -110,11 +110,12 @@ namespace connectivity
             bool    m_bClosed;
 
         public:
-            sal_Int32 getMysqlVersion()
-                                                                throw(SQLException, RuntimeException);
+            /// @throws SQLException
+            /// @throws RuntimeException
+            sal_Int32 getMysqlVersion();
 
-            void construct(const rtl::OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info)
-                                                                throw(SQLException);
+            /// @throws SQLException
+            void construct(const rtl::OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info);
 
             OConnection(MysqlCDriver& _rDriver, sql::Driver * cppDriver);
             virtual ~OConnection();
@@ -129,79 +130,57 @@ namespace connectivity
             virtual void SAL_CALL release()                     throw() SAL_OVERRIDE;
 
             // XServiceInfo
-            virtual rtl::OUString SAL_CALL getImplementationName()
-                throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE;
 
             virtual sal_Bool SAL_CALL supportsService(
-                rtl::OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception)
+                rtl::OUString const & ServiceName)
                 SAL_OVERRIDE;
 
             virtual css::uno::Sequence<rtl::OUString> SAL_CALL
-            getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+            getSupportedServiceNames()
                 SAL_OVERRIDE;
 
             // XConnection
-            css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement()
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement() SAL_OVERRIDE;
 
-            css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement(const rtl::OUString& sql)
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement(const rtl::OUString& sql) SAL_OVERRIDE;
 
-            css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall(const rtl::OUString& sql)
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall(const rtl::OUString& sql) SAL_OVERRIDE;
 
-            rtl::OUString SAL_CALL nativeSQL(const rtl::OUString& sql)
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL nativeSQL(const rtl::OUString& sql) SAL_OVERRIDE;
 
-            void SAL_CALL setAutoCommit(sal_Bool autoCommit)
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setAutoCommit(sal_Bool autoCommit) SAL_OVERRIDE;
 
-            sal_Bool SAL_CALL getAutoCommit()
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL getAutoCommit() SAL_OVERRIDE;
 
-            void SAL_CALL commit()
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL commit() SAL_OVERRIDE;
 
-            void SAL_CALL rollback()
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL rollback() SAL_OVERRIDE;
 
-            sal_Bool SAL_CALL isClosed()
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL isClosed() SAL_OVERRIDE;
 
-            css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData()
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData() SAL_OVERRIDE;
 
-            void SAL_CALL setReadOnly(sal_Bool readOnly)
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setReadOnly(sal_Bool readOnly) SAL_OVERRIDE;
 
-            sal_Bool SAL_CALL isReadOnly()
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL isReadOnly() SAL_OVERRIDE;
 
-            void SAL_CALL setCatalog(const rtl::OUString& catalog)
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setCatalog(const rtl::OUString& catalog) SAL_OVERRIDE;
 
-            rtl::OUString SAL_CALL getCatalog()
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getCatalog() SAL_OVERRIDE;
 
-            void SAL_CALL setTransactionIsolation(sal_Int32 level)
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setTransactionIsolation(sal_Int32 level) SAL_OVERRIDE;
 
-            sal_Int32 SAL_CALL getTransactionIsolation()
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getTransactionIsolation() SAL_OVERRIDE;
 
-            my_XNameAccessRef SAL_CALL getTypeMap()
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            my_XNameAccessRef SAL_CALL getTypeMap() SAL_OVERRIDE;
 
-            void SAL_CALL setTypeMap(const my_XNameAccessRef& typeMap)
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setTypeMap(const my_XNameAccessRef& typeMap) SAL_OVERRIDE;
             // XCloseable
-            void SAL_CALL close()
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL close() SAL_OVERRIDE;
             // XWarningsSupplier
-            css::uno::Any SAL_CALL getWarnings()
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL clearWarnings()
-                                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Any SAL_CALL getWarnings() SAL_OVERRIDE;
+            void SAL_CALL clearWarnings() SAL_OVERRIDE;
 
             // TODO: Not used
             //sal_Int32 sdbcColumnType(rtl::OUString typeName);
diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx
index bc07e9abf692..b5bb7dd65ada 100644
--- a/mysqlc/source/mysqlc_databasemetadata.cxx
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -178,157 +178,131 @@ bool ODatabaseMetaData::impl_getRSTypeMetaData(const sal_Char* _methodName, bool
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getStringMetaData("getCatalogSeparator", &sql::DatabaseMetaData::getCatalogSeparator);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxBinaryLiteralLength", &sql::DatabaseMetaData::getMaxBinaryLiteralLength);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxRowSize", &sql::DatabaseMetaData::getMaxRowSize);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxCatalogNameLength", &sql::DatabaseMetaData::getMaxCatalogNameLength);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxCharLiteralLength", &sql::DatabaseMetaData::getMaxCharLiteralLength);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxColumnNameLength", &sql::DatabaseMetaData::getMaxColumnNameLength);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxColumnsInIndex", &sql::DatabaseMetaData::getMaxColumnsInIndex);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxCursorNameLength", &sql::DatabaseMetaData::getMaxCursorNameLength);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxConnections", &sql::DatabaseMetaData::getMaxConnections);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxColumnsInTable", &sql::DatabaseMetaData::getMaxColumnsInTable);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxStatementLength", &sql::DatabaseMetaData::getMaxStatementLength);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxTableNameLength", &sql::DatabaseMetaData::getMaxTableNameLength);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxTablesInSelect", &sql::DatabaseMetaData::getMaxTablesInSelect);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("doesMaxRowSizeIncludeBlobs", &sql::DatabaseMetaData::doesMaxRowSizeIncludeBlobs);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("storesLowerCaseQuotedIdentifiers", &sql::DatabaseMetaData::storesLowerCaseQuotedIdentifiers);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("storesLowerCaseIdentifiers", &sql::DatabaseMetaData::storesLowerCaseIdentifiers);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseQuotedIdentifiers()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("storesMixedCaseQuotedIdentifiers", &sql::DatabaseMetaData::storesMixedCaseQuotedIdentifiers);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("storesMixedCaseIdentifiers", &sql::DatabaseMetaData::storesMixedCaseIdentifiers);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("storesUpperCaseQuotedIdentifiers", &sql::DatabaseMetaData::storesUpperCaseQuotedIdentifiers);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("storesUpperCaseIdentifiers", &sql::DatabaseMetaData::storesUpperCaseIdentifiers);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithAddColumn()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsAlterTableWithAddColumn", &sql::DatabaseMetaData::supportsAlterTableWithAddColumn);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithDropColumn()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsAlterTableWithDropColumn", &sql::DatabaseMetaData::supportsAlterTableWithDropColumn);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxIndexLength", &sql::DatabaseMetaData::getMaxIndexLength);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsNonNullableColumns", &sql::DatabaseMetaData::supportsNonNullableColumns);
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getStringMetaData("getCatalogTerm", &sql::DatabaseMetaData::getCatalogTerm);
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString()
-    throw(SQLException, RuntimeException, std::exception)
 {
     if (!identifier_quote_string_set) {
         identifier_quote_string = impl_getStringMetaData("getIdentifierQuoteString", &sql::DatabaseMetaData::getIdentifierQuoteString);
@@ -338,241 +312,201 @@ rtl::OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString()
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getStringMetaData("getExtraNameCharacters", &sql::DatabaseMetaData::getExtraNameCharacters);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsDifferentTableCorrelationNames", &sql::DatabaseMetaData::supportsDifferentTableCorrelationNames);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::isCatalogAtStart()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("isCatalogAtStart", &sql::DatabaseMetaData::isCatalogAtStart);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("dataDefinitionIgnoredInTransactions", &sql::DatabaseMetaData::dataDefinitionIgnoredInTransactions);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("dataDefinitionCausesTransactionCommit", &sql::DatabaseMetaData::dataDefinitionCausesTransactionCommit);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsDataManipulationTransactionsOnly", &sql::DatabaseMetaData::supportsDataManipulationTransactionsOnly);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsDataDefinitionAndDataManipulationTransactions", &sql::DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsPositionedDelete", &sql::DatabaseMetaData::supportsPositionedDelete);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsPositionedUpdate", &sql::DatabaseMetaData::supportsPositionedUpdate);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsOpenStatementsAcrossRollback", &sql::DatabaseMetaData::supportsOpenStatementsAcrossRollback);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsOpenStatementsAcrossCommit", &sql::DatabaseMetaData::supportsOpenStatementsAcrossCommit);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsOpenCursorsAcrossCommit", &sql::DatabaseMetaData::supportsOpenCursorsAcrossCommit);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsOpenCursorsAcrossRollback", &sql::DatabaseMetaData::supportsOpenCursorsAcrossRollback);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel(sal_Int32 level)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsTransactionIsolationLevel", &sql::DatabaseMetaData::supportsTransactionIsolationLevel, level);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInDataManipulation()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsSchemasInDataManipulation", &sql::DatabaseMetaData::supportsSchemasInDataManipulation);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsANSI92FullSQL", &sql::DatabaseMetaData::supportsANSI92FullSQL);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsANSI92EntryLevelSQL", &sql::DatabaseMetaData::supportsANSI92EntryLevelSQL);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsIntegrityEnhancementFacility", &sql::DatabaseMetaData::supportsIntegrityEnhancementFacility);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsSchemasInIndexDefinitions", &sql::DatabaseMetaData::supportsSchemasInIndexDefinitions);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInTableDefinitions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsSchemasInTableDefinitions", &sql::DatabaseMetaData::supportsSchemasInTableDefinitions);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInTableDefinitions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsCatalogsInTableDefinitions", &sql::DatabaseMetaData::supportsCatalogsInTableDefinitions);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsCatalogsInIndexDefinitions", &sql::DatabaseMetaData::supportsCatalogsInIndexDefinitions);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInDataManipulation()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsCatalogsInDataManipulation", &sql::DatabaseMetaData::supportsCatalogsInDataManipulation);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsOuterJoins", &sql::DatabaseMetaData::supportsOuterJoins);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatements()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxStatements", &sql::DatabaseMetaData::getMaxStatements);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxProcedureNameLength", &sql::DatabaseMetaData::getMaxProcedureNameLength);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxSchemaNameLength", &sql::DatabaseMetaData::getMaxSchemaNameLength);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsTransactions", &sql::DatabaseMetaData::supportsTransactions);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("allProceduresAreCallable", &sql::DatabaseMetaData::allProceduresAreCallable);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsStoredProcedures", &sql::DatabaseMetaData::supportsStoredProcedures);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsSelectForUpdate", &sql::DatabaseMetaData::supportsSelectForUpdate);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("allTablesAreSelectable", &sql::DatabaseMetaData::allTablesAreSelectable);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("isReadOnly", &sql::DatabaseMetaData::isReadOnly);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("usesLocalFiles", &sql::DatabaseMetaData::usesLocalFiles);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("usesLocalFilePerTable", &sql::DatabaseMetaData::usesLocalFilePerTable);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsTypeConversion", &sql::DatabaseMetaData::supportsTypeConversion);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("nullPlusNonNullIsNull", &sql::DatabaseMetaData::nullPlusNonNullIsNull);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsColumnAliasing", &sql::DatabaseMetaData::supportsColumnAliasing);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsTableCorrelationNames", &sql::DatabaseMetaData::supportsTableCorrelationNames);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 /* fromType */, sal_Int32 /* toType */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     try {
         /* ToDo -> use supportsConvert( fromType, toType) */
@@ -588,218 +522,182 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 /* fromType */, s
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsExpressionsInOrderBy", &sql::DatabaseMetaData::supportsExpressionsInOrderBy);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsGroupBy", &sql::DatabaseMetaData::supportsGroupBy);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsGroupByBeyondSelect", &sql::DatabaseMetaData::supportsGroupByBeyondSelect);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsGroupByUnrelated", &sql::DatabaseMetaData::supportsGroupByUnrelated);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsMultipleTransactions", &sql::DatabaseMetaData::supportsMultipleTransactions);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsMultipleResultSets", &sql::DatabaseMetaData::supportsMultipleResultSets);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsLikeEscapeClause", &sql::DatabaseMetaData::supportsLikeEscapeClause);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsOrderByUnrelated", &sql::DatabaseMetaData::supportsOrderByUnrelated);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsUnion", &sql::DatabaseMetaData::supportsUnion);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsUnionAll", &sql::DatabaseMetaData::supportsUnionAll);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsMixedCaseIdentifiers", &sql::DatabaseMetaData::supportsMixedCaseIdentifiers);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsMixedCaseQuotedIdentifiers", &sql::DatabaseMetaData::supportsMixedCaseQuotedIdentifiers);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("nullsAreSortedAtEnd", &sql::DatabaseMetaData::nullsAreSortedAtEnd);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("nullsAreSortedAtStart", &sql::DatabaseMetaData::nullsAreSortedAtStart);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("nullsAreSortedHigh", &sql::DatabaseMetaData::nullsAreSortedHigh);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("nullsAreSortedLow", &sql::DatabaseMetaData::nullsAreSortedLow);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsSchemasInProcedureCalls", &sql::DatabaseMetaData::supportsSchemasInProcedureCalls);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsSchemasInPrivilegeDefinitions", &sql::DatabaseMetaData::supportsSchemasInPrivilegeDefinitions);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsCatalogsInProcedureCalls", &sql::DatabaseMetaData::supportsCatalogsInProcedureCalls);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsCatalogsInPrivilegeDefinitions", &sql::DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsCorrelatedSubqueries", &sql::DatabaseMetaData::supportsCorrelatedSubqueries);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsSubqueriesInComparisons", &sql::DatabaseMetaData::supportsSubqueriesInComparisons);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsSubqueriesInExists", &sql::DatabaseMetaData::supportsSubqueriesInExists);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsSubqueriesInIns", &sql::DatabaseMetaData::supportsSubqueriesInIns);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsSubqueriesInQuantifieds", &sql::DatabaseMetaData::supportsSubqueriesInQuantifieds);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsANSI92IntermediateSQL", &sql::DatabaseMetaData::supportsANSI92IntermediateSQL);
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getURL()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return m_rConnection.getConnectionSettings().connectionURL;
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getUserName()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getStringMetaData("getUserName", &sql::DatabaseMetaData::getUserName);
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName()
-    throw(SQLException, RuntimeException, std::exception)
 {
     rtl::OUString aValue( "MySQL Connector/OO.org" );
     return aValue;
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return rtl::OUString( "0.9.2" );
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getStringMetaData("getDatabaseProductVersion", &sql::DatabaseMetaData::getDatabaseProductVersion);
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getStringMetaData("getDatabaseProductName", &sql::DatabaseMetaData::getDatabaseProductName);
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getStringMetaData("getProcedureTerm", &sql::DatabaseMetaData::getProcedureTerm);
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getStringMetaData("getSchemaTerm", &sql::DatabaseMetaData::getSchemaTerm);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion()
-    throw(RuntimeException, std::exception)
 {
     return MARIADBC_VERSION_MAJOR;
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation()
-    throw(SQLException, RuntimeException, std::exception)
 {
     try {
         switch (meta->getDefaultTransactionIsolation()) {
@@ -819,109 +717,91 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation()
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion()
-    throw(RuntimeException, std::exception)
 {
     return MARIADBC_VERSION_MINOR;
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getStringMetaData("getSQLKeywords", &sql::DatabaseMetaData::getSQLKeywords);
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getStringMetaData("getSearchStringEscape", &sql::DatabaseMetaData::getSearchStringEscape);
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getStringMetaData("getStringFunctions", &sql::DatabaseMetaData::getStringFunctions);
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getStringMetaData("getTimeDateFunctions", &sql::DatabaseMetaData::getTimeDateFunctions);
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getStringMetaData("getSystemFunctions", &sql::DatabaseMetaData::getSystemFunctions);
 }
 
 rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getStringMetaData("getNumericFunctions", &sql::DatabaseMetaData::getNumericFunctions);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsExtendedSQLGrammar", &sql::DatabaseMetaData::supportsExtendedSQLGrammar);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsCoreSQLGrammar", &sql::DatabaseMetaData::supportsCoreSQLGrammar);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsMinimumSQLGrammar", &sql::DatabaseMetaData::supportsMinimumSQLGrammar);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsFullOuterJoins", &sql::DatabaseMetaData::supportsFullOuterJoins);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsLimitedOuterJoins", &sql::DatabaseMetaData::supportsLimitedOuterJoins);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxColumnsInGroupBy", &sql::DatabaseMetaData::getMaxColumnsInGroupBy);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxColumnsInOrderBy", &sql::DatabaseMetaData::getMaxColumnsInOrderBy);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxColumnsInSelect", &sql::DatabaseMetaData::getMaxColumnsInSelect);
 }
 
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getInt32MetaData("getMaxUserNameLength", &sql::DatabaseMetaData::getMaxUserNameLength);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType(sal_Int32 setType)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getRSTypeMetaData("supportsResultSetType", &sql::DatabaseMetaData::supportsResultSetType, setType);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency)
-    throw(SQLException, RuntimeException, std::exception)
 {
     /* TODO: Check this out */
     try {
@@ -940,67 +820,56 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(sal_Int32 setT
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible(sal_Int32 setType)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getRSTypeMetaData("ownUpdatesAreVisible", &sql::DatabaseMetaData::ownUpdatesAreVisible, setType);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible(sal_Int32 setType)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getRSTypeMetaData("ownDeletesAreVisible", &sql::DatabaseMetaData::ownDeletesAreVisible, setType);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible(sal_Int32 setType)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getRSTypeMetaData("ownInsertsAreVisible", &sql::DatabaseMetaData::ownInsertsAreVisible, setType);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible(sal_Int32 setType)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getRSTypeMetaData("othersUpdatesAreVisible", &sql::DatabaseMetaData::othersUpdatesAreVisible, setType);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible(sal_Int32 setType)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getRSTypeMetaData("othersDeletesAreVisible", &sql::DatabaseMetaData::othersDeletesAreVisible, setType);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible(sal_Int32 setType)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getRSTypeMetaData("othersInsertsAreVisible", &sql::DatabaseMetaData::othersInsertsAreVisible, setType);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected(sal_Int32 setType)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getRSTypeMetaData("updatesAreDetected", &sql::DatabaseMetaData::updatesAreDetected, setType);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected(sal_Int32 setType)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getRSTypeMetaData("deletesAreDetected", &sql::DatabaseMetaData::deletesAreDetected, setType);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected(sal_Int32 setType)
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getRSTypeMetaData("insertsAreDetected", &sql::DatabaseMetaData::insertsAreDetected, setType);
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return impl_getBoolMetaData("supportsBatchUpdates", &sql::DatabaseMetaData::supportsBatchUpdates);
 }
 
 Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return &m_rConnection;
 }
@@ -1013,7 +882,6 @@ Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection()
 */
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes()
-    throw(SQLException, RuntimeException, std::exception)
 {
     const char * table_types[] = {"TABLE", "VIEW"};
     sal_Int32 requiredVersion[] = {0, 50000};
@@ -1034,7 +902,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes()
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
-    throw(SQLException, RuntimeException, std::exception)
 {
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
 
@@ -1073,7 +940,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo()
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs()
-    throw(SQLException, RuntimeException, std::exception)
 {
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
@@ -1103,7 +969,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs()
 }
 
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas()
-    throw(SQLException, RuntimeException, std::exception)
 {
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
@@ -1144,7 +1009,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
         const rtl::OUString& schema,
         const rtl::OUString& table,
         const rtl::OUString& columnNamePattern)
-    throw(SQLException, RuntimeException, std::exception)
 {
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
@@ -1183,7 +1047,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
         const rtl::OUString& schemaPattern,
         const rtl::OUString& tableNamePattern,
         const rtl::OUString& columnNamePattern)
-    throw(SQLException, RuntimeException, std::exception)
 {
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
@@ -1228,7 +1091,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
         const rtl::OUString& schemaPattern,
         const rtl::OUString& tableNamePattern,
         const Sequence< rtl::OUString >& types )
-    throw(SQLException, RuntimeException, std::exception)
 {
     sal_Int32 nLength = types.getLength();
 
@@ -1286,7 +1148,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
         const rtl::OUString& /* schemaPattern */,
         const rtl::OUString& /* procedureNamePattern */,
         const rtl::OUString& /* columnNamePattern */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     // Currently there is no information available
     return nullptr;
@@ -1296,7 +1157,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
         const Any& catalog,
         const rtl::OUString& schemaPattern,
         const rtl::OUString& procedureNamePattern)
-    throw(SQLException, RuntimeException, std::exception)
 {
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
@@ -1337,7 +1197,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
         const Any& /* catalog */,
         const rtl::OUString& /* schema */,
         const rtl::OUString& /* table */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
@@ -1349,7 +1208,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
         const Any&  catalog ,
         const rtl::OUString&  schema ,
         const rtl::OUString&  table )
-    throw(SQLException, RuntimeException, std::exception)
 {
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
@@ -1385,7 +1243,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
         const Any& catalog,
         const rtl::OUString& schema,
         const rtl::OUString& table)
-    throw(SQLException, RuntimeException, std::exception)
 {
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
@@ -1422,7 +1279,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
         const Any& catalog,
         const rtl::OUString& schema,
         const rtl::OUString& table)
-    throw(SQLException, RuntimeException, std::exception)
 {
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
@@ -1461,7 +1317,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
         const rtl::OUString& table,
         sal_Bool unique,
         sal_Bool approximate)
-    throw(SQLException, RuntimeException, std::exception)
 {
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
@@ -1500,7 +1355,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
         const rtl::OUString& table,
         sal_Int32 scope,
         sal_Bool nullable)
-    throw(SQLException, RuntimeException, std::exception)
 {
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
@@ -1537,7 +1391,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
         const Any& catalog,
         const rtl::OUString& schemaPattern,
         const rtl::OUString& tableNamePattern)
-    throw(SQLException, RuntimeException, std::exception)
 {
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
@@ -1598,7 +1451,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
         const Any& foreignCatalog,
         const rtl::OUString& foreignSchema,
         const rtl::OUString& foreignTable)
-    throw(SQLException, RuntimeException, std::exception)
 {
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
@@ -1639,7 +1491,6 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs(
         const rtl::OUString& /* schemaPattern */,
         const rtl::OUString& /* typeNamePattern */,
         const Sequence< sal_Int32 >& /* types */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getUDTs", *this);
     return nullptr;
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx
index 0406793732fe..f32a06107268 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -64,158 +64,155 @@ namespace connectivity
 
             // as I mentioned before this interface is really BIG
             // XDatabaseMetaData
-            sal_Bool SAL_CALL allProceduresAreCallable()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL allTablesAreSelectable()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getURL()                      throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getUserName()                 throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL isReadOnly()                          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL nullsAreSortedHigh()                  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL nullsAreSortedLow()                   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL nullsAreSortedAtStart()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL nullsAreSortedAtEnd()                 throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getDatabaseProductName()      throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getDatabaseProductVersion()   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getDriverName()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getDriverVersion()                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getDriverMajorVersion()              throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getDriverMinorVersion()              throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL usesLocalFiles()                      throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL usesLocalFilePerTable()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsMixedCaseIdentifiers()        throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL storesUpperCaseIdentifiers()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL storesLowerCaseIdentifiers()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL storesMixedCaseIdentifiers()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers()  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers()    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers()    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers()    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getIdentifierQuoteString()    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getSQLKeywords()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getNumericFunctions()         throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getStringFunctions()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getSystemFunctions()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getTimeDateFunctions()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getSearchStringEscape()       throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getExtraNameCharacters()      throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsAlterTableWithAddColumn()     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsAlterTableWithDropColumn()    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsColumnAliasing()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL nullPlusNonNullIsNull()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsTypeConversion()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsConvert(sal_Int32 fromType, sal_Int32 toType)
-                                                                    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsTableCorrelationNames()       throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsDifferentTableCorrelationNames() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsExpressionsInOrderBy()        throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsOrderByUnrelated()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsGroupBy()                     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsGroupByUnrelated()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsGroupByBeyondSelect()         throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsLikeEscapeClause()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsMultipleResultSets()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsMultipleTransactions()        throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsNonNullableColumns()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsMinimumSQLGrammar()           throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsCoreSQLGrammar()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsExtendedSQLGrammar()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsANSI92EntryLevelSQL()         throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsANSI92IntermediateSQL()       throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsANSI92FullSQL()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsIntegrityEnhancementFacility()throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsOuterJoins()                  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsFullOuterJoins()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsLimitedOuterJoins()           throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getSchemaTerm()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getProcedureTerm()                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getCatalogTerm()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL isCatalogAtStart()                    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getCatalogSeparator()         throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSchemasInDataManipulation()   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSchemasInProcedureCalls()     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSchemasInTableDefinitions()   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSchemasInIndexDefinitions()   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsCatalogsInDataManipulation()  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsCatalogsInProcedureCalls()    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsCatalogsInTableDefinitions()  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions()  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsPositionedDelete()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsPositionedUpdate()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSelectForUpdate()             throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsStoredProcedures()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSubqueriesInComparisons()     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSubqueriesInExists()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSubqueriesInIns()             throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsSubqueriesInQuantifieds()     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsCorrelatedSubqueries()        throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsUnion()                       throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsUnionAll()                    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit()     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback()   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit()  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxBinaryLiteralLength()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxCharLiteralLength()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxColumnNameLength()             throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxColumnsInGroupBy()             throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxColumnsInIndex()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxColumnsInOrderBy()             throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxColumnsInSelect()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxColumnsInTable()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxConnections()                  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxCursorNameLength()             throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxIndexLength()                  throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxSchemaNameLength()             throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxProcedureNameLength()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxCatalogNameLength()            throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxRowSize()                      throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs()          throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxStatementLength()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxStatements()                   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxTableNameLength()              throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxTablesInSelect()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMaxUserNameLength()               throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getDefaultTransactionIsolation()     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsTransactions()                throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsTransactionIsolationLevel(sal_Int32 level)
-                                                                    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions()
-                                                                    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly()throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit()   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions()     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern, const rtl::OUString& columnNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const css::uno::Sequence< rtl::OUString >& types) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const rtl::OUString& columnNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, const rtl::OUString& columnNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, sal_Int32 scope, sal_Bool nullable) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference(const Any& primaryCatalog, const rtl::OUString& primarySchema, const rtl::OUString& primaryTable, const Any& foreignCatalog, const rtl::OUString& foreignSchema, const rtl::OUString& foreignTable) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, sal_Bool unique, sal_Bool approximate) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsResultSetType(sal_Int32 setType) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL ownUpdatesAreVisible(sal_Int32 setType)   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL ownDeletesAreVisible(sal_Int32 setType)   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL ownInsertsAreVisible(sal_Int32 setType)   throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL othersUpdatesAreVisible(sal_Int32 setType)throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL othersDeletesAreVisible(sal_Int32 setType)throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL othersInsertsAreVisible(sal_Int32 setType)throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL updatesAreDetected(sal_Int32 setType)     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType)     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType)     throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsBatchUpdates() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL allProceduresAreCallable() SAL_OVERRIDE;
+            sal_Bool SAL_CALL allTablesAreSelectable() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getURL() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getUserName() SAL_OVERRIDE;
+            sal_Bool SAL_CALL isReadOnly() SAL_OVERRIDE;
+            sal_Bool SAL_CALL nullsAreSortedHigh() SAL_OVERRIDE;
+            sal_Bool SAL_CALL nullsAreSortedLow() SAL_OVERRIDE;
+            sal_Bool SAL_CALL nullsAreSortedAtStart() SAL_OVERRIDE;
+            sal_Bool SAL_CALL nullsAreSortedAtEnd() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getDatabaseProductName() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getDatabaseProductVersion() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getDriverName() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getDriverVersion() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getDriverMajorVersion() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getDriverMinorVersion() SAL_OVERRIDE;
+            sal_Bool SAL_CALL usesLocalFiles() SAL_OVERRIDE;
+            sal_Bool SAL_CALL usesLocalFilePerTable() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsMixedCaseIdentifiers() SAL_OVERRIDE;
+            sal_Bool SAL_CALL storesUpperCaseIdentifiers() SAL_OVERRIDE;
+            sal_Bool SAL_CALL storesLowerCaseIdentifiers() SAL_OVERRIDE;
+            sal_Bool SAL_CALL storesMixedCaseIdentifiers() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers() SAL_OVERRIDE;
+            sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers() SAL_OVERRIDE;
+            sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers() SAL_OVERRIDE;
+            sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getIdentifierQuoteString() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getSQLKeywords() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getNumericFunctions() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getStringFunctions() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getSystemFunctions() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getTimeDateFunctions() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getSearchStringEscape() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getExtraNameCharacters() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsAlterTableWithAddColumn() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsAlterTableWithDropColumn() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsColumnAliasing() SAL_OVERRIDE;
+            sal_Bool SAL_CALL nullPlusNonNullIsNull() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsTypeConversion() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsConvert(sal_Int32 fromType, sal_Int32 toType) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsTableCorrelationNames() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsDifferentTableCorrelationNames() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsExpressionsInOrderBy() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsOrderByUnrelated() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsGroupBy() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsGroupByUnrelated() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsGroupByBeyondSelect() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsLikeEscapeClause() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsMultipleResultSets() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsMultipleTransactions() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsNonNullableColumns() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsMinimumSQLGrammar() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsCoreSQLGrammar() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsExtendedSQLGrammar() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsANSI92EntryLevelSQL() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsANSI92IntermediateSQL() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsANSI92FullSQL() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsIntegrityEnhancementFacility() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsOuterJoins() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsFullOuterJoins() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsLimitedOuterJoins() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getSchemaTerm() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getProcedureTerm() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getCatalogTerm() SAL_OVERRIDE;
+            sal_Bool SAL_CALL isCatalogAtStart() SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getCatalogSeparator() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSchemasInDataManipulation() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSchemasInProcedureCalls() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSchemasInTableDefinitions() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSchemasInIndexDefinitions() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsCatalogsInDataManipulation() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsCatalogsInProcedureCalls() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsCatalogsInTableDefinitions() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsPositionedDelete() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsPositionedUpdate() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSelectForUpdate() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsStoredProcedures() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSubqueriesInComparisons() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSubqueriesInExists() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSubqueriesInIns() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsSubqueriesInQuantifieds() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsCorrelatedSubqueries() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsUnion() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsUnionAll() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxBinaryLiteralLength() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxCharLiteralLength() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxColumnNameLength() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxColumnsInGroupBy() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxColumnsInIndex() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxColumnsInOrderBy() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxColumnsInSelect() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxColumnsInTable() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxConnections() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxCursorNameLength() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxIndexLength() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxSchemaNameLength() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxProcedureNameLength() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxCatalogNameLength() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxRowSize() SAL_OVERRIDE;
+            sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxStatementLength() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxStatements() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxTableNameLength() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxTablesInSelect() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMaxUserNameLength() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getDefaultTransactionIsolation() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsTransactions() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsTransactionIsolationLevel(sal_Int32 level) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly() SAL_OVERRIDE;
+            sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit() SAL_OVERRIDE;
+            sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions() SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern, const rtl::OUString& columnNamePattern) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const css::uno::Sequence< rtl::OUString >& types) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas() SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs() SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes() SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const rtl::OUString& columnNamePattern) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, const rtl::OUString& columnNamePattern) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, sal_Int32 scope, sal_Bool nullable) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference(const Any& primaryCatalog, const rtl::OUString& primarySchema, const rtl::OUString& primaryTable, const Any& foreignCatalog, const rtl::OUString& foreignSchema, const rtl::OUString& foreignTable) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo() SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, sal_Bool unique, sal_Bool approximate) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsResultSetType(sal_Int32 setType) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency) SAL_OVERRIDE;
+            sal_Bool SAL_CALL ownUpdatesAreVisible(sal_Int32 setType) SAL_OVERRIDE;
+            sal_Bool SAL_CALL ownDeletesAreVisible(sal_Int32 setType) SAL_OVERRIDE;
+            sal_Bool SAL_CALL ownInsertsAreVisible(sal_Int32 setType) SAL_OVERRIDE;
+            sal_Bool SAL_CALL othersUpdatesAreVisible(sal_Int32 setType) SAL_OVERRIDE;
+            sal_Bool SAL_CALL othersDeletesAreVisible(sal_Int32 setType) SAL_OVERRIDE;
+            sal_Bool SAL_CALL othersInsertsAreVisible(sal_Int32 setType) SAL_OVERRIDE;
+            sal_Bool SAL_CALL updatesAreDetected(sal_Int32 setType) SAL_OVERRIDE;
+            sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType) SAL_OVERRIDE;
+            sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType) SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsBatchUpdates() SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection() SAL_OVERRIDE;
         };
     }
 }
diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx
index 100a6c591855..02d0184f83ef 100644
--- a/mysqlc/source/mysqlc_driver.cxx
+++ b/mysqlc/source/mysqlc_driver.cxx
@@ -71,13 +71,11 @@ void MysqlCDriver::disposing()
 
 // static ServiceInfo
 rtl::OUString MysqlCDriver::getImplementationName_Static()
-    throw(RuntimeException)
 {
     return rtl::OUString( "com.sun.star.comp.sdbc.mysqlc.MysqlCDriver"  );
 }
 
 Sequence< rtl::OUString > MysqlCDriver::getSupportedServiceNames_Static()
-    throw(RuntimeException)
 {
     // which service is supported
     // for more information @see com.sun.star.sdbc.Driver
@@ -87,19 +85,16 @@ Sequence< rtl::OUString > MysqlCDriver::getSupportedServiceNames_Static()
 }
 
 rtl::OUString SAL_CALL MysqlCDriver::getImplementationName()
-    throw(RuntimeException, std::exception)
 {
     return getImplementationName_Static();
 }
 
 sal_Bool SAL_CALL MysqlCDriver::supportsService(const rtl::OUString& _rServiceName)
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, _rServiceName);
 }
 
 Sequence< rtl::OUString > SAL_CALL MysqlCDriver::getSupportedServiceNames()
-    throw(RuntimeException, std::exception)
 {
     return getSupportedServiceNames_Static();
 }
@@ -186,7 +181,6 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
 }
 
 Reference< XConnection > SAL_CALL MysqlCDriver::connect(const rtl::OUString& url, const Sequence< PropertyValue >& info)
-    throw(SQLException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -218,13 +212,11 @@ Reference< XConnection > SAL_CALL MysqlCDriver::connect(const rtl::OUString& url
 }
 
 sal_Bool SAL_CALL MysqlCDriver::acceptsURL(const rtl::OUString& url)
-        throw(SQLException, RuntimeException, std::exception)
 {
     return url.startsWith("sdbc:mysqlc:");
 }
 
 Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const rtl::OUString& url, const Sequence< PropertyValue >& /* info */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     if (acceptsURL(url)) {
         ::std::vector< DriverPropertyInfo > aDriverInfo;
@@ -250,13 +242,11 @@ Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const rtl:
 }
 
 sal_Int32 SAL_CALL MysqlCDriver::getMajorVersion()
-    throw(RuntimeException, std::exception)
 {
     return MARIADBC_VERSION_MAJOR;
 }
 
 sal_Int32 SAL_CALL MysqlCDriver::getMinorVersion()
-    throw(RuntimeException, std::exception)
 {
     return MARIADBC_VERSION_MINOR;
 }
@@ -267,7 +257,6 @@ namespace mysqlc
 {
 
 Reference< XInterface >  SAL_CALL MysqlCDriver_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory)
-    throw(css::uno::Exception)
 {
     return(*(new MysqlCDriver(_rxFactory)));
 }
@@ -307,7 +296,6 @@ void release(oslInterlockedCount& _refCount,
 }
 
 void checkDisposed(bool _bThrow)
-    throw (DisposedException)
 {
     if (_bThrow) {
         throw DisposedException();
diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx
index ca10b2ee3b4b..7649fc51539e 100644
--- a/mysqlc/source/mysqlc_driver.hxx
+++ b/mysqlc/source/mysqlc_driver.hxx
@@ -48,7 +48,8 @@ namespace connectivity
         using ::com::sun::star::uno::Exception;
         using ::com::sun::star::uno::Reference;
         using ::com::sun::star::uno::Sequence;
-        Reference< css::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw(Exception);
+        /// @throws Exception
+        Reference< css::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFactory);
 
         typedef ::cppu::WeakComponentImplHelper2<   css::sdbc::XDriver,
                                                     css::lang::XServiceInfo > ODriver_BASE;
@@ -81,24 +82,24 @@ namespace connectivity
             // OComponentHelper
             void SAL_CALL disposing() SAL_OVERRIDE;
             // XInterface
-            static rtl::OUString getImplementationName_Static()                  throw(RuntimeException);
-            static Sequence< rtl::OUString > getSupportedServiceNames_Static()   throw(RuntimeException);
+            /// @throws RuntimeException
+            static rtl::OUString getImplementationName_Static();
+            /// @throws RuntimeException
+            static Sequence< rtl::OUString > getSupportedServiceNames_Static();
 
             // XServiceInfo
-            rtl::OUString SAL_CALL getImplementationName()                       throw(RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName)  throw(RuntimeException, std::exception) SAL_OVERRIDE;
-            Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()        throw(RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE;
+            sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) SAL_OVERRIDE;
+            Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() SAL_OVERRIDE;
 
             // XDriver
-            Reference< css::sdbc::XConnection > SAL_CALL connect(const rtl::OUString& url, const Sequence< css::beans::PropertyValue >& info)
-                                                                            throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            Reference< css::sdbc::XConnection > SAL_CALL connect(const rtl::OUString& url, const Sequence< css::beans::PropertyValue >& info) SAL_OVERRIDE;
 
-            sal_Bool SAL_CALL acceptsURL(const rtl::OUString& url) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo(const rtl::OUString& url, const Sequence< css::beans::PropertyValue >& info)
-                                                                            throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL acceptsURL(const rtl::OUString& url) SAL_OVERRIDE;
+            Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo(const rtl::OUString& url, const Sequence< css::beans::PropertyValue >& info) SAL_OVERRIDE;
 
-            sal_Int32 SAL_CALL getMajorVersion()                            throw(RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getMinorVersion()                            throw(RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMajorVersion() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getMinorVersion() SAL_OVERRIDE;
 
             const Reference< css::lang::XMultiServiceFactory >& getFactory() const { return m_xFactory; }
 
diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx
index 232583dd6591..2c4eb1f53853 100644
--- a/mysqlc/source/mysqlc_general.cxx
+++ b/mysqlc/source/mysqlc_general.cxx
@@ -32,7 +32,6 @@ namespace mysqlc_sdbc_driver
 {
 
 void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext )
-    throw (SQLException)
 {
     const rtl::OUString sMessage = rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ": feature not implemented.";
     throw SQLException(
@@ -45,7 +44,6 @@ void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, co
 }
 
 void throwInvalidArgumentException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext )
-    throw (SQLException)
 {
     const rtl::OUString sMessage = rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ": invalid arguments.";
     throw SQLException(
diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx
index 9e4417dbc5a4..1f60a1938afb 100644
--- a/mysqlc/source/mysqlc_general.hxx
+++ b/mysqlc/source/mysqlc_general.hxx
@@ -31,17 +31,17 @@ namespace mysqlc_sdbc_driver
 {
     rtl::OUString getStringFromAny(const css::uno::Any& _rAny);
 
+    /// @throws css::sdbc::SQLException
     void throwFeatureNotImplementedException(
             const sal_Char* _pAsciiFeatureName,
             const css::uno::Reference< css::uno::XInterface >& _rxContext
-        )
-        throw (css::sdbc::SQLException);
+        );
 
+    /// @throws css::sdbc::SQLException
     void throwInvalidArgumentException(
             const sal_Char* _pAsciiFeatureName,
             const css::uno::Reference< css::uno::XInterface >& _rxContext
-        )
-        throw (css::sdbc::SQLException);
+        );
 
     void translateAndThrow(const ::sql::SQLException& _error, const css::uno::Reference< css::uno::XInterface >& _context, const rtl_TextEncoding encoding);
 
diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx
index f3563ed16d66..eff5040f96d8 100644
--- a/mysqlc/source/mysqlc_preparedstatement.cxx
+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
@@ -57,13 +57,11 @@ static inline char * my_i_to_a(char * buf, size_t buf_size, int a)
 }
 
 rtl::OUString OPreparedStatement::getImplementationName()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return rtl::OUString("com.sun.star.sdbcx.mysqlc.PreparedStatement");
 }
 
 css::uno::Sequence<rtl::OUString> OPreparedStatement::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence<rtl::OUString> s(1);
     s[0] = "com.sun.star.sdbc.PreparedStatement";
@@ -71,7 +69,6 @@ css::uno::Sequence<rtl::OUString> OPreparedStatement::getSupportedServiceNames()
 }
 
 sal_Bool OPreparedStatement::supportsService(rtl::OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -106,7 +103,6 @@ void SAL_CALL OPreparedStatement::release()
 }
 
 Any SAL_CALL OPreparedStatement::queryInterface(const Type & rType)
-    throw(RuntimeException, std::exception)
 {
     Any aRet = OCommonStatement::queryInterface(rType);
     if (!aRet.hasValue()) {
@@ -116,13 +112,11 @@ Any SAL_CALL OPreparedStatement::queryInterface(const Type & rType)
 }
 
 Sequence< Type > SAL_CALL OPreparedStatement::getTypes()
-    throw(RuntimeException, std::exception)
 {
     return concatSequences(OPreparedStatement_BASE::getTypes(), OCommonStatement::getTypes());
 }
 
 Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -143,7 +137,6 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData()
 }
 
 void SAL_CALL OPreparedStatement::close()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -161,7 +154,6 @@ void SAL_CALL OPreparedStatement::close()
 }
 
 sal_Bool SAL_CALL OPreparedStatement::execute()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -176,7 +168,6 @@ sal_Bool SAL_CALL OPreparedStatement::execute()
 }
 
 sal_Int32 SAL_CALL OPreparedStatement::executeUpdate()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -191,7 +182,6 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate()
 }
 
 void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const rtl::OUString& x)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -208,7 +198,6 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const rtl::OUSt
 }
 
 Reference< XConnection > SAL_CALL OPreparedStatement::getConnection()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -217,7 +206,6 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection()
 }
 
 Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -233,7 +221,6 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery()
 }
 
 void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 parameter, sal_Bool x)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -249,7 +236,6 @@ void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 parameter, sal_Bool x)
 }
 
 void SAL_CALL OPreparedStatement::setByte(sal_Int32 parameter, sal_Int8 x)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -265,7 +251,6 @@ void SAL_CALL OPreparedStatement::setByte(sal_Int32 parameter, sal_Int8 x)
 }
 
 void SAL_CALL OPreparedStatement::setDate(sal_Int32 parameter, const Date& aData)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -289,7 +274,6 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 parameter, const Date& aData
 }
 
 void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const Time& aVal)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -313,7 +297,6 @@ void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const Time& aVal)
 }
 
 void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 parameter, const DateTime& aVal)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -345,7 +328,6 @@ void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 parameter, const DateTi
 }
 
 void SAL_CALL OPreparedStatement::setDouble(sal_Int32 parameter, double x)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -361,7 +343,6 @@ void SAL_CALL OPreparedStatement::setDouble(sal_Int32 parameter, double x)
 }
 
 void SAL_CALL OPreparedStatement::setFloat(sal_Int32 parameter, float x)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -377,7 +358,6 @@ void SAL_CALL OPreparedStatement::setFloat(sal_Int32 parameter, float x)
 }
 
 void SAL_CALL OPreparedStatement::setInt(sal_Int32 parameter, sal_Int32 x)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -393,7 +373,6 @@ void SAL_CALL OPreparedStatement::setInt(sal_Int32 parameter, sal_Int32 x)
 }
 
 void SAL_CALL OPreparedStatement::setLong(sal_Int32 parameter, sal_Int64 aVal)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -409,7 +388,6 @@ void SAL_CALL OPreparedStatement::setLong(sal_Int32 parameter, sal_Int64 aVal)
 }
 
 void SAL_CALL OPreparedStatement::setNull(sal_Int32 parameter, sal_Int32 sqlType)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -425,7 +403,6 @@ void SAL_CALL OPreparedStatement::setNull(sal_Int32 parameter, sal_Int32 sqlType
 }
 
 void SAL_CALL OPreparedStatement::setClob(sal_Int32 parameter, const Reference< XClob >& /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -435,7 +412,6 @@ void SAL_CALL OPreparedStatement::setClob(sal_Int32 parameter, const Reference<
 }
 
 void SAL_CALL OPreparedStatement::setBlob(sal_Int32 parameter, const Reference< XBlob >& /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -445,7 +421,6 @@ void SAL_CALL OPreparedStatement::setBlob(sal_Int32 parameter, const Reference<
 }
 
 void SAL_CALL OPreparedStatement::setArray(sal_Int32 parameter, const Reference< XArray >& /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -455,7 +430,6 @@ void SAL_CALL OPreparedStatement::setArray(sal_Int32 parameter, const Reference<
 }
 
 void SAL_CALL OPreparedStatement::setRef(sal_Int32 parameter, const Reference< XRef >& /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -494,7 +468,6 @@ namespace
 }
 
 void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, const Any& _value, sal_Int32 _targetSqlType, sal_Int32 /* scale */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
     MutexGuard aGuard(m_aMutex);
@@ -627,7 +600,6 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, c
 }
 
 void SAL_CALL OPreparedStatement::setObjectNull(sal_Int32 parameter, sal_Int32 /* sqlType */, const rtl::OUString& /* typeName */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -637,7 +609,6 @@ void SAL_CALL OPreparedStatement::setObjectNull(sal_Int32 parameter, sal_Int32 /
 }
 
 void SAL_CALL OPreparedStatement::setObject(sal_Int32 parameter, const Any& /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -647,7 +618,6 @@ void SAL_CALL OPreparedStatement::setObject(sal_Int32 parameter, const Any& /* x
 }
 
 void SAL_CALL OPreparedStatement::setShort(sal_Int32 parameter, sal_Int16 x)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -663,7 +633,6 @@ void SAL_CALL OPreparedStatement::setShort(sal_Int32 parameter, sal_Int16 x)
 }
 
 void SAL_CALL OPreparedStatement::setBytes(sal_Int32 parameter, const Sequence< sal_Int8 >& x)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -682,7 +651,6 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 parameter, const Sequence<
 void SAL_CALL OPreparedStatement::setCharacterStream(sal_Int32 parameter,
                                                     const Reference< XInputStream >& /* x */,
                                                     sal_Int32 /* length */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -694,7 +662,6 @@ void SAL_CALL OPreparedStatement::setCharacterStream(sal_Int32 parameter,
 void SAL_CALL OPreparedStatement::setBinaryStream(sal_Int32 parameter,
                                                 const Reference< XInputStream >& /* x */,
                                                 sal_Int32 /* length */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -704,7 +671,6 @@ void SAL_CALL OPreparedStatement::setBinaryStream(sal_Int32 parameter,
 }
 
 void SAL_CALL OPreparedStatement::clearParameters()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
@@ -719,26 +685,22 @@ void SAL_CALL OPreparedStatement::clearParameters()
 }
 
 void SAL_CALL OPreparedStatement::clearBatch()
-    throw(SQLException, RuntimeException, std::exception)
 {
     mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearBatch", *this);
 }
 
 void SAL_CALL OPreparedStatement::addBatch()
-    throw(SQLException, RuntimeException, std::exception)
 {
     mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::addBatch", *this);
 }
 
 Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch()
-    throw(SQLException, RuntimeException, std::exception)
 {
     Sequence< sal_Int32 > aRet= Sequence< sal_Int32 > ();
     return aRet;
 }
 
 void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)
-    throw(Exception, std::exception)
 {
     switch(nHandle)
     {
diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx
index 511e89e88b06..652b3558f012 100644
--- a/mysqlc/source/mysqlc_preparedstatement.hxx
+++ b/mysqlc/source/mysqlc_preparedstatement.hxx
@@ -57,37 +57,34 @@ namespace connectivity
             void checkParameterIndex(sal_Int32 parameter);
 
         protected:
-            void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue)
-                                                                                    throw (css::uno::Exception, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) SAL_OVERRIDE;
             virtual ~OPreparedStatement();
         public:
-            virtual rtl::OUString SAL_CALL getImplementationName()
-                throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE;
 
             virtual sal_Bool SAL_CALL supportsService(
-                rtl::OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception)
+                rtl::OUString const & ServiceName)
                 SAL_OVERRIDE;
 
             virtual css::uno::Sequence<rtl::OUString> SAL_CALL
-            getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+            getSupportedServiceNames()
                 SAL_OVERRIDE;
 
             OPreparedStatement(OConnection* _pConnection, sql::PreparedStatement * cppPrepStmt);
 
             //XInterface
-            Any SAL_CALL queryInterface(const Type & rType) throw(RuntimeException, std::exception) SAL_OVERRIDE;
+            Any SAL_CALL queryInterface(const Type & rType) SAL_OVERRIDE;
             void SAL_CALL acquire() throw() SAL_OVERRIDE;
             void SAL_CALL release() throw() SAL_OVERRIDE;
 
             //XTypeProvider
-            css::uno::Sequence< Type > SAL_CALL getTypes()
-                                                                                    throw(RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Sequence< Type > SAL_CALL getTypes() SAL_OVERRIDE;
 
             // XPreparedStatement
-            Reference< css::sdbc::XResultSet > SAL_CALL executeQuery() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL executeUpdate() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL execute() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            Reference< css::sdbc::XConnection > SAL_CALL getConnection() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            Reference< css::sdbc::XResultSet > SAL_CALL executeQuery() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL executeUpdate() SAL_OVERRIDE;
+            sal_Bool SAL_CALL execute() SAL_OVERRIDE;
+            Reference< css::sdbc::XConnection > SAL_CALL getConnection() SAL_OVERRIDE;
 
             // XStatement
             using OCommonStatement::executeQuery;
@@ -95,74 +92,61 @@ namespace connectivity
             using OCommonStatement::execute;
 
             // XParameters
-            void SAL_CALL setNull(sal_Int32 parameter, sal_Int32 sqlType)           throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setNull(sal_Int32 parameter, sal_Int32 sqlType) SAL_OVERRIDE;
 
-            void SAL_CALL setObjectNull(sal_Int32 parameter, sal_Int32 sqlType, const rtl::OUString& typeName)
-                                                                                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setObjectNull(sal_Int32 parameter, sal_Int32 sqlType, const rtl::OUString& typeName) SAL_OVERRIDE;
 
-            void SAL_CALL setBoolean(sal_Int32 parameter, sal_Bool x)               throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setBoolean(sal_Int32 parameter, sal_Bool x) SAL_OVERRIDE;
 
-            void SAL_CALL setByte(sal_Int32 parameter, sal_Int8 x)                  throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setByte(sal_Int32 parameter, sal_Int8 x) SAL_OVERRIDE;
 
-            void SAL_CALL setShort(sal_Int32 parameter, sal_Int16 x)                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setShort(sal_Int32 parameter, sal_Int16 x) SAL_OVERRIDE;
 
-            void SAL_CALL setInt(sal_Int32 parameter, sal_Int32 x)                  throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setInt(sal_Int32 parameter, sal_Int32 x) SAL_OVERRIDE;
 
-            void SAL_CALL setLong(sal_Int32 parameter, sal_Int64 x)                 throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setLong(sal_Int32 parameter, sal_Int64 x) SAL_OVERRIDE;
 
-            void SAL_CALL setFloat(sal_Int32 parameter, float x)                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setFloat(sal_Int32 parameter, float x) SAL_OVERRIDE;
 
-            void SAL_CALL setDouble(sal_Int32 parameter, double x)                  throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setDouble(sal_Int32 parameter, double x) SAL_OVERRIDE;
 
-            void SAL_CALL setString(sal_Int32 parameter, const rtl::OUString& x)         throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setString(sal_Int32 parameter, const rtl::OUString& x) SAL_OVERRIDE;
 
-            void SAL_CALL setBytes(sal_Int32 parameter, const css::uno::Sequence< sal_Int8 >& x)
-                                                                                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setBytes(sal_Int32 parameter, const css::uno::Sequence< sal_Int8 >& x) SAL_OVERRIDE;
 
-            void SAL_CALL setDate(sal_Int32 parameter, const css::util::Date& x)
-                                                                                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setDate(sal_Int32 parameter, const css::util::Date& x) SAL_OVERRIDE;
 
-            void SAL_CALL setTime(sal_Int32 parameter, const css::util::Time& x)
-                                                                                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL setTimestamp(sal_Int32 parameter, const css::util::DateTime& x)
-                                                                                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setTime(sal_Int32 parameter, const css::util::Time& x) SAL_OVERRIDE;
+            void SAL_CALL setTimestamp(sal_Int32 parameter, const css::util::DateTime& x) SAL_OVERRIDE;
 
-            void SAL_CALL setBinaryStream(sal_Int32 parameter, const Reference< css::io::XInputStream >& x, sal_Int32 length)
-                                                                                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setBinaryStream(sal_Int32 parameter, const Reference< css::io::XInputStream >& x, sal_Int32 length) SAL_OVERRIDE;
 
-            void SAL_CALL setCharacterStream(sal_Int32 parameter, const Reference< css::io::XInputStream >& x, sal_Int32 length)
-                                                                                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setCharacterStream(sal_Int32 parameter, const Reference< css::io::XInputStream >& x, sal_Int32 length) SAL_OVERRIDE;
 
-            void SAL_CALL setObject(sal_Int32 parameter, const Any& x)              throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setObject(sal_Int32 parameter, const Any& x) SAL_OVERRIDE;
 
-            void SAL_CALL setObjectWithInfo(sal_Int32 parameter, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale)
-                                                                                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setObjectWithInfo(sal_Int32 parameter, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale) SAL_OVERRIDE;
 
-            void SAL_CALL setRef(sal_Int32 parameter, const Reference< css::sdbc::XRef >& x)
-                                                                                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setRef(sal_Int32 parameter, const Reference< css::sdbc::XRef >& x) SAL_OVERRIDE;
 
-            void SAL_CALL setBlob(sal_Int32 parameter, const Reference< css::sdbc::XBlob >& x)
-                                                                                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setBlob(sal_Int32 parameter, const Reference< css::sdbc::XBlob >& x) SAL_OVERRIDE;
 
-            void SAL_CALL setClob(sal_Int32 parameter, const Reference< css::sdbc::XClob >& x)
-                                                                                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setClob(sal_Int32 parameter, const Reference< css::sdbc::XClob >& x) SAL_OVERRIDE;
 
-            void SAL_CALL setArray(sal_Int32 parameter, const Reference< css::sdbc::XArray >& x)
-                                                                                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setArray(sal_Int32 parameter, const Reference< css::sdbc::XArray >& x) SAL_OVERRIDE;
 
-            void SAL_CALL clearParameters() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL clearParameters() SAL_OVERRIDE;
 
             // XPreparedBatchExecution
-            void SAL_CALL addBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL clearBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch()    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL addBatch() SAL_OVERRIDE;
+            void SAL_CALL clearBatch() SAL_OVERRIDE;
+            css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() SAL_OVERRIDE;
 
             // XCloseable
-            void SAL_CALL close() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL close() SAL_OVERRIDE;
 
             // XResultSetMetaDataSupplier
-            Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData()
-                                                                                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData() SAL_OVERRIDE;
         };
     } /* mysqlc */
 } /* connectivity */
diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx
index 6c9f5209d6e9..ef112b931b8b 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -50,13 +50,11 @@ using ::osl::MutexGuard;
 #include <stdio.h>
 
 rtl::OUString SAL_CALL OResultSet::getImplementationName()
-    throw (RuntimeException, std::exception)
 {
     return rtl::OUString( "com.sun.star.sdbcx.mysqlc.ResultSet" );
 }
 
 Sequence< rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames()
-    throw(RuntimeException, std::exception)
 {
     Sequence< rtl::OUString > aSupported(2);
     aSupported[0] = "com.sun.star.sdbc.ResultSet";
@@ -65,7 +63,6 @@ Sequence< rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames()
 }
 
 sal_Bool SAL_CALL OResultSet::supportsService(const rtl::OUString& _rServiceName)
-    throw(RuntimeException, std::exception)
 {
     return cppu::supportsService(this, _rServiceName);
 }
@@ -102,7 +99,6 @@ void OResultSet::disposing()
 }
 
 Any SAL_CALL OResultSet::queryInterface(const Type & rType)
-    throw(RuntimeException, std::exception)
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     if (!aRet.hasValue()) {
@@ -112,7 +108,6 @@ Any SAL_CALL OResultSet::queryInterface(const Type & rType)
 }
 
 Sequence< Type > SAL_CALL OResultSet::getTypes()
-    throw(RuntimeException, std::exception)
 {
     OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
                                                 cppu::UnoType<XFastPropertySet>::get(),
@@ -122,7 +117,6 @@ Sequence< Type > SAL_CALL OResultSet::getTypes()
 }
 
 sal_Int32 SAL_CALL OResultSet::findColumn(const rtl::OUString& columnName)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -149,7 +143,6 @@ sal_Int32 SAL_CALL OResultSet::findColumn(const rtl::OUString& columnName)
 }
 
 Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -160,7 +153,6 @@ Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream(sal_Int32 column)
 }
 
 Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -171,7 +163,6 @@ Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream(sal_Int32 colu
 }
 
 sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -186,7 +177,6 @@ sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 column)
 }
 
 sal_Int8 SAL_CALL OResultSet::getByte(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -201,7 +191,6 @@ sal_Int8 SAL_CALL OResultSet::getByte(sal_Int32 column)
 }
 
 Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     MutexGuard aGuard(m_aMutex);
@@ -215,7 +204,6 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32 column)
 }
 
 Date SAL_CALL OResultSet::getDate(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -250,7 +238,6 @@ Date SAL_CALL OResultSet::getDate(sal_Int32 column)
 }
 
 double SAL_CALL OResultSet::getDouble(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -265,7 +252,6 @@ double SAL_CALL OResultSet::getDouble(sal_Int32 column)
 }
 
 float SAL_CALL OResultSet::getFloat(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -280,7 +266,6 @@ float SAL_CALL OResultSet::getFloat(sal_Int32 column)
 }
 
 sal_Int32 SAL_CALL OResultSet::getInt(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -295,7 +280,6 @@ sal_Int32 SAL_CALL OResultSet::getInt(sal_Int32 column)
 }
 
 sal_Int32 SAL_CALL OResultSet::getRow()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -309,7 +293,6 @@ sal_Int32 SAL_CALL OResultSet::getRow()
 }
 
 sal_Int64 SAL_CALL OResultSet::getLong(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -324,7 +307,6 @@ sal_Int64 SAL_CALL OResultSet::getLong(sal_Int32 column)
 }
 
 Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -341,7 +323,6 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData()
 }
 
 Reference< XArray > SAL_CALL OResultSet::getArray(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -352,7 +333,6 @@ Reference< XArray > SAL_CALL OResultSet::getArray(sal_Int32 column)
 }
 
 Reference< XClob > SAL_CALL OResultSet::getClob(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -363,7 +343,6 @@ Reference< XClob > SAL_CALL OResultSet::getClob(sal_Int32 column)
 }
 
 Reference< XBlob > SAL_CALL OResultSet::getBlob(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -374,7 +353,6 @@ Reference< XBlob > SAL_CALL OResultSet::getBlob(sal_Int32 column)
 }
 
 Reference< XRef > SAL_CALL OResultSet::getRef(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -385,7 +363,6 @@ Reference< XRef > SAL_CALL OResultSet::getRef(sal_Int32 column)
 }
 
 Any SAL_CALL OResultSet::getObject(sal_Int32 column, const Reference< XNameAccess >& /* typeMap */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -398,7 +375,6 @@ Any SAL_CALL OResultSet::getObject(sal_Int32 column, const Reference< XNameAcces
 }
 
 sal_Int16 SAL_CALL OResultSet::getShort(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -412,7 +388,6 @@ sal_Int16 SAL_CALL OResultSet::getShort(sal_Int32 column)
 }
 
 rtl::OUString SAL_CALL OResultSet::getString(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -433,7 +408,6 @@ rtl::OUString SAL_CALL OResultSet::getString(sal_Int32 column)
 }
 
 Time SAL_CALL OResultSet::getTime(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     MutexGuard aGuard(m_aMutex);
@@ -466,7 +440,6 @@ Time SAL_CALL OResultSet::getTime(sal_Int32 column)
 }
 
 DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     MutexGuard aGuard(m_aMutex);
@@ -486,7 +459,6 @@ DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 column)
 }
 
 sal_Bool SAL_CALL OResultSet::isBeforeFirst()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -500,7 +472,6 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst()
 }
 
 sal_Bool SAL_CALL OResultSet::isAfterLast()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -514,7 +485,6 @@ sal_Bool SAL_CALL OResultSet::isAfterLast()
 }
 
 sal_Bool SAL_CALL OResultSet::isFirst()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -528,7 +498,6 @@ sal_Bool SAL_CALL OResultSet::isFirst()
 }
 
 sal_Bool SAL_CALL OResultSet::isLast()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -542,7 +511,6 @@ sal_Bool SAL_CALL OResultSet::isLast()
 }
 
 void SAL_CALL OResultSet::beforeFirst()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -555,7 +523,6 @@ void SAL_CALL OResultSet::beforeFirst()
 }
 
 void SAL_CALL OResultSet::afterLast()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -567,7 +534,7 @@ void SAL_CALL OResultSet::afterLast()
     }
 }
 
-void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exception)
+void SAL_CALL OResultSet::close()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -581,7 +548,7 @@ void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exc
     dispose();
 }
 
-sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException, std::exception)
+sal_Bool SAL_CALL OResultSet::first()
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -595,7 +562,6 @@ sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException, std:
 }
 
 sal_Bool SAL_CALL OResultSet::last()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -609,7 +575,6 @@ sal_Bool SAL_CALL OResultSet::last()
 }
 
 sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 row)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -623,7 +588,6 @@ sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 row)
 }
 
 sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -637,7 +601,6 @@ sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row)
 }
 
 sal_Bool SAL_CALL OResultSet::previous()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -651,7 +614,6 @@ sal_Bool SAL_CALL OResultSet::previous()
 }
 
 Reference< XInterface > SAL_CALL OResultSet::getStatement()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -660,7 +622,6 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement()
 }
 
 sal_Bool SAL_CALL OResultSet::rowDeleted()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -669,7 +630,6 @@ sal_Bool SAL_CALL OResultSet::rowDeleted()
 }
 
 sal_Bool SAL_CALL OResultSet::rowInserted()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -678,7 +638,6 @@ sal_Bool SAL_CALL OResultSet::rowInserted()
 }
 
 sal_Bool SAL_CALL OResultSet::rowUpdated()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -687,7 +646,6 @@ sal_Bool SAL_CALL OResultSet::rowUpdated()
 }
 
 sal_Bool SAL_CALL OResultSet::next()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -701,7 +659,6 @@ sal_Bool SAL_CALL OResultSet::next()
 }
 
 sal_Bool SAL_CALL OResultSet::wasNull()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -715,26 +672,22 @@ sal_Bool SAL_CALL OResultSet::wasNull()
 }
 
 void SAL_CALL OResultSet::cancel()
-    throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 }
 
 void SAL_CALL OResultSet::clearWarnings()
-    throw(SQLException, RuntimeException, std::exception)
 {
 }
 
 Any SAL_CALL OResultSet::getWarnings()
-    throw(SQLException, RuntimeException, std::exception)
 {
     Any aRet= Any();
     return aRet;
 }
 
 void SAL_CALL OResultSet::insertRow()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -743,7 +696,6 @@ void SAL_CALL OResultSet::insertRow()
 }
 
 void SAL_CALL OResultSet::updateRow()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -753,7 +705,6 @@ void SAL_CALL OResultSet::updateRow()
 }
 
 void SAL_CALL OResultSet::deleteRow()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -761,7 +712,6 @@ void SAL_CALL OResultSet::deleteRow()
 }
 
 void SAL_CALL OResultSet::cancelRowUpdates()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -769,7 +719,6 @@ void SAL_CALL OResultSet::cancelRowUpdates()
 }
 
 void SAL_CALL OResultSet::moveToInsertRow()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -779,14 +728,12 @@ void SAL_CALL OResultSet::moveToInsertRow()
 }
 
 void SAL_CALL OResultSet::moveToCurrentRow()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 }
 
 void SAL_CALL OResultSet::updateNull(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -795,7 +742,6 @@ void SAL_CALL OResultSet::updateNull(sal_Int32 column)
 }
 
 void SAL_CALL OResultSet::updateBoolean(sal_Int32 column, sal_Bool /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -804,7 +750,6 @@ void SAL_CALL OResultSet::updateBoolean(sal_Int32 column, sal_Bool /* x */)
 }
 
 void SAL_CALL OResultSet::updateByte(sal_Int32 column, sal_Int8 /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     MutexGuard aGuard(m_aMutex);
@@ -813,7 +758,6 @@ void SAL_CALL OResultSet::updateByte(sal_Int32 column, sal_Int8 /* x */)
 }
 
 void SAL_CALL OResultSet::updateShort(sal_Int32 column, sal_Int16 /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -822,7 +766,6 @@ void SAL_CALL OResultSet::updateShort(sal_Int32 column, sal_Int16 /* x */)
 }
 
 void SAL_CALL OResultSet::updateInt(sal_Int32 column, sal_Int32 /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     MutexGuard aGuard(m_aMutex);
@@ -831,7 +774,6 @@ void SAL_CALL OResultSet::updateInt(sal_Int32 column, sal_Int32 /* x */)
 }
 
 void SAL_CALL OResultSet::updateLong(sal_Int32 column, sal_Int64 /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -840,7 +782,6 @@ void SAL_CALL OResultSet::updateLong(sal_Int32 column, sal_Int64 /* x */)
 }
 
 void SAL_CALL OResultSet::updateFloat(sal_Int32 column, float /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -849,7 +790,6 @@ void SAL_CALL OResultSet::updateFloat(sal_Int32 column, float /* x */)
 }
 
 void SAL_CALL OResultSet::updateDouble(sal_Int32 column, double /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -858,7 +798,6 @@ void SAL_CALL OResultSet::updateDouble(sal_Int32 column, double /* x */)
 }
 
 void SAL_CALL OResultSet::updateString(sal_Int32 column, const rtl::OUString& /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -867,7 +806,6 @@ void SAL_CALL OResultSet::updateString(sal_Int32 column, const rtl::OUString& /*
 }
 
 void SAL_CALL OResultSet::updateBytes(sal_Int32 column, const Sequence< sal_Int8 >& /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -876,7 +814,6 @@ void SAL_CALL OResultSet::updateBytes(sal_Int32 column, const Sequence< sal_Int8
 }
 
 void SAL_CALL OResultSet::updateDate(sal_Int32 column, const Date& /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -885,7 +822,6 @@ void SAL_CALL OResultSet::updateDate(sal_Int32 column, const Date& /* x */)
 }
 
 void SAL_CALL OResultSet::updateTime(sal_Int32 column, const Time& /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -894,7 +830,6 @@ void SAL_CALL OResultSet::updateTime(sal_Int32 column, const Time& /* x */)
 }
 
 void SAL_CALL OResultSet::updateTimestamp(sal_Int32 column, const DateTime& /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -904,7 +839,6 @@ void SAL_CALL OResultSet::updateTimestamp(sal_Int32 column, const DateTime& /* x
 
 void SAL_CALL OResultSet::updateBinaryStream(sal_Int32 column, const Reference< XInputStream >& /* x */,
                                             sal_Int32 /* length */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -914,7 +848,6 @@ void SAL_CALL OResultSet::updateBinaryStream(sal_Int32 column, const Reference<
 
 void SAL_CALL OResultSet::updateCharacterStream(sal_Int32 column, const Reference< XInputStream >& /* x */,
                                                 sal_Int32 /* length */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -923,7 +856,6 @@ void SAL_CALL OResultSet::updateCharacterStream(sal_Int32 column, const Referenc
 }
 
 void SAL_CALL OResultSet::refreshRow()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -931,7 +863,6 @@ void SAL_CALL OResultSet::refreshRow()
 }
 
 void SAL_CALL OResultSet::updateObject(sal_Int32 column, const Any& /* x */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -940,7 +871,6 @@ void SAL_CALL OResultSet::updateObject(sal_Int32 column, const Any& /* x */)
 }
 
 void SAL_CALL OResultSet::updateNumericObject(sal_Int32 column, const Any& /* x */, sal_Int32 /* scale */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -950,7 +880,6 @@ void SAL_CALL OResultSet::updateNumericObject(sal_Int32 column, const Any& /* x
 
 // XRowLocate
 Any SAL_CALL OResultSet::getBookmark()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -963,7 +892,6 @@ Any SAL_CALL OResultSet::getBookmark()
 }
 
 sal_Bool SAL_CALL OResultSet::moveToBookmark(const Any& /* bookmark */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -972,7 +900,6 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark(const Any& /* bookmark */)
 }
 
 sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark(const Any& /* bookmark */, sal_Int32 /* rows */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -982,7 +909,6 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark(const Any& /* bookmark */,
 }
 
 sal_Int32 SAL_CALL OResultSet::compareBookmarks(const Any& /* n1 */, const Any& /* n2 */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -993,13 +919,11 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks(const Any& /* n1 */, const Any&
 }
 
 sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return false;
 }
 
 sal_Int32 SAL_CALL OResultSet::hashBookmark(const Any& /* bookmark */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::hashBookmark", *this);
     return 0;
@@ -1007,7 +931,6 @@ sal_Int32 SAL_CALL OResultSet::hashBookmark(const Any& /* bookmark */)
 
 // XDeleteRows
 Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows(const Sequence< Any >& /* rows */)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1043,7 +966,6 @@ sal_Bool OResultSet::convertFastPropertyValue(Any & /* rConvertedValue */,
                                             Any & /* rOldValue */,
                                             sal_Int32 nHandle,
                                             const Any& /* rValue */)
-    throw (css::lang::IllegalArgumentException)
 {
     switch (nHandle) {
         case PROPERTY_ID_ISBOOKMARKABLE:
@@ -1060,7 +982,6 @@ sal_Bool OResultSet::convertFastPropertyValue(Any & /* rConvertedValue */,
 }
 
 void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& /* rValue */)
-    throw (Exception, std::exception)
 {
     switch (nHandle) {
         case PROPERTY_ID_ISBOOKMARKABLE:
@@ -1115,13 +1036,12 @@ void SAL_CALL OResultSet::release()
     OResultSet_BASE::release();
 }
 
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo() throw(css::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo()
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
 void OResultSet::checkColumnIndex(sal_Int32 index)
-    throw (SQLException, RuntimeException)
 {
     if ((index < 1 || index > (int) fieldCount)) {
         /* static object for efficiency or thread safety is a problem ? */
diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx
index ee92fccb3dd0..5ed4f8c9d0d2 100644
--- a/mysqlc/source/mysqlc_resultset.hxx
+++ b/mysqlc/source/mysqlc_resultset.hxx
@@ -79,11 +79,9 @@ namespace connectivity
             // OPropertySetHelper
             ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
 
-            sal_Bool SAL_CALL convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue)
-                        throw (css::lang::IllegalArgumentException) SAL_OVERRIDE;
+            sal_Bool SAL_CALL convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue) SAL_OVERRIDE;
 
-            void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue)
-                        throw (css::uno::Exception, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) SAL_OVERRIDE;
 
             void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE;
 
@@ -91,15 +89,14 @@ namespace connectivity
             virtual ~OResultSet();
 
         public:
-            virtual rtl::OUString SAL_CALL getImplementationName()
-                throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE;
 
             virtual sal_Bool SAL_CALL supportsService(
-                rtl::OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception)
+                rtl::OUString const & ServiceName)
                 SAL_OVERRIDE;
 
             virtual css::uno::Sequence<rtl::OUString> SAL_CALL
-            getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+            getSupportedServiceNames()
                 SAL_OVERRIDE;
 
             OResultSet( OCommonStatement* pStmt, sql::ResultSet *result, rtl_TextEncoding _encoding );
@@ -108,160 +105,131 @@ namespace connectivity
             void SAL_CALL disposing() SAL_OVERRIDE;
 
             // XInterface
-            Any SAL_CALL queryInterface(const css::uno::Type & rType)
-                                                                        throw(RuntimeException, std::exception) SAL_OVERRIDE;
+            Any SAL_CALL queryInterface(const css::uno::Type & rType) SAL_OVERRIDE;
 
             void SAL_CALL acquire()                                     throw() SAL_OVERRIDE;
             void SAL_CALL release()                                     throw() SAL_OVERRIDE;
 
             //XTypeProvider
-            css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                                                        throw(RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE;
 
             // XPropertySet
-            css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-                                                                        throw(RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() SAL_OVERRIDE;
 
             // XResultSet
-            sal_Bool SAL_CALL next()                                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL isBeforeFirst()                           throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL isAfterLast()                             throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL isFirst()                                 throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL isLast()                                  throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL next() SAL_OVERRIDE;
+            sal_Bool SAL_CALL isBeforeFirst() SAL_OVERRIDE;
+            sal_Bool SAL_CALL isAfterLast() SAL_OVERRIDE;
+            sal_Bool SAL_CALL isFirst() SAL_OVERRIDE;
+            sal_Bool SAL_CALL isLast() SAL_OVERRIDE;
 
-            void SAL_CALL beforeFirst()                                 throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL afterLast()                                   throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL beforeFirst() SAL_OVERRIDE;
+            void SAL_CALL afterLast() SAL_OVERRIDE;
 
-            sal_Bool SAL_CALL first()                                   throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL last()                                    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL first() SAL_OVERRIDE;
+            sal_Bool SAL_CALL last() SAL_OVERRIDE;
 
-            sal_Int32 SAL_CALL getRow()                                 throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getRow() SAL_OVERRIDE;
 
-            sal_Bool SAL_CALL absolute(sal_Int32 row)                   throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL relative(sal_Int32 rows)                  throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL previous()                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL absolute(sal_Int32 row) SAL_OVERRIDE;
+            sal_Bool SAL_CALL relative(sal_Int32 rows) SAL_OVERRIDE;
+            sal_Bool SAL_CALL previous() SAL_OVERRIDE;
 
-            void SAL_CALL refreshRow()                                  throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL refreshRow() SAL_OVERRIDE;
 
-            sal_Bool SAL_CALL rowUpdated()                              throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL rowInserted()                             throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL rowDeleted()                              throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL rowUpdated() SAL_OVERRIDE;
+            sal_Bool SAL_CALL rowInserted() SAL_OVERRIDE;
+            sal_Bool SAL_CALL rowDeleted() SAL_OVERRIDE;
 
-            css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement()
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() SAL_OVERRIDE;
             // XRow
-            sal_Bool SAL_CALL wasNull() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-
-            rtl::OUString SAL_CALL getString(sal_Int32 column)       throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-
-            sal_Bool SAL_CALL getBoolean(sal_Int32 column)              throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int8 SAL_CALL getByte(sal_Int32 column)                 throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int16 SAL_CALL getShort(sal_Int32 column)               throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getInt(sal_Int32 column)                 throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int64 SAL_CALL getLong(sal_Int32 column)                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-
-            float SAL_CALL getFloat(sal_Int32 column)                   throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            double SAL_CALL getDouble(sal_Int32 column)                 throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-
-            css::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 column)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            css::util::Date SAL_CALL getDate(sal_Int32 column)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            css::util::Time SAL_CALL getTime(sal_Int32 column)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            css::util::DateTime SAL_CALL getTimestamp(sal_Int32 column)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-
-            css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream(sal_Int32 column)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream(sal_Int32 column)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-
-            Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-
-            css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef(sal_Int32 column)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob(sal_Int32 column)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob(sal_Int32 column)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray(sal_Int32 column)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL wasNull() SAL_OVERRIDE;
+
+            rtl::OUString SAL_CALL getString(sal_Int32 column) SAL_OVERRIDE;
+
+            sal_Bool SAL_CALL getBoolean(sal_Int32 column) SAL_OVERRIDE;
+            sal_Int8 SAL_CALL getByte(sal_Int32 column) SAL_OVERRIDE;
+            sal_Int16 SAL_CALL getShort(sal_Int32 column) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getInt(sal_Int32 column) SAL_OVERRIDE;
+            sal_Int64 SAL_CALL getLong(sal_Int32 column) SAL_OVERRIDE;
+
+            float SAL_CALL getFloat(sal_Int32 column) SAL_OVERRIDE;
+            double SAL_CALL getDouble(sal_Int32 column) SAL_OVERRIDE;
+
+            css::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 column) SAL_OVERRIDE;
+            css::util::Date SAL_CALL getDate(sal_Int32 column) SAL_OVERRIDE;
+            css::util::Time SAL_CALL getTime(sal_Int32 column) SAL_OVERRIDE;
+            css::util::DateTime SAL_CALL getTimestamp(sal_Int32 column) SAL_OVERRIDE;
+
+            css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream(sal_Int32 column) SAL_OVERRIDE;
+            css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream(sal_Int32 column) SAL_OVERRIDE;
+
+            Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap) SAL_OVERRIDE;
+
+            css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef(sal_Int32 column) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob(sal_Int32 column) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob(sal_Int32 column) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray(sal_Int32 column) SAL_OVERRIDE;
 
             // XResultSetMetaDataSupplier
-            css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData()
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData() SAL_OVERRIDE;
 
             // XCancellable
-            void SAL_CALL cancel()                                      throw(RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL cancel() SAL_OVERRIDE;
 
             // XCloseable
-            void SAL_CALL close()                                       throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL close() SAL_OVERRIDE;
 
             // XWarningsSupplier
-            Any SAL_CALL getWarnings()                                  throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            Any SAL_CALL getWarnings() SAL_OVERRIDE;
 
-            void SAL_CALL clearWarnings()                               throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL clearWarnings() SAL_OVERRIDE;
 
             // XResultSetUpdate
-            void SAL_CALL insertRow()                                   throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateRow()                                   throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL deleteRow()                                   throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL cancelRowUpdates()                            throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL moveToInsertRow()                             throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL moveToCurrentRow()                            throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL insertRow() SAL_OVERRIDE;
+            void SAL_CALL updateRow() SAL_OVERRIDE;
+            void SAL_CALL deleteRow() SAL_OVERRIDE;
+            void SAL_CALL cancelRowUpdates() SAL_OVERRIDE;
+            void SAL_CALL moveToInsertRow() SAL_OVERRIDE;
+            void SAL_CALL moveToCurrentRow() SAL_OVERRIDE;
 
             // XRowUpdate
-            void SAL_CALL updateNull(sal_Int32 column)                  throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateBoolean(sal_Int32 column, sal_Bool x)   throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateByte(sal_Int32 column, sal_Int8 x)      throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateShort(sal_Int32 column, sal_Int16 x)    throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateInt(sal_Int32 column, sal_Int32 x)      throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x)     throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateFloat(sal_Int32 column, float x)        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateDouble(sal_Int32 column, double x)      throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateString(sal_Int32 column, const rtl::OUString& x)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateBytes(sal_Int32 column, const css::uno::Sequence< sal_Int8 >& x)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateDate(sal_Int32 column, const css::util::Date& x)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateTime(sal_Int32 column, const css::util::Time& x)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateTimestamp(sal_Int32 column, const css::util::DateTime& x)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateBinaryStream(sal_Int32 column, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateCharacterStream(sal_Int32 column, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateObject(sal_Int32 column, const Any& x)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            void SAL_CALL updateNumericObject(sal_Int32 column, const Any& x, sal_Int32 scale)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL updateNull(sal_Int32 column) SAL_OVERRIDE;
+            void SAL_CALL updateBoolean(sal_Int32 column, sal_Bool x) SAL_OVERRIDE;
+            void SAL_CALL updateByte(sal_Int32 column, sal_Int8 x) SAL_OVERRIDE;
+            void SAL_CALL updateShort(sal_Int32 column, sal_Int16 x) SAL_OVERRIDE;
+            void SAL_CALL updateInt(sal_Int32 column, sal_Int32 x) SAL_OVERRIDE;
+            void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x) SAL_OVERRIDE;
+            void SAL_CALL updateFloat(sal_Int32 column, float x) SAL_OVERRIDE;
+            void SAL_CALL updateDouble(sal_Int32 column, double x) SAL_OVERRIDE;
+            void SAL_CALL updateString(sal_Int32 column, const rtl::OUString& x) SAL_OVERRIDE;
+            void SAL_CALL updateBytes(sal_Int32 column, const css::uno::Sequence< sal_Int8 >& x) SAL_OVERRIDE;
+            void SAL_CALL updateDate(sal_Int32 column, const css::util::Date& x) SAL_OVERRIDE;
+            void SAL_CALL updateTime(sal_Int32 column, const css::util::Time& x) SAL_OVERRIDE;
+            void SAL_CALL updateTimestamp(sal_Int32 column, const css::util::DateTime& x) SAL_OVERRIDE;
+            void SAL_CALL updateBinaryStream(sal_Int32 column, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) SAL_OVERRIDE;
+            void SAL_CALL updateCharacterStream(sal_Int32 column, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length) SAL_OVERRIDE;
+            void SAL_CALL updateObject(sal_Int32 column, const Any& x) SAL_OVERRIDE;
+            void SAL_CALL updateNumericObject(sal_Int32 column, const Any& x, sal_Int32 scale) SAL_OVERRIDE;
 
             // XColumnLocate
-            sal_Int32 SAL_CALL findColumn(const rtl::OUString& columnName)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL findColumn(const rtl::OUString& columnName) SAL_OVERRIDE;
 
             // XRowLocate
-            Any SAL_CALL getBookmark()                                  throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-
-            sal_Bool SAL_CALL moveToBookmark(const Any& bookmark)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL compareBookmarks(const Any& first, const Any& second)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL hasOrderedBookmarks()                     throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL hashBookmark(const Any& bookmark)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            Any SAL_CALL getBookmark() SAL_OVERRIDE;
+
+            sal_Bool SAL_CALL moveToBookmark(const Any& bookmark) SAL_OVERRIDE;
+            sal_Bool SAL_CALL moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL compareBookmarks(const Any& first, const Any& second) SAL_OVERRIDE;
+            sal_Bool SAL_CALL hasOrderedBookmarks() SAL_OVERRIDE;
+            sal_Int32 SAL_CALL hashBookmark(const Any& bookmark) SAL_OVERRIDE;
 
             // XDeleteRows
-            css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const css::uno::Sequence< Any >& rows)
-                                                                        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const css::uno::Sequence< Any >& rows) SAL_OVERRIDE;
 
-            void checkColumnIndex(sal_Int32 index) throw(SQLException, RuntimeException);
+            /// @throws SQLException
+            /// @throws RuntimeException
+            void checkColumnIndex(sal_Int32 index);
 
         private:
             using ::cppu::OPropertySetHelper::getFastPropertyValue;
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx
index d5089da2075d..c8162cdcee84 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.cxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx
@@ -34,7 +34,6 @@ OResultSetMetaData::~OResultSetMetaData()
 }
 
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     try {
         meta->getColumnDisplaySize(column);
@@ -47,7 +46,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize(sal_Int32 column)
 }
 
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -67,7 +65,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column)
   Does it change the API, the open-close principle?
 */
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount()
-    throw(SQLException, RuntimeException, std::exception)
 {
     try {
         return meta->getColumnCount();
@@ -80,7 +77,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount()
 }
 
 sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -95,7 +91,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column)
 }
 
 rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -110,7 +105,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column)
 }
 
 rtl::OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -125,7 +119,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column)
 }
 
 rtl::OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -140,7 +133,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column)
 }
 
 rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -155,7 +147,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column)
 }
 
 rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -170,7 +161,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column)
 }
 
 rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -185,7 +175,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column)
 }
 
 rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -194,7 +183,6 @@ rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column
 }
 
 sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -209,7 +197,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column)
 }
 
 sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -224,7 +211,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column)
 }
 
 sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -239,7 +225,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column)
 }
 
 sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -254,7 +239,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column)
 }
 
 sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column)
-    throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception)
 {
     checkColumnIndex(column);
     try {
@@ -268,7 +252,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column)
 }
 
 sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -283,7 +266,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column)
 }
 
 sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -298,7 +280,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column)
 }
 
 sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -313,7 +294,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column)
 }
 
 sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -328,7 +308,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32 column)
 }
 
 sal_Bool SAL_CALL OResultSetMetaData::isWritable(sal_Int32 column)
-    throw(SQLException, RuntimeException, std::exception)
 {
     checkColumnIndex(column);
 
@@ -343,7 +322,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isWritable(sal_Int32 column)
 }
 
 void OResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
-    throw (SQLException, RuntimeException)
 {
     if (columnIndex < 1 || columnIndex > (sal_Int32) meta->getColumnCount()) {
 
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx
index 65ea730264e3..a160208471db 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.hxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx
@@ -56,40 +56,42 @@ namespace connectivity
                 return rtl::OUString( _string.c_str(), _string.size(), m_encoding );
             }
 
-            sal_Int32 SAL_CALL getColumnCount()                     throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getColumnCount() SAL_OVERRIDE;
 
-            sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column)     throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column)     throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL isSearchable(sal_Int32 column)        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL isCurrency(sal_Int32 column)          throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) SAL_OVERRIDE;
+            sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column) SAL_OVERRIDE;
+            sal_Bool SAL_CALL isSearchable(sal_Int32 column) SAL_OVERRIDE;
+            sal_Bool SAL_CALL isCurrency(sal_Int32 column) SAL_OVERRIDE;
 
-            sal_Int32 SAL_CALL isNullable(sal_Int32 column)         throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL isNullable(sal_Int32 column) SAL_OVERRIDE;
 
-            sal_Bool SAL_CALL isSigned(sal_Int32 column)            throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL isSigned(sal_Int32 column) SAL_OVERRIDE;
 
-            sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column)throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) SAL_OVERRIDE;
 
-            rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column)      throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getColumnName(sal_Int32 column)       throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getSchemaName(sal_Int32 column)       throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getColumnName(sal_Int32 column) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) SAL_OVERRIDE;
 
-            sal_Int32 SAL_CALL getPrecision(sal_Int32 column)       throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Int32 SAL_CALL getScale(sal_Int32 column)           throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getPrecision(sal_Int32 column) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getScale(sal_Int32 column) SAL_OVERRIDE;
 
-            rtl::OUString SAL_CALL getTableName(sal_Int32 column)        throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            rtl::OUString SAL_CALL getCatalogName(sal_Int32 column)      throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getTableName(sal_Int32 column) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) SAL_OVERRIDE;
 
-            sal_Int32 SAL_CALL getColumnType(sal_Int32 column)      throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getColumnType(sal_Int32 column) SAL_OVERRIDE;
 
-            rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column)   throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) SAL_OVERRIDE;
 
-            sal_Bool SAL_CALL isReadOnly(sal_Int32 column)          throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL isWritable(sal_Int32 column)          throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
-            sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column)throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL isReadOnly(sal_Int32 column) SAL_OVERRIDE;
+            sal_Bool SAL_CALL isWritable(sal_Int32 column) SAL_OVERRIDE;
+            sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column) SAL_OVERRIDE;
 
-            rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column)throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) SAL_OVERRIDE;
 
-            void checkColumnIndex(sal_Int32 columnIndex)            throw (SQLException, RuntimeException);
+            /// @throws SQLException
+            /// @throws RuntimeException
+            void checkColumnIndex(sal_Int32 columnIndex);
         };
     }
 }
diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx
index 061a192de68f..5258103010f1 100644
--- a/mysqlc/source/mysqlc_statement.cxx
+++ b/mysqlc/source/mysqlc_statement.cxx
@@ -91,7 +91,6 @@ void OCommonStatement::disposing()
 }
 
 Any SAL_CALL OCommonStatement::queryInterface(const Type & rType)
-    throw(RuntimeException, std::exception)
 {
     Any aRet = OCommonStatement_IBase::queryInterface(rType);
     if (!aRet.hasValue()) {
@@ -101,7 +100,6 @@ Any SAL_CALL OCommonStatement::queryInterface(const Type & rType)
 }
 
 Sequence< Type > SAL_CALL OCommonStatement::getTypes()
-    throw(RuntimeException, std::exception)
 {
     ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
                                     cppu::UnoType<XFastPropertySet>::get(),
@@ -111,7 +109,6 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes()
 }
 
 void SAL_CALL OCommonStatement::cancel()
-    throw(RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
@@ -119,7 +116,6 @@ void SAL_CALL OCommonStatement::cancel()
 }
 
 void SAL_CALL OCommonStatement::close()
-    throw(SQLException, RuntimeException, std::exception)
 {
     /*
       We need a block for the checkDisposed call.
@@ -133,13 +129,11 @@ void SAL_CALL OCommonStatement::close()
 }
 
 void SAL_CALL OStatement::clearBatch()
-    throw(SQLException, RuntimeException, std::exception)
 {
     // if you support batches clear it here
 }
 
 sal_Bool SAL_CALL OCommonStatement::execute(const rtl::OUString& sql)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
@@ -155,7 +149,6 @@ sal_Bool SAL_CALL OCommonStatement::execute(const rtl::OUString& sql)
 }
 
 Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery(const rtl::OUString& sql)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
@@ -173,7 +166,6 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery(const rtl::OUStr
 }
 
 Reference< XConnection > SAL_CALL OCommonStatement::getConnection()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
@@ -183,13 +175,11 @@ Reference< XConnection > SAL_CALL OCommonStatement::getConnection()
 }
 
 sal_Int32 SAL_CALL OCommonStatement::getUpdateCount()
-    throw(SQLException, RuntimeException, std::exception)
 {
     return 0;
 }
 
 Any SAL_CALL OStatement::queryInterface(const Type & rType)
-    throw(RuntimeException, std::exception)
 {
     Any aRet = ::cppu::queryInterface(rType,static_cast< XBatchExecution*> (this));
     if (!aRet.hasValue()) {
@@ -199,7 +189,6 @@ Any SAL_CALL OStatement::queryInterface(const Type & rType)
 }
 
 void SAL_CALL OStatement::addBatch(const rtl::OUString& sql)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
@@ -208,7 +197,6 @@ void SAL_CALL OStatement::addBatch(const rtl::OUString& sql)
 }
 
 Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
@@ -218,7 +206,6 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch()
 }
 
 sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const rtl::OUString& sql)
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
@@ -234,7 +221,6 @@ sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const rtl::OUString& sql)
 }
 
 Reference< XResultSet > SAL_CALL OCommonStatement::getResultSet()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
@@ -251,7 +237,6 @@ Reference< XResultSet > SAL_CALL OCommonStatement::getResultSet()
 }
 
 sal_Bool SAL_CALL OCommonStatement::getMoreResults()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
@@ -262,7 +247,6 @@ sal_Bool SAL_CALL OCommonStatement::getMoreResults()
 }
 
 Any SAL_CALL OCommonStatement::getWarnings()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
@@ -271,7 +255,6 @@ Any SAL_CALL OCommonStatement::getWarnings()
 }
 
 void SAL_CALL OCommonStatement::clearWarnings()
-    throw(SQLException, RuntimeException, std::exception)
 {
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
@@ -308,7 +291,6 @@ void SAL_CALL OCommonStatement::clearWarnings()
 sal_Bool OCommonStatement::convertFastPropertyValue(
         Any & /* rConvertedValue */, Any & /* rOldValue */,
         sal_Int32 /* nHandle */, const Any& /* rValue */)
-    throw (IllegalArgumentException)
 {
     bool bConverted = false;
     // here we have to try to convert
@@ -316,7 +298,6 @@ sal_Bool OCommonStatement::convertFastPropertyValue(
 }
 
 void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& /* rValue */)
-    throw (Exception, std::exception)
 {
     // set the value to what ever is necessary
     switch (nHandle) {
@@ -356,13 +337,12 @@ void OCommonStatement::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) con
     }
 }
 
-rtl::OUString OStatement::getImplementationName() throw (css::uno::RuntimeException, std::exception)
+rtl::OUString OStatement::getImplementationName()
 {
     return rtl::OUString("com.sun.star.sdbcx.OStatement");
 }
 
 css::uno::Sequence<rtl::OUString> OStatement::getSupportedServiceNames()
-    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence<rtl::OUString> s(1);
     s[0] = "com.sun.star.sdbc.Statement";
@@ -370,7 +350,6 @@ css::uno::Sequence<rtl::OUString> OStatement::getSupportedServiceNames()
 }
 
 sal_Bool OStatement::supportsService(rtl::OUString const & ServiceName)
-    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -400,7 +379,6 @@ void SAL_CALL OStatement::release()
 }
 
 Reference< css::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo()
-    throw(RuntimeException, std::exception)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx
index fbfe807e1d33..02533fabe8ea 100644
--- a/mysqlc/source/mysqlc_statement.hxx
+++ b/mysqlc/source/mysqlc_statement.hxx
@@ -86,11 +86,9 @@ namespace connectivity
             // OPropertySetHelper
             ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
             sal_Bool SAL_CALL convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue,
-                                                               sal_Int32 nHandle, const Any& rValue)
-                                                throw (css::lang::IllegalArgumentException) SAL_OVERRIDE;
+                                                               sal_Int32 nHandle, const Any& rValue) SAL_OVERRIDE;
 
-            void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue)
-                                                throw(css::uno::Exception, std::exception) SAL_OVERRIDE;
+            void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) SAL_OVERRIDE;
 
             void SAL_CALL getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE;
             virtual ~OCommonStatement();
@@ -111,48 +109,40 @@ namespace connectivity
             void SAL_CALL acquire()             throw() SAL_OVERRIDE;
 
             // XInterface
-            Any SAL_CALL queryInterface(const css::uno::Type & rType)
-                                                throw(RuntimeException, std::exception) SAL_OVERRIDE;
+            Any SAL_CALL queryInterface(const css::uno::Type & rType) SAL_OVERRIDE;
 
             //XTypeProvider
-            css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-                                                throw(RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() SAL_OVERRIDE;
 
             // XPropertySet
-            css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
-                                                throw(RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() SAL_OVERRIDE;
 
             // XStatement
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(const rtl::OUString& sql)
-                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery(const rtl::OUString& sql) SAL_OVERRIDE;
 
-            sal_Int32 SAL_CALL executeUpdate(const rtl::OUString& sql)
-                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL executeUpdate(const rtl::OUString& sql) SAL_OVERRIDE;
 
-            sal_Bool SAL_CALL execute( const rtl::OUString& sql )
-                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL execute( const rtl::OUString& sql ) SAL_OVERRIDE;
 
-            css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection()
-                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection() SAL_OVERRIDE;
 
             // XWarningsSupplier
-            Any SAL_CALL getWarnings()      throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            Any SAL_CALL getWarnings() SAL_OVERRIDE;
 
-            void SAL_CALL clearWarnings()       throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL clearWarnings() SAL_OVERRIDE;
 
             // XCancellable
-            void SAL_CALL cancel()              throw(RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL cancel() SAL_OVERRIDE;
 
             // XCloseable
-            void SAL_CALL close()               throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL close() SAL_OVERRIDE;
 
             // XMultipleResults
-            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet()
-                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet() SAL_OVERRIDE;
 
-            sal_Int32 SAL_CALL getUpdateCount() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Int32 SAL_CALL getUpdateCount() SAL_OVERRIDE;
 
-            sal_Bool SAL_CALL getMoreResults()  throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            sal_Bool SAL_CALL getMoreResults() SAL_OVERRIDE;
 
             // other methods
             OConnection* getOwnConnection() const { return m_pConnection;}
@@ -175,31 +165,27 @@ namespace connectivity
             OStatement(OConnection* _pConnection, sql::Statement *_cppStatement) :
                 OCommonStatement(_pConnection, _cppStatement) {}
 
-            virtual rtl::OUString SAL_CALL getImplementationName()
-                throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE;
 
             virtual sal_Bool SAL_CALL supportsService(
-                rtl::OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception)
+                rtl::OUString const & ServiceName)
                 SAL_OVERRIDE;
 
             virtual css::uno::Sequence<rtl::OUString> SAL_CALL
-            getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
+            getSupportedServiceNames()
                 SAL_OVERRIDE;
 
-            Any SAL_CALL queryInterface( const css::uno::Type & rType )
-                                                throw(RuntimeException, std::exception) SAL_OVERRIDE;
+            Any SAL_CALL queryInterface( const css::uno::Type & rType ) SAL_OVERRIDE;
 
             void SAL_CALL acquire()             throw() SAL_OVERRIDE;
             void SAL_CALL release()             throw() SAL_OVERRIDE;
 
             // XBatchExecution
-            void SAL_CALL addBatch(const rtl::OUString& sql)
-                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL addBatch(const rtl::OUString& sql) SAL_OVERRIDE;
 
-            void SAL_CALL clearBatch()          throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            void SAL_CALL clearBatch() SAL_OVERRIDE;
 
-            css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch()
-                                                throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
+            css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() SAL_OVERRIDE;
 
         };
     }
diff --git a/mysqlc/source/mysqlc_subcomponent.hxx b/mysqlc/source/mysqlc_subcomponent.hxx
index c19e693e5f34..c0dc8eb3acb2 100644
--- a/mysqlc/source/mysqlc_subcomponent.hxx
+++ b/mysqlc/source/mysqlc_subcomponent.hxx
@@ -55,7 +55,8 @@ namespace connectivity
                      css::uno::Reference< css::uno::XInterface >& _xInterface,
                      css::lang::XComponent* _pObject);
 
-        void checkDisposed(bool _bThrow) throw (css::lang::DisposedException);
+        /// @throws css::lang::DisposedException
+        void checkDisposed(bool _bThrow);
 
         template <class SELF, class WEAK> class OSubComponent
         {