[Libreoffice-commits] core.git: compilerplugins/clang connectivity/source

[Miklos Vajna]

 compilerplugins/clang/datamembershadow.cxx  |    2 --
 connectivity/source/drivers/calc/CTable.cxx |   10 +++++-----
 connectivity/source/inc/calc/CTable.hxx     |    2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit e689cf1e353055b9b2bd597006827d4c4e7b13a0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Nov 9 09:32:24 2017 +0100

    connectivity: fix loplugin:datamembershadow warning in the Calc driver
    
    Change-Id: Idcc6b1734599eec5d9eefbefb8849dc050b6a9d6
    Reviewed-on: https://gerrit.libreoffice.org/44522
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/compilerplugins/clang/datamembershadow.cxx b/compilerplugins/clang/datamembershadow.cxx
index f1b9b4398473..cc2ec7675b8d 100644
--- a/compilerplugins/clang/datamembershadow.cxx
+++ b/compilerplugins/clang/datamembershadow.cxx
@@ -48,8 +48,6 @@ bool DataMemberShadow::VisitFieldDecl(FieldDecl const * fieldDecl)
 
     // FIXME complex stuff to fix later
 
-    if (loplugin::isSamePathname(aFileName, SRCDIR "/connectivity/source/inc/calc/CTable.hxx"))
-        return true;
     if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/chart2/source/"))
         return true;
     if (loplugin::isSamePathname(aFileName, SRCDIR "/cppcanvas/source/mtfrenderer/emfplus.cxx"))
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;