From 5e21a413c788f839a66d9e4c14e745ed18058db8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 25 Feb 2014 21:31:58 +0100 Subject: cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3 --- .../source/drivers/firebird/ResultSetMetaData.cxx | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'connectivity/source/drivers/firebird/ResultSetMetaData.cxx') diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx index 31110fc17e86..fc0ba50deef8 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx @@ -41,19 +41,19 @@ void OResultSetMetaData::verifyValidColumn(sal_Int32 column) throw SQLException("Invalid column specified", *this, OUString(), 0, Any()); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount() throw(SQLException, RuntimeException, std::exception) { return m_pSqlda->sqld; } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); return 32; // Hard limit for firebird } sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); @@ -63,7 +63,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // Firebird is generally case sensitive when using quoted identifiers. // IF THIS CHANGES make ResultSet::findColumn to be case-insenstive as needed. @@ -75,14 +75,14 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { (void) column; return OUString(); // Schemas supported by firebird } OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); OUString sRet(m_pSqlda->sqlvar[column-1].sqlname, @@ -93,7 +93,7 @@ OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); return OUString(m_pSqlda->sqlvar[column-1].relname, @@ -102,14 +102,14 @@ OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { (void) column; return OUString(); // Catalogs not supported by firebird } OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); @@ -119,14 +119,14 @@ OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // TODO: clarify what this is -- probably not the alias return getColumnName(column); } OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // TODO: implement (void) column; @@ -134,14 +134,14 @@ OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { (void) column; return sal_False; } sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // Supported internally but no way of determining this here. (void) column; @@ -150,7 +150,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column) sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // Unsigned values aren't supported in firebird. (void) column; @@ -158,7 +158,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column) } sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // TODO: implement (void) column; @@ -166,13 +166,13 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) } sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return m_pSqlda->sqlvar[column-1].sqlscale; } sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { if (m_pSqlda->sqlvar[column-1].sqltype & 1) return ColumnValue::NULLABLE; @@ -181,7 +181,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // TODO: Can the column be used as part of a where clause? Assume yes (void) column; @@ -189,20 +189,20 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { (void) column; return m_pConnection->isReadOnly(); // Readonly only available on db level } sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { (void) column; return !m_pConnection->isReadOnly(); } -sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { (void) column; return !m_pConnection->isReadOnly(); -- cgit