From a81489978cb96d819044be054f7ceabc4f8eccb2 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sun, 24 Nov 2019 00:10:42 +0100 Subject: cppcheck: fix 2 funcArgOrderDifferent 1) sd/source/filter/ppt/pptin.cxx Function 'ProcessObj' argument order different: declaration 'rSt, rData, rClientData, rTextRect, pObj' definition 'rSt, rObjData, rData, rTextRect, pRet' 2) connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx Function 'OPreparedResultSet' argument order different: declaration 'rConn, pStmt, pMyStmt' definition 'rConn, pPrepared, pStmt' Change-Id: I83f8427ee15c3025676c39f262c2e9881cdd33ae Reviewed-on: https://gerrit.libreoffice.org/83593 Reviewed-by: Julien Nabet Tested-by: Julien Nabet --- .../source/drivers/mysqlc/mysqlc_prepared_resultset.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'connectivity') diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx index 57be21dd6cc5..bfba7745856e 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx @@ -170,21 +170,21 @@ sal_Bool SAL_CALL OPreparedResultSet::supportsService(const OUString& _rServiceN { return cppu::supportsService(this, _rServiceName); } -OPreparedResultSet::OPreparedResultSet(OConnection& rConn, OPreparedStatement* pPrepared, - MYSQL_STMT* pStmt) +OPreparedResultSet::OPreparedResultSet(OConnection& rConn, OPreparedStatement* pStmt, + MYSQL_STMT* pMyStmt) : OPreparedResultSet_BASE(m_aMutex) , OPropertySetHelper(OPreparedResultSet_BASE::rBHelper) , m_rConnection(rConn) - , m_aStatement(static_cast(pPrepared)) - , m_pStmt(pStmt) + , m_aStatement(static_cast(pStmt)) + , m_pStmt(pMyStmt) , m_encoding(rConn.getConnectionEncoding()) - , m_nColumnCount(mysql_stmt_field_count(pStmt)) + , m_nColumnCount(mysql_stmt_field_count(pMyStmt)) { m_pResult = mysql_stmt_result_metadata(m_pStmt); if (m_pResult != nullptr) mysql_stmt_store_result(m_pStmt); m_aFields = mysql_fetch_fields(m_pResult); - m_nRowCount = mysql_stmt_num_rows(pStmt); + m_nRowCount = mysql_stmt_num_rows(pMyStmt); } void OPreparedResultSet::disposing() -- cgit