connectivity/source/drivers/macab/MacabColumns.cxx | 3 -
connectivity/source/drivers/macab/MacabConnection.cxx | 8 +--
connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx | 28 +++++-------
connectivity/source/drivers/macab/MacabStatement.cxx | 12 ++---
connectivity/source/drivers/macab/MacabTables.cxx | 3 -
5 files changed, 23 insertions(+), 31 deletions(-)
New commits:
commit abba6e22610ceff3d0e439b0ebd6137d064859a9
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Mar 2 13:44:05 2021 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Mar 2 23:12:31 2021 +0100
loplugin:refcounting (macOS)
Change-Id: Ia68887778e6779cfaee58c88344c748a2b3d4579
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111831
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx
b/connectivity/source/drivers/macab/MacabColumns.cxx
index 6eaa51aa7906..6a49ad1d066c 100644
--- a/connectivity/source/drivers/macab/MacabColumns.cxx
+++ b/connectivity/source/drivers/macab/MacabColumns.cxx
@@ -54,7 +54,7 @@ sdbcx::ObjectType MacabColumns::createObject(const OUString&
_rName)
{
if (xRow->getString(4) == _rName)
{
- OColumn* pRet = new OColumn(
+ xRet = new OColumn(
_rName,
xRow->getString(6),
xRow->getString(13),
@@ -70,7 +70,6 @@ sdbcx::ObjectType MacabColumns::createObject(const OUString&
_rName)
sCatalogName,
sSchemaName,
sTableName);
- xRet = pRet;
break;
}
}
diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx
b/connectivity/source/drivers/macab/MacabConnection.cxx
index 4e5a27354e54..eaa6cf523222 100644
--- a/connectivity/source/drivers/macab/MacabConnection.cxx
+++ b/connectivity/source/drivers/macab/MacabConnection.cxx
@@ -27,6 +27,7 @@
#include "MacabCatalog.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/TransactionIsolation.hpp>
+#include <cppuhelper/weak.hxx>
using namespace connectivity::macab;
using namespace com::sun::star::uno;
@@ -295,8 +296,7 @@ Reference< XTablesSupplier >
MacabConnection::createCatalog()
Reference< XTablesSupplier > xTab = m_xCatalog;
if (!m_xCatalog.is())
{
- MacabCatalog *pCat = new MacabCatalog(this);
- xTab = pCat;
+ xTab = new MacabCatalog(this);
m_xCatalog = xTab;
}
return xTab;
@@ -309,10 +309,8 @@ MacabAddressBook* MacabConnection::getAddressBook() const
extern "C" SAL_DLLPUBLIC_EXPORT void* createMacabConnection( void* _pDriver )
{
- MacabConnection* pConnection = new MacabConnection( static_cast<
MacabDriver* >( _pDriver ) );
// by definition, the pointer crossing library boundaries as void ptr is
acquired once
- pConnection->acquire();
- return pConnection;
+ return cppu::acquire(new MacabConnection( static_cast< MacabDriver* >(
_pDriver ) ));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index 9b3aed095039..807cd8583e42 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbc/TransactionIsolation.hpp>
+#include <rtl/ref.hxx>
#include <vector>
@@ -734,8 +735,7 @@ Reference< XConnection > SAL_CALL
MacabDatabaseMetaData::getConnection( )
Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes( )
{
- ::connectivity::ODatabaseMetaDataResultSet* pResult = new
::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes);
- Reference< XResultSet > xRef = pResult;
+ rtl::Reference<::connectivity::ODatabaseMetaDataResultSet> pResult = new
::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes);
static ODatabaseMetaDataResultSet::ORows aRows = [&]
{
@@ -748,13 +748,12 @@ Reference< XResultSet > SAL_CALL
MacabDatabaseMetaData::getTableTypes( )
return tmp;
}();
pResult->setRows(aRows);
- return xRef;
+ return pResult;
}
Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo( )
{
- ODatabaseMetaDataResultSet* pResult = new
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTypeInfo);
- Reference< XResultSet > xRef = pResult;
+ rtl::Reference<ODatabaseMetaDataResultSet> pResult = new
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTypeInfo);
static ODatabaseMetaDataResultSet::ORows aRows = [&]()
{
@@ -806,7 +805,7 @@ Reference< XResultSet > SAL_CALL
MacabDatabaseMetaData::getTypeInfo( )
return tmp;
}();
pResult->setRows(aRows);
- return xRef;
+ return pResult;
}
Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCatalogs( )
@@ -832,8 +831,7 @@ Reference< XResultSet > SAL_CALL
MacabDatabaseMetaData::getColumns(
const OUString& tableNamePattern,
const OUString& columnNamePattern)
{
- ::connectivity::ODatabaseMetaDataResultSet* pResult = new
::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns);
- Reference< XResultSet > xRef = pResult;
+ rtl::Reference<::connectivity::ODatabaseMetaDataResultSet> pResult = new
::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns);
MacabRecords *aRecords;
OUString sTableName;
@@ -910,7 +908,7 @@ Reference< XResultSet > SAL_CALL
MacabDatabaseMetaData::getColumns(
}
}
pResult->setRows(aRows);
- return xRef;
+ return pResult;
}
Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables(
@@ -919,8 +917,7 @@ Reference< XResultSet > SAL_CALL
MacabDatabaseMetaData::getTables(
const OUString&,
const Sequence< OUString >& types)
{
- ODatabaseMetaDataResultSet* pResult = new
ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables);
- Reference< XResultSet > xRef = pResult;
+ rtl::Reference<ODatabaseMetaDataResultSet> pResult = new
ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables);
// check whether we have tables in the requested types
// for the moment, we answer only the "TABLE" table type
@@ -944,7 +941,7 @@ Reference< XResultSet > SAL_CALL
MacabDatabaseMetaData::getTables(
p++;
}
if (!bTableFound)
- return xRef;
+ return pResult;
static ODatabaseMetaDataResultSet::ORows aRows = [&]()
{
@@ -972,7 +969,7 @@ Reference< XResultSet > SAL_CALL
MacabDatabaseMetaData::getTables(
return tmp;
}();
pResult->setRows(aRows);
- return xRef;
+ return pResult;
}
Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedureColumns(
@@ -992,8 +989,7 @@ Reference< XResultSet > SAL_CALL
MacabDatabaseMetaData::getProcedures(
Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns(
const Any&, const OUString&, const OUString& table )
{
- ::connectivity::ODatabaseMetaDataResultSet* pResult = new
::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns);
- Reference< XResultSet > xRef = pResult;
+ rtl::Reference<::connectivity::ODatabaseMetaDataResultSet> pResult = new
::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns);
ODatabaseMetaDataResultSet::ORows aRows;
@@ -1017,7 +1013,7 @@ Reference< XResultSet > SAL_CALL
MacabDatabaseMetaData::getVersionColumns(
aRows.push_back(aRow);
}
pResult->setRows(aRows);
- return xRef;
+ return pResult;
}
Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getExportedKeys(
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx
b/connectivity/source/drivers/macab/MacabStatement.cxx
index 407c90527eef..1b7d7f5a7bff 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -32,6 +32,7 @@
#include <cppuhelper/typeprovider.hxx>
#include <connectivity/dbexception.hxx>
#include <resource/sharedresources.hxx>
+#include <rtl/ref.hxx>
#include <strings.hrc>
using namespace connectivity::macab;
@@ -397,8 +398,7 @@ Reference< XResultSet > SAL_CALL
MacabCommonStatement::executeQuery(
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
- MacabResultSet* pResult = new MacabResultSet(this);
- Reference< XResultSet > xRS = pResult;
+ rtl::Reference<MacabResultSet> pResult = new MacabResultSet(this);
OUString aErr;
m_pParseTree = m_aParser.parseTree(aErr, sql).release();
@@ -428,9 +428,9 @@ Reference< XResultSet > SAL_CALL
MacabCommonStatement::executeQuery(
pResult->setTableName(sTableName);
- setMacabFields(pResult); // SELECT which columns ?
- selectRecords(pResult); // WHERE which condition ?
- sortRecords(pResult); // ORDER BY which columns ?
+ setMacabFields(pResult.get()); // SELECT which
columns ?
+ selectRecords(pResult.get()); // WHERE which condition ?
+ sortRecords(pResult.get()); // ORDER BY which columns ?
}
// To be continued: DISTINCT
// etc...
@@ -446,7 +446,7 @@ Reference< XResultSet > SAL_CALL
MacabCommonStatement::executeQuery(
}
m_xResultSet = Reference<XResultSet>(pResult);
- return xRS;
+ return pResult;
}
Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection( )
diff --git a/connectivity/source/drivers/macab/MacabTables.cxx
b/connectivity/source/drivers/macab/MacabTables.cxx
index c70aa87f87d5..e7149d2646c1 100644
--- a/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/connectivity/source/drivers/macab/MacabTables.cxx
@@ -52,14 +52,13 @@ sdbcx::ObjectType MacabTables::createObject(const OUString&
_rName)
Reference< XRow > xRow(xResult, UNO_QUERY);
if (xResult->next()) // there can be only one table with this name
{
- MacabTable* pRet = new MacabTable(
+ xRet = new MacabTable(
this,
static_cast<MacabCatalog&>(m_rParent).getConnection(),
aName,
xRow->getString(4),
xRow->getString(5),
"");
- xRet = pRet;
}
}
::comphelper::disposeComponent(xResult);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
