From 948a3ece9a9ba00201a01268e2facaf178ed8d79 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 8 Jun 2015 16:26:34 +0200 Subject: loplugin:cstylecast: deal with remaining pointer casts Change-Id: I18ea5378c165912e988d0c951aab3d83754cf6ca --- mysqlc/source/mysqlc_connection.cxx | 2 +- mysqlc/source/mysqlc_resultset.cxx | 2 +- mysqlc/source/mysqlc_resultset.hxx | 2 +- mysqlc/source/mysqlc_statement.cxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index d6a8fe416dd4..836d67405ed0 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -62,7 +62,7 @@ using ::osl::MutexGuard; OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver) :OMetaConnection_BASE(m_aMutex) - ,OSubComponent((::cppu::OWeakObject*)&_rDriver, this) + ,OSubComponent(static_cast(&_rDriver), this) ,m_xMetaData(NULL) ,m_rDriver(_rDriver) ,cppDriver(_cppDriver) diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index 2ef646c906f0..65e498766950 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -75,7 +75,7 @@ sal_Bool SAL_CALL OResultSet::supportsService(const rtl::OUString& _rServiceName OResultSet::OResultSet(OCommonStatement * pStmt, sql::ResultSet * result, rtl_TextEncoding _encoding ) : OResultSet_BASE(m_aMutex) ,OPropertySetHelper(OResultSet_BASE::rBHelper) - ,m_aStatement((OWeakObject*)pStmt) + ,m_aStatement(static_cast(pStmt)) ,m_xMetaData(NULL) ,m_result(result) ,fieldCount( 0 ) diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx index 33c7a417729e..003ca0331b46 100644 --- a/mysqlc/source/mysqlc_resultset.hxx +++ b/mysqlc/source/mysqlc_resultset.hxx @@ -108,7 +108,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() { - return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(*(OResultSet_BASE*)this); + return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(*static_cast(this)); } // ::cppu::OComponentHelper diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index f2a15d38f7af..fc167d711e46 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -56,7 +56,7 @@ using ::osl::MutexGuard; OCommonStatement::OCommonStatement(OConnection* _pConnection, sql::Statement *_cppStatement) :OCommonStatement_IBase(m_aMutex) ,OPropertySetHelper(OCommonStatement_IBase::rBHelper) - ,OStatement_CBase( (::cppu::OWeakObject*)_pConnection, this ) + ,OStatement_CBase( static_cast(_pConnection), this ) ,m_pConnection(_pConnection) ,cppStatement(_cppStatement) ,rBHelper(OCommonStatement_IBase::rBHelper) -- cgit v1.2.3