diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-09 09:32:24 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-09 15:27:21 +0100 |
| commit | e689cf1e353055b9b2bd597006827d4c4e7b13a0 (patch) | |
| tree | 3ad20617ec78f6c640d7fdcbe3d35354be312e72 /connectivity | |
| parent | 82ccc1a02ed3d423552c4c3a58dfb4a23a9942ae (diff) | |
connectivity: fix loplugin:datamembershadow warning in the Calc driver
Change-Id: Idcc6b1734599eec5d9eefbefb8849dc050b6a9d6
Reviewed-on: https://gerrit.libreoffice.org/44522
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/calc/CTable.cxx | 10 | ||||
| -rw-r--r-- | connectivity/source/inc/calc/CTable.hxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index 39993d6a4059..47bee0acb54c 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -517,7 +517,7 @@ OCalcTable::OCalcTable(sdbcx::OCollection* _pTables,OCalcConnection* _pConnectio Description, SchemaName, CatalogName) - ,m_pConnection(_pConnection) + ,m_pCalcConnection(_pConnection) ,m_nStartCol(0) ,m_nStartRow(0) ,m_nDataCols(0) @@ -529,7 +529,7 @@ OCalcTable::OCalcTable(sdbcx::OCollection* _pTables,OCalcConnection* _pConnectio void OCalcTable::construct() { // get sheet object - Reference< XSpreadsheetDocument> xDoc = m_pConnection->acquireDoc(); + Reference< XSpreadsheetDocument> xDoc = m_pCalcConnection->acquireDoc(); if (xDoc.is()) { Reference<XSpreadsheets> xSheets = xDoc->getSheets(); @@ -613,9 +613,9 @@ void SAL_CALL OCalcTable::disposing() OFileTable::disposing(); ::osl::MutexGuard aGuard(m_aMutex); m_aColumns = nullptr; - if ( m_pConnection ) - m_pConnection->releaseDoc(); - m_pConnection = nullptr; + if ( m_pCalcConnection ) + m_pCalcConnection->releaseDoc(); + m_pCalcConnection = nullptr; } diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx index 19cd32116ea1..1d9b6897813b 100644 --- a/connectivity/source/inc/calc/CTable.hxx +++ b/connectivity/source/inc/calc/CTable.hxx @@ -46,7 +46,7 @@ namespace connectivity std::vector<sal_Int32> m_aPrecisions; // same as aboth std::vector<sal_Int32> m_aScales; css::uno::Reference< css::sheet::XSpreadsheet > m_xSheet; - OCalcConnection* m_pConnection; + OCalcConnection* m_pCalcConnection; sal_Int32 m_nStartCol; sal_Int32 m_nStartRow; sal_Int32 m_nDataCols; |