From 1f2fd91bf1acc4b6e0b102738c319ce074b7faf7 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Tue, 20 Dec 2011 12:06:48 +0900 Subject: catch exception by constant reference --- mysqlc/source/mysqlc_connection.cxx | 28 ++++----- mysqlc/source/mysqlc_databasemetadata.cxx | 92 +++++++++++++++--------------- mysqlc/source/mysqlc_driver.cxx | 2 +- mysqlc/source/mysqlc_preparedstatement.cxx | 70 +++++++++++------------ mysqlc/source/mysqlc_resultset.cxx | 56 +++++++++--------- mysqlc/source/mysqlc_resultsetmetadata.cxx | 80 +++++++++++++------------- mysqlc/source/mysqlc_statement.cxx | 8 +-- 7 files changed, 168 insertions(+), 168 deletions(-) (limited to 'mysqlc/source') diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 3bb2ff74dfb0..7ef467838525 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -237,7 +237,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > OSL_TRACE("schema=%s", schema_str.c_str()); m_settings.cppConnection.reset(cppDriver->connect(connProps)); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); } } else { @@ -282,7 +282,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement() xReturn = new OStatement(this, m_settings.cppConnection->createStatement()); m_aStatements.push_back(WeakReferenceHelper(xReturn)); return xReturn; - } catch (sql::SQLException & e) { + } catch (const sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); } return xReturn; @@ -306,7 +306,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(const OUS xStatement = new OPreparedStatement(this, m_settings.cppConnection->prepareStatement(OUStringToOString(sSqlStatement, getConnectionEncoding()).getStr())); m_aStatements.push_back( WeakReferenceHelper( xStatement ) ); - } catch (sql::SQLException & e) { + } catch (const sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); } return xStatement; @@ -340,7 +340,7 @@ OUString SAL_CALL OConnection::nativeSQL(const OUString& _sSql) try { sNativeSQL = mysqlc_sdbc_driver::convert(m_settings.cppConnection->nativeSQL(mysqlc_sdbc_driver::convert(sSqlStatement, getConnectionEncoding())), getConnectionEncoding()); - } catch (sql::SQLException & e) { + } catch (const sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); } return sNativeSQL; @@ -357,7 +357,7 @@ void SAL_CALL OConnection::setAutoCommit(sal_Bool autoCommit) checkDisposed(OConnection_BASE::rBHelper.bDisposed); try { m_settings.cppConnection->setAutoCommit(autoCommit == sal_True? true:false); - } catch (sql::SQLException & e) { + } catch (const sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); } } @@ -378,7 +378,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit() sal_Bool autoCommit = sal_False; try { autoCommit = m_settings.cppConnection->getAutoCommit() == true ? sal_True : sal_False; - } catch (sql::SQLException & e) { + } catch (const sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); } return autoCommit; @@ -395,7 +395,7 @@ void SAL_CALL OConnection::commit() checkDisposed(OConnection_BASE::rBHelper.bDisposed); try { m_settings.cppConnection->commit(); - } catch (sql::SQLException & e) { + } catch (const sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); } } @@ -411,7 +411,7 @@ void SAL_CALL OConnection::rollback() checkDisposed(OConnection_BASE::rBHelper.bDisposed); try { m_settings.cppConnection->rollback(); - } catch (sql::SQLException & e) { + } catch (const sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); } } @@ -443,7 +443,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData() if (!xMetaData.is()) { try { xMetaData = new ODatabaseMetaData(*this); // need the connection because it can return it - } catch (sql::SQLException & e) { + } catch (const sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); } m_xMetaData = xMetaData; @@ -510,7 +510,7 @@ OUString SAL_CALL OConnection::getCatalog() OUString catalog; try { catalog = mysqlc_sdbc_driver::convert(m_settings.cppConnection->getSchema(), getConnectionEncoding()); - } catch (sql::SQLException & e) { + } catch (const sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); } return catalog; @@ -549,7 +549,7 @@ void SAL_CALL OConnection::setTransactionIsolation(sal_Int32 level) } try { m_settings.cppConnection->setTransactionIsolation(cpplevel); - } catch (sql::SQLException & e) { + } catch (const sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); } } @@ -573,7 +573,7 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation() default: ; } - } catch (sql::SQLException & e) { + } catch (const sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); } return TransactionIsolation::NONE; @@ -710,7 +710,7 @@ OUString OConnection::getMysqlVariable(const char *varname) Reference< XRow > xRow(rs, UNO_QUERY); ret = xRow->getString(2); } - } catch (sql::SQLException & e) { + } catch (const sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); } @@ -732,7 +732,7 @@ sal_Int32 OConnection::getMysqlVersion() version = 10000 * m_settings.cppConnection->getMetaData()->getDatabaseMajorVersion(); version += 100 * m_settings.cppConnection->getMetaData()->getDatabaseMinorVersion(); version += m_settings.cppConnection->getMetaData()->getDatabasePatchVersion(); - } catch (sql::SQLException & e) { + } catch (const sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); } return version; diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index fef3e5524f87..4042ab40ee32 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -119,9 +119,9 @@ OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, OUString stringMetaData; try { stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding()); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -138,9 +138,9 @@ OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, OUString stringMetaData; try { stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding()); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -157,9 +157,9 @@ OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, OUString stringMetaData; try { stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding()); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -176,9 +176,9 @@ OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, OUString stringMetaData; try { stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding()); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -195,9 +195,9 @@ sal_Int32 ODatabaseMetaData::impl_getInt32MetaData(const sal_Char* _methodName, sal_Int32 int32MetaData(0); try { int32MetaData = (meta->*_Method)(); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -214,9 +214,9 @@ sal_Bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bo sal_Bool boolMetaData(0); try { boolMetaData = (meta->*_Method)() ? sal_True : sal_False; - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -233,9 +233,9 @@ sal_Bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bo sal_Bool boolMetaData(0); try { boolMetaData = (meta->*_Method)( _arg ) ? sal_True : sal_False; - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -855,9 +855,9 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 /* fromType */, s try { /* ToDo -> use supportsConvert( fromType, toType) */ return meta->supportsConvert()? sal_True:sal_False; - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::supportsConvert", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::supportsConvert", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -1200,9 +1200,9 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation() case sql::TRANSACTION_READ_COMMITTED: return TransactionIsolation::READ_COMMITTED; case sql::TRANSACTION_READ_UNCOMMITTED: return TransactionIsolation::READ_UNCOMMITTED; } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getDriverMajorVersion", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getDriverMajorVersion", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -1377,9 +1377,9 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(sal_Int32 setT sql::TRANSACTION_READ_COMMITTED: (concurrency == com::sun::star::sdbc::TransactionIsolation::SERIALIZABLE? sql::TRANSACTION_SERIALIZABLE:sql::TRANSACTION_SERIALIZABLE))? sal_True:sal_False; - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::supportsResultSetConcurrency", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::supportsResultSetConcurrency", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -1585,9 +1585,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() } rRows.push_back(aRow); } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getCatalogs", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getCatalogs", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -1627,9 +1627,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas() rRows.push_back(aRow); } } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getSchemas", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getSchemas", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -1670,9 +1670,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( } rRows.push_back(aRow); } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getColumnPrivileges", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getColumnPrivileges", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -1720,9 +1720,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( } rRows.push_back(aRow); } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getColumns", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getColumns", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -1781,9 +1781,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( rRows.push_back(aRow); } } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getTables", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getTables", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -1841,9 +1841,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( } rRows.push_back(aRow); } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getProcedures", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getProcedures", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -1897,9 +1897,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( } rRows.push_back(aRow); } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getExportedKeys", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getExportedKeys", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -1939,9 +1939,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( } rRows.push_back(aRow); } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getImportedKeys", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getImportedKeys", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -1980,9 +1980,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( } rRows.push_back(aRow); } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getPrimaryKeys", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getPrimaryKeys", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -2023,9 +2023,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( } rRows.push_back(aRow); } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getIndexInfo", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getIndexInfo", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -2066,9 +2066,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( } rRows.push_back(aRow); } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getBestRowIdentifier", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getBestRowIdentifier", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -2128,9 +2128,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( rRows.push_back(aRow); } } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getTablePrivileges", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getTablePrivileges", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); @@ -2175,9 +2175,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( } rRows.push_back(aRow); } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getCrossReference", *this); - } catch (sql::InvalidArgumentException) { + } catch (const sql::InvalidArgumentException &) { mysqlc_sdbc_driver::throwInvalidArgumentException("ODatabaseMetaData::getCrossReference", *this); } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index 2b52a2e82f43..289b4c873880 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -223,7 +223,7 @@ Reference< XConnection > SAL_CALL MysqlCDriver::connect(const OUString& url, con pCon->construct(url,info); m_xConnections.push_back(WeakReferenceHelper(*pCon)); } - catch (sql::SQLException &e) + catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getDefaultEncoding()); } diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index 50a2e97969f1..fb7440c7a359 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -76,7 +76,7 @@ OPreparedStatement::OPreparedStatement(OConnection* _pConnection, sql::PreparedS try { m_paramCount = ((sql::PreparedStatement *)cppStatement)->getParameterMetaData()->getParameterCount(); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } } @@ -150,9 +150,9 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData() getOwnConnection()->getConnectionEncoding() ); } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } return m_xMetaData; @@ -173,7 +173,7 @@ void SAL_CALL OPreparedStatement::close() clearWarnings(); clearParameters(); OCommonStatement::close(); - } catch (SQLException) { + } catch (const SQLException &) { // If we get an error, ignore } @@ -194,7 +194,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute() sal_Bool success = sal_False; try { success = ((sql::PreparedStatement *)cppStatement)->execute()? sal_True:sal_False; - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } return success; @@ -213,7 +213,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate() sal_Int32 affectedRows = sal_False; try { affectedRows = ((sql::PreparedStatement *)cppStatement)->executeUpdate(); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } return affectedRows; @@ -233,9 +233,9 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const OUString& try { std::string stringie(::rtl::OUStringToOString(x, m_pConnection->getConnectionEncoding()).getStr()); ((sql::PreparedStatement *)cppStatement)->setString(parameter, stringie); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } } @@ -284,7 +284,7 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery() try { sql::ResultSet * res = ((sql::PreparedStatement *)cppStatement)->executeQuery(); xResultSet = new OResultSet(this, res, getOwnConnection()->getConnectionEncoding()); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } return xResultSet; @@ -303,9 +303,9 @@ void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 parameter, sal_Bool x) try { ((sql::PreparedStatement *)cppStatement)->setBoolean(parameter, x); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setBoolean", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } } @@ -323,9 +323,9 @@ void SAL_CALL OPreparedStatement::setByte(sal_Int32 parameter, sal_Int8 x) try { ((sql::PreparedStatement *)cppStatement)->setInt(parameter, x); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setByte", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } } @@ -351,9 +351,9 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 parameter, const Date& aData try { ((sql::PreparedStatement *)cppStatement)->setDateTime(parameter, dateStr); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setDate", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } } @@ -379,9 +379,9 @@ void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const Time& aVal) try { ((sql::PreparedStatement *)cppStatement)->setDateTime(parameter, timeStr); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setTime", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } } @@ -415,9 +415,9 @@ void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 parameter, const DateTi try { ((sql::PreparedStatement *)cppStatement)->setDateTime(parameter, timeStr); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setTimestamp", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } } @@ -435,9 +435,9 @@ void SAL_CALL OPreparedStatement::setDouble(sal_Int32 parameter, double x) try { ((sql::PreparedStatement *)cppStatement)->setDouble(parameter, x); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setDouble", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } } @@ -455,9 +455,9 @@ void SAL_CALL OPreparedStatement::setFloat(sal_Int32 parameter, float x) try { ((sql::PreparedStatement *)cppStatement)->setDouble(parameter, x); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setFloat", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } } @@ -475,9 +475,9 @@ void SAL_CALL OPreparedStatement::setInt(sal_Int32 parameter, sal_Int32 x) try { ((sql::PreparedStatement *)cppStatement)->setInt(parameter, x); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setInt", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } } @@ -495,9 +495,9 @@ void SAL_CALL OPreparedStatement::setLong(sal_Int32 parameter, sal_Int64 aVal) try { ((sql::PreparedStatement *)cppStatement)->setInt64(parameter, aVal); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setLong", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } } @@ -515,9 +515,9 @@ void SAL_CALL OPreparedStatement::setNull(sal_Int32 parameter, sal_Int32 sqlType try { ((sql::PreparedStatement *)cppStatement)->setNull(parameter, sqlType); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setNull", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } } @@ -784,9 +784,9 @@ void SAL_CALL OPreparedStatement::setShort(sal_Int32 parameter, sal_Int16 x) try { ((sql::PreparedStatement *)cppStatement)->setInt(parameter, x); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setShort", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } } @@ -805,9 +805,9 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 parameter, const Sequence< std::string blobby((char *)x.getConstArray(), x.getLength()); try { ((sql::PreparedStatement *)cppStatement)->setString(parameter, blobby); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setBytes", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } } @@ -856,9 +856,9 @@ void SAL_CALL OPreparedStatement::clearParameters() try { ((sql::PreparedStatement *)cppStatement)->clearParameters(); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } } diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index ca8f640d2452..a2034f8e8880 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -110,7 +110,7 @@ OResultSet::OResultSet(OCommonStatement * pStmt, sql::ResultSet * result, rtl_Te try { sql::ResultSetMetaData * rs_meta = m_result->getMetaData(); fieldCount = rs_meta->getColumnCount(); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } } @@ -184,7 +184,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& columnName) return i; } } - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return 0; @@ -233,7 +233,7 @@ sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 column) checkColumnIndex(column); try { return m_result->getBoolean(column)? sal_True:sal_False; - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; @@ -252,7 +252,7 @@ sal_Int8 SAL_CALL OResultSet::getByte(sal_Int32 column) checkColumnIndex(column); try { return m_result->getInt(column); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return 0; // fool compiler @@ -311,7 +311,7 @@ Date SAL_CALL OResultSet::getDate(sal_Int32 column) } i++; } while (nIndex >= 0); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return d; @@ -330,7 +330,7 @@ double SAL_CALL OResultSet::getDouble(sal_Int32 column) checkColumnIndex(column); try { return m_result->getDouble(column); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return 0.0; // fool compiler @@ -349,7 +349,7 @@ float SAL_CALL OResultSet::getFloat(sal_Int32 column) checkColumnIndex(column); try { return m_result->getDouble(column); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return 0.0; // fool compiler @@ -368,7 +368,7 @@ sal_Int32 SAL_CALL OResultSet::getInt(sal_Int32 column) checkColumnIndex(column); try { return m_result->getInt(column); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return 0; // fool compiler @@ -386,7 +386,7 @@ sal_Int32 SAL_CALL OResultSet::getRow() try { return m_result->getRow(); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return 0; // fool compiler @@ -405,7 +405,7 @@ sal_Int64 SAL_CALL OResultSet::getLong(sal_Int32 column) checkColumnIndex(column); try { return m_result->getInt64(column); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return 0; // fool compiler @@ -424,9 +424,9 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData() if (!m_xMetaData.is()) { m_xMetaData = new OResultSetMetaData(m_result->getMetaData(), m_encoding); } - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return m_xMetaData; @@ -521,7 +521,7 @@ sal_Int16 SAL_CALL OResultSet::getShort(sal_Int32 column) try { return (sal_Int16) m_result->getInt(column); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return 0; // fool compiler @@ -546,7 +546,7 @@ OUString SAL_CALL OResultSet::getString(sal_Int32 column) } else { return OUString(); } - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return OUString(); // fool compiler @@ -625,7 +625,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst() try { return m_result->isBeforeFirst()? sal_True:sal_False; - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; //fool @@ -643,7 +643,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast() try { return m_result->isAfterLast()? sal_True:sal_False; - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; //fool @@ -661,7 +661,7 @@ sal_Bool SAL_CALL OResultSet::isFirst() try { return m_result->isFirst(); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; //fool @@ -679,7 +679,7 @@ sal_Bool SAL_CALL OResultSet::isLast() try { return m_result->isLast()? sal_True:sal_False; - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; //fool @@ -697,7 +697,7 @@ void SAL_CALL OResultSet::beforeFirst() try { m_result->beforeFirst(); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } } @@ -714,7 +714,7 @@ void SAL_CALL OResultSet::afterLast() try { m_result->afterLast(); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } } @@ -730,7 +730,7 @@ void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException) try { m_result->close(); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } @@ -748,7 +748,7 @@ sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException) try { return m_result->first()? sal_True:sal_False; - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; //fool @@ -766,7 +766,7 @@ sal_Bool SAL_CALL OResultSet::last() try { return m_result->last()? sal_True:sal_False; - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; //fool @@ -784,7 +784,7 @@ sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 row) try { return m_result->absolute(row)? sal_True:sal_False; - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; //fool @@ -802,7 +802,7 @@ sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) try { return m_result->relative(row)? sal_True:sal_False; - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; //fool @@ -820,7 +820,7 @@ sal_Bool SAL_CALL OResultSet::previous() try { return m_result->previous()? sal_True:sal_False; - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; //fool @@ -890,7 +890,7 @@ sal_Bool SAL_CALL OResultSet::next() try { return m_result->next()? sal_True:sal_False; - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; //fool @@ -908,7 +908,7 @@ sal_Bool SAL_CALL OResultSet::wasNull() try { return m_result->wasNull()? sal_True:sal_False; - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; //fool diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx index 22bbf637bad6..b56e1bde8972 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.cxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx @@ -51,9 +51,9 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize(sal_Int32 column) try { meta->getColumnDisplaySize(column); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getColumnDisplaySize", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return 0; // fool compiler @@ -70,9 +70,9 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column) try { return mysqlc_sdbc_driver::mysqlToOOOType(meta->getColumnType(column)); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return 0; // fool compiler @@ -91,9 +91,9 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount() OSL_TRACE("OResultSetMetaData::getColumnCount"); try { return meta->getColumnCount(); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return 0; // fool compiler @@ -110,9 +110,9 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) try { return meta->isCaseSensitive(column); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; // fool compiler @@ -129,9 +129,9 @@ OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column) try { return convert(meta->getSchemaName(column)); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return OUString(); // fool compiler @@ -148,9 +148,9 @@ OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) try { return convert( meta->getColumnName( column ) ); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return OUString(); // fool compiler @@ -167,9 +167,9 @@ OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) try { return convert(meta->getTableName(column)); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return OUString(); // fool compiler @@ -186,9 +186,9 @@ OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column) try { return convert(meta->getCatalogName(column)); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return OUString(); // fool compiler @@ -205,9 +205,9 @@ OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) try { return convert(meta->getColumnTypeName(column)); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return OUString(); // fool compiler @@ -224,9 +224,9 @@ OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) try { return convert(meta->getColumnLabel(column)); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return OUString(); // fool compiler @@ -256,9 +256,9 @@ sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column) try { return meta->isCurrency(column)? sal_True:sal_False; - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; // fool compiler @@ -275,9 +275,9 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column) try { return meta->isAutoIncrement(column)? sal_True:sal_False; - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; // fool compiler @@ -294,9 +294,9 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column) try { return meta->isSigned(column)? sal_True:sal_False; - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; // fool compiler @@ -313,9 +313,9 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) try { return meta->getPrecision(column); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getPrecision", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return 0; // fool compiler @@ -331,9 +331,9 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column) checkColumnIndex(column); try { return meta->getScale(column); - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getScale", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return 0; // fool compiler @@ -350,9 +350,9 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column) try { return meta->isNullable(column)? sal_True:sal_False; - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; // fool compiler @@ -369,9 +369,9 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column) try { return meta->isSearchable(column)? sal_True:sal_False; - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; // fool compiler @@ -388,9 +388,9 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column) try { return meta->isReadOnly(column)? sal_True:sal_False; - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; // fool compiler @@ -407,9 +407,9 @@ sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32 column) try { return meta->isDefinitelyWritable(column)? sal_True:sal_False; - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; // fool compiler @@ -426,9 +426,9 @@ sal_Bool SAL_CALL OResultSetMetaData::isWritable(sal_Int32 column) try { return meta->isWritable(column)? sal_True:sal_False; - } catch (sql::MethodNotImplementedException) { + } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSetMetaData::getMetaData", *this); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } return sal_False; // fool compiler diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index 9800e08e6660..736a3b1361c2 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -193,7 +193,7 @@ sal_Bool SAL_CALL OCommonStatement::execute(const OUString& sql) sal_Bool success = false; try { success = cppStatement->execute(OUStringToOString(sSqlStatement, m_pConnection->getConnectionSettings().encoding).getStr())? sal_True:sal_False; - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } return success; @@ -216,7 +216,7 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery(const OUString& std::auto_ptr< sql::ResultSet > rset(cppStatement->executeQuery(OUStringToOString(sSqlStatement, m_pConnection->getConnectionEncoding()).getStr())); xResultSet = new OResultSet(this, rset.get(), m_pConnection->getConnectionEncoding()); rset.release(); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } return xResultSet; @@ -301,7 +301,7 @@ sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const OUString& sql) sal_Int32 affectedRows = 0; try { affectedRows = cppStatement->executeUpdate(OUStringToOString(sSqlStatement, m_pConnection->getConnectionEncoding()).getStr()); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } return affectedRows; @@ -322,7 +322,7 @@ Reference< XResultSet > SAL_CALL OCommonStatement::getResultSet() std::auto_ptr< sql::ResultSet > rset(cppStatement->getResultSet()); xResultSet = new OResultSet(this, rset.get(), m_pConnection->getConnectionEncoding()); rset.release(); - } catch (sql::SQLException &e) { + } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } return xResultSet; -- cgit