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

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Mon Mar 8 17:55:00 UTC 2021


 connectivity/source/drivers/macab/MacabResultSet.cxx |    5 +++--
 connectivity/source/drivers/macab/MacabStatement.cxx |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 0f0563ebd29f170f65cec749a19efdfcb4e44ba8
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Mar 8 15:05:24 2021 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Mar 8 18:54:15 2021 +0100

    loplugin:refcounting (macOS)
    
    Change-Id: Id9c5035933453bad617d1a2f78241e435e42fe91
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112168
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index b35f6e2d57ca..090620af49d0 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -33,6 +33,7 @@
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <resource/sharedresources.hxx>
+#include <rtl/ref.hxx>
 #include <strings.hrc>
 
 using namespace connectivity::macab;
@@ -64,14 +65,14 @@ MacabResultSet::~MacabResultSet()
 
 void MacabResultSet::allMacabRecords()
 {
-    MacabConnection* pConnection = static_cast< MacabConnection *>(m_xStatement->getConnection().get());
+    rtl::Reference<MacabConnection> pConnection = static_cast< MacabConnection *>(m_xStatement->getConnection().get());
 
     m_aMacabRecords = pConnection->getAddressBook()->getMacabRecords(m_sTableName);
 }
 
 void MacabResultSet::someMacabRecords(const MacabCondition *pCondition)
 {
-    MacabConnection* pConnection = static_cast< MacabConnection *>(m_xStatement->getConnection().get());
+    rtl::Reference<MacabConnection> pConnection = static_cast< MacabConnection *>(m_xStatement->getConnection().get());
     MacabRecords* allRecords;
 
     allRecords = pConnection->getAddressBook()->getMacabRecords(m_sTableName);
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 1b7d7f5a7bff..450213f7cca5 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -289,7 +289,7 @@ OUString MacabCommonStatement::getTableName() const
 void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const
 {
     ::rtl::Reference<connectivity::OSQLColumns> xColumns;   // selected columns
-    MacabResultSetMetaData *pMeta;              // meta information - holds the list of AddressBook fields
+    rtl::Reference<MacabResultSetMetaData> pMeta;           // meta information - holds the list of AddressBook fields
 
     xColumns = m_aSQLIterator.getSelectColumns();
     if (!xColumns.is())


More information about the Libreoffice-commits mailing list