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

[Libreoffice Gerrit user]

 connectivity/source/drivers/macab/MacabColumns.cxx   |    2 +-
 connectivity/source/drivers/macab/MacabResultSet.cxx |    1 -
 connectivity/source/drivers/macab/MacabTables.cxx    |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a9d3d2b34415edd0d7018e940b41321b9951d151
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Sep 13 21:22:33 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Sep 14 07:25:42 2018 +0200

    loplugin:simplifyconstruct (macOS)
    
    Change-Id: I460732b2ea9e7366943162bef8f4fced5f975e95
    Reviewed-on: https://gerrit.libreoffice.org/60466
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx
index 45ed77085bfe..23c95e996c1b 100644
--- a/connectivity/source/drivers/macab/MacabColumns.cxx
+++ b/connectivity/source/drivers/macab/MacabColumns.cxx
@@ -44,7 +44,7 @@ sdbcx::ObjectType MacabColumns::createObject(const OUString& _rName)
     Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns(
         aCatalog, sSchemaName, sTableName, _rName);
 
-    sdbcx::ObjectType xRet = nullptr;
+    sdbcx::ObjectType xRet;
     if (xResult.is())
     {
         Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index f9bb5ab0744d..72920f138c10 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -49,7 +49,6 @@ MacabResultSet::MacabResultSet(MacabCommonStatement* pStmt)
     : MacabResultSet_BASE(m_aMutex),
       OPropertySetHelper(MacabResultSet_BASE::rBHelper),
       m_xStatement(pStmt),
-      m_xMetaData(nullptr),
       m_aMacabRecords(),
       m_nRowPos(-1),
       m_bWasNull(true)
diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx
index 5a6e37927365..42d2adfe63c3 100644
--- a/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/connectivity/source/drivers/macab/MacabTables.cxx
@@ -45,7 +45,7 @@ sdbcx::ObjectType MacabTables::createObject(const OUString& _rName)
 
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema, aName, aTypes);
 
-    sdbcx::ObjectType xRet = nullptr;
+    sdbcx::ObjectType xRet;
     if (xResult.is())
     {
         Reference< XRow > xRow(xResult, UNO_QUERY);