diff options
| -rw-r--r-- | connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx | 12 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 8 |
2 files changed, 10 insertions, 10 deletions
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<OWeakObject*>(pPrepared)) - , m_pStmt(pStmt) + , m_aStatement(static_cast<OWeakObject*>(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() diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index c2f30fa880e4..b641545a8aca 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2566,9 +2566,9 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj return pRet; } -SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, SvxMSDffClientData& rData, ::tools::Rectangle& rTextRect, SdrObject* pRet ) +SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rData, SvxMSDffClientData& rClientData, ::tools::Rectangle& rTextRect, SdrObject* pRet ) { - SdrObject* pObj = SdrPowerPointImport::ProcessObj( rSt, rObjData, rData, rTextRect, pRet ); + SdrObject* pObj = SdrPowerPointImport::ProcessObj( rSt, rData, rClientData, rTextRect, pRet ); // read animation effect of object if ( pObj ) @@ -2576,7 +2576,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, Svx // further setup placeholder objects if (dynamic_cast<const SdrPageObj*>(pObj)) { - const ProcessData& rProcessData=static_cast<const ProcessData&>(rData); + const ProcessData& rProcessData=static_cast<const ProcessData&>(rClientData); if(rProcessData.pPage.page) static_cast<SdPage *>(rProcessData.pPage.page)->InsertPresObj( pObj, PRESOBJ_PAGE ); @@ -2713,7 +2713,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, Svx if ( bInhabitanceChecked || bAnimationInfoFound ) break; bInhabitanceChecked = true; - if ( ! ( IsProperty( DFF_Prop_hspMaster ) && SeekToShape( rSt, &rData, GetPropertyValue( DFF_Prop_hspMaster, 0 ) ) ) ) + if ( ! ( IsProperty( DFF_Prop_hspMaster ) && SeekToShape( rSt, &rClientData, GetPropertyValue( DFF_Prop_hspMaster, 0 ) ) ) ) break; ReadDffRecordHeader( rSt, aMasterShapeHd ); if ( !SeekToRec( rSt, DFF_msofbtClientData, aMasterShapeHd.GetRecEndFilePos(), &aMasterShapeHd ) ) |