From e18b08363a939b35e7f5dc435e606d2c62bddebd Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 18 Dec 2015 09:37:44 +0200 Subject: loplugin:unusedmethods Change-Id: Ifafdaf6da0225f244853a0042a6458643b570623 --- mysqlc/source/mysqlc_connection.cxx | 29 ---------------------------- mysqlc/source/mysqlc_connection.hxx | 5 ----- mysqlc/source/mysqlc_databasemetadata.cxx | 32 ------------------------------- mysqlc/source/mysqlc_databasemetadata.hxx | 2 -- 4 files changed, 68 deletions(-) (limited to 'mysqlc/source') diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index d962ffa4a5b1..52562870f9b4 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -571,35 +571,6 @@ void OConnection::disposing() OConnection_BASE::disposing(); } -/* ToDo - upcast the connection to MySQL_Connection and use ::getSessionVariable() */ - -rtl::OUString OConnection::getMysqlVariable(const char *varname) - throw(SQLException, RuntimeException) -{ - OSL_TRACE("OConnection::getMysqlVariable"); - MutexGuard aGuard(m_aMutex); - checkDisposed(OConnection_BASE::rBHelper.bDisposed); - - rtl::OUString ret; - rtl::OUStringBuffer aStatement; - aStatement.appendAscii( "SHOW SESSION VARIABLES LIKE '" ); - aStatement.appendAscii( varname ); - aStatement.append( '\'' ); - - try { - XStatement * stmt = new OStatement(this, m_settings.cppConnection->createStatement()); - Reference< XResultSet > rs = stmt->executeQuery( aStatement.makeStringAndClear() ); - if (rs.is() && rs->next()) { - Reference< XRow > xRow(rs, UNO_QUERY); - ret = xRow->getString(2); - } - } catch (const sql::SQLException & e) { - mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); - } - - return ret; -} - sal_Int32 OConnection::getMysqlVersion() throw(SQLException, RuntimeException) { diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index ea1f8c39a0e9..78ccd0d3d97d 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -112,9 +112,6 @@ namespace connectivity bool m_bUseCatalog; // should we use the catalog on filebased databases public: - rtl::OUString getMysqlVariable(const char *varname) - throw(SQLException, RuntimeException); - sal_Int32 getMysqlVersion() throw(SQLException, RuntimeException); @@ -215,9 +212,7 @@ namespace connectivity // should we use the catalog on filebased databases inline bool isCatalogUsed() const { return m_bUseCatalog; } - inline rtl::OUString getUserName() const { return m_sUser; } inline const MysqlCDriver& getDriver() const { return m_rDriver;} - inline rtl_TextEncoding getTextEncoding() const { return m_settings.encoding; } }; /* OConnection */ // TODO: Not used. diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index f7a49cfbe79c..03311f4f936f 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -97,38 +97,6 @@ ODatabaseMetaData::~ODatabaseMetaData() OSL_TRACE("ODatabaseMetaData::~ODatabaseMetaData"); } -rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() ) -{ - OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); - rtl::OUString stringMetaData; - try { - stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding()); - } catch (const sql::MethodNotImplementedException &) { - mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this); - } catch (const sql::InvalidArgumentException &) { - mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this); - } catch (const sql::SQLException& e) { - mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); - } - return stringMetaData; -} - -rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() ) -{ - OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); - rtl::OUString stringMetaData; - try { - stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding()); - } catch (const sql::MethodNotImplementedException &) { - mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this); - } catch (const sql::InvalidArgumentException &) { - mysqlc_sdbc_driver::throwInvalidArgumentException(_methodName, *this); - } catch (const sql::SQLException& e) { - mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); - } - return stringMetaData; -} - rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() ) { OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx index 687039d96f69..531ba50ff283 100644 --- a/mysqlc/source/mysqlc_databasemetadata.hxx +++ b/mysqlc/source/mysqlc_databasemetadata.hxx @@ -49,8 +49,6 @@ namespace connectivity bool identifier_quote_string_set; private: - rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() ); - rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() ); rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() ); rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*_Method)() ); sal_Int32 impl_getInt32MetaData( const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*_Method)() ); -- cgit