[Libreoffice-commits] core.git: connectivity/source
Noel (via logerrit)
logerrit at kemper.freedesktop.org
Fri Feb 26 06:37:47 UTC 2021
connectivity/source/drivers/component/CPreparedStatement.cxx | 2 +-
connectivity/source/drivers/component/CStatement.cxx | 2 +-
connectivity/source/drivers/dbase/DPreparedStatement.cxx | 2 +-
connectivity/source/drivers/dbase/DStatement.cxx | 2 +-
connectivity/source/drivers/file/FPreparedStatement.cxx | 2 +-
connectivity/source/drivers/file/FStatement.cxx | 6 +++---
connectivity/source/drivers/flat/EPreparedStatement.cxx | 2 +-
connectivity/source/drivers/flat/EStatement.cxx | 2 +-
connectivity/source/inc/component/CPreparedStatement.hxx | 2 +-
connectivity/source/inc/component/CStatement.hxx | 2 +-
connectivity/source/inc/dbase/DPreparedStatement.hxx | 2 +-
connectivity/source/inc/dbase/DStatement.hxx | 2 +-
connectivity/source/inc/file/FPreparedStatement.hxx | 2 +-
connectivity/source/inc/file/FStatement.hxx | 4 ++--
connectivity/source/inc/flat/EPreparedStatement.hxx | 2 +-
connectivity/source/inc/flat/EStatement.hxx | 2 +-
16 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 5170614a3160dceba63478291a00bbde9d37729f
Author: Noel <noel.grandin at collabora.co.uk>
AuthorDate: Thu Feb 25 14:48:36 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Feb 26 07:37:05 2021 +0100
loplugin:refcounting in connectivity
Change-Id: Iee324d84334f60a13615a4d422d480c9c597fdbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111539
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/connectivity/source/drivers/component/CPreparedStatement.cxx b/connectivity/source/drivers/component/CPreparedStatement.cxx
index bc3af3e8c9b8..7c5c8e07f891 100644
--- a/connectivity/source/drivers/component/CPreparedStatement.cxx
+++ b/connectivity/source/drivers/component/CPreparedStatement.cxx
@@ -24,7 +24,7 @@ using namespace connectivity::component;
using namespace connectivity::file;
using namespace com::sun::star::uno;
-OResultSet* OComponentPreparedStatement::createResultSet()
+rtl::Reference<OResultSet> OComponentPreparedStatement::createResultSet()
{
return new connectivity::component::OComponentResultSet(this,m_aSQLIterator);
}
diff --git a/connectivity/source/drivers/component/CStatement.cxx b/connectivity/source/drivers/component/CStatement.cxx
index 8a1a2fa92287..f3bd03e8b276 100644
--- a/connectivity/source/drivers/component/CStatement.cxx
+++ b/connectivity/source/drivers/component/CStatement.cxx
@@ -24,7 +24,7 @@ using namespace connectivity::component;
using namespace connectivity::file;
using namespace com::sun::star::uno;
-OResultSet* OComponentStatement::createResultSet()
+rtl::Reference<OResultSet> OComponentStatement::createResultSet()
{
return new connectivity::component::OComponentResultSet(this, m_aSQLIterator);
}
diff --git a/connectivity/source/drivers/dbase/DPreparedStatement.cxx b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
index 852c98acf509..9a2b54409bea 100644
--- a/connectivity/source/drivers/dbase/DPreparedStatement.cxx
+++ b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
@@ -24,7 +24,7 @@ using namespace connectivity::dbase;
using namespace connectivity::file;
using namespace com::sun::star::uno;
-OResultSet* ODbasePreparedStatement::createResultSet()
+rtl::Reference<OResultSet> ODbasePreparedStatement::createResultSet()
{
return new ODbaseResultSet(this, m_aSQLIterator);
}
diff --git a/connectivity/source/drivers/dbase/DStatement.cxx b/connectivity/source/drivers/dbase/DStatement.cxx
index 096878e3e245..d2537232778e 100644
--- a/connectivity/source/drivers/dbase/DStatement.cxx
+++ b/connectivity/source/drivers/dbase/DStatement.cxx
@@ -25,7 +25,7 @@ using namespace connectivity::file;
using namespace com::sun::star::uno;
-OResultSet* ODbaseStatement::createResultSet()
+rtl::Reference<OResultSet> ODbaseStatement::createResultSet()
{
return new ODbaseResultSet(this,m_aSQLIterator);
}
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 4550f2053e80..6441534e66c9 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -363,7 +363,7 @@ void SAL_CALL OPreparedStatement::clearParameters( )
m_aParameterRow->push_back(new ORowSetValueDecorator(sal_Int32(0)) );
}
-OResultSet* OPreparedStatement::createResultSet()
+rtl::Reference<OResultSet> OPreparedStatement::createResultSet()
{
return new OResultSet(this,m_aSQLIterator);
}
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index a78f7a096955..6c9367c83a78 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -216,7 +216,7 @@ void SAL_CALL OStatement_Base::clearWarnings( )
return *getArrayHelper();
}
-OResultSet* OStatement::createResultSet()
+rtl::Reference<OResultSet> OStatement::createResultSet()
{
return new OResultSet(this,m_aSQLIterator);
}
@@ -251,9 +251,9 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql )
construct(sql);
Reference< XResultSet > xRS;
- OResultSet* pResult = createResultSet();
+ rtl::Reference<OResultSet> pResult = createResultSet();
xRS = pResult;
- initializeResultSet(pResult);
+ initializeResultSet(pResult.get());
m_xResultSet = xRS;
pResult->OpenImpl();
diff --git a/connectivity/source/drivers/flat/EPreparedStatement.cxx b/connectivity/source/drivers/flat/EPreparedStatement.cxx
index bcd6bc6ecc11..f4095ac2c087 100644
--- a/connectivity/source/drivers/flat/EPreparedStatement.cxx
+++ b/connectivity/source/drivers/flat/EPreparedStatement.cxx
@@ -24,7 +24,7 @@ using namespace connectivity::flat;
using namespace connectivity::file;
using namespace ::com::sun::star::uno;
-OResultSet* OFlatPreparedStatement::createResultSet()
+rtl::Reference<OResultSet> OFlatPreparedStatement::createResultSet()
{
return new OFlatResultSet(this, m_aSQLIterator);
}
diff --git a/connectivity/source/drivers/flat/EStatement.cxx b/connectivity/source/drivers/flat/EStatement.cxx
index 7774639052b3..dc801ac48653 100644
--- a/connectivity/source/drivers/flat/EStatement.cxx
+++ b/connectivity/source/drivers/flat/EStatement.cxx
@@ -24,7 +24,7 @@ using namespace connectivity::flat;
using namespace connectivity::file;
using namespace css::uno;
-OResultSet* OFlatStatement::createResultSet()
+rtl::Reference<OResultSet> OFlatStatement::createResultSet()
{
return new OFlatResultSet(this,m_aSQLIterator);
}
diff --git a/connectivity/source/inc/component/CPreparedStatement.hxx b/connectivity/source/inc/component/CPreparedStatement.hxx
index cd104abd68cd..a7d8b0fb78ac 100644
--- a/connectivity/source/inc/component/CPreparedStatement.hxx
+++ b/connectivity/source/inc/component/CPreparedStatement.hxx
@@ -29,7 +29,7 @@ namespace connectivity::component
class OOO_DLLPUBLIC_FILE OComponentPreparedStatement : public file::OPreparedStatement
{
protected:
- virtual file::OResultSet* createResultSet() override;
+ virtual rtl::Reference<file::OResultSet> createResultSet() override;
public:
OComponentPreparedStatement( file::OConnection* _pConnection) : file::OPreparedStatement( _pConnection){}
DECLARE_SERVICE_INFO();
diff --git a/connectivity/source/inc/component/CStatement.hxx b/connectivity/source/inc/component/CStatement.hxx
index dd6bea02d0e1..8e2bd15f3648 100644
--- a/connectivity/source/inc/component/CStatement.hxx
+++ b/connectivity/source/inc/component/CStatement.hxx
@@ -29,7 +29,7 @@ namespace connectivity::component
class OOO_DLLPUBLIC_FILE OComponentStatement : public file::OStatement
{
protected:
- virtual file::OResultSet* createResultSet() override;
+ virtual rtl::Reference<file::OResultSet> createResultSet() override;
public:
OComponentStatement( file::OConnection* _pConnection) : file::OStatement( _pConnection){}
DECLARE_SERVICE_INFO();
diff --git a/connectivity/source/inc/dbase/DPreparedStatement.hxx b/connectivity/source/inc/dbase/DPreparedStatement.hxx
index 7ffa1bfa091e..067f313601f3 100644
--- a/connectivity/source/inc/dbase/DPreparedStatement.hxx
+++ b/connectivity/source/inc/dbase/DPreparedStatement.hxx
@@ -28,7 +28,7 @@ namespace connectivity::dbase
class ODbasePreparedStatement : public file::OPreparedStatement
{
protected:
- virtual file::OResultSet* createResultSet() override;
+ virtual rtl::Reference<file::OResultSet> createResultSet() override;
public:
ODbasePreparedStatement( file::OConnection* _pConnection) : file::OPreparedStatement( _pConnection){}
DECLARE_SERVICE_INFO();
diff --git a/connectivity/source/inc/dbase/DStatement.hxx b/connectivity/source/inc/dbase/DStatement.hxx
index defcf1c769a6..2e3820389f47 100644
--- a/connectivity/source/inc/dbase/DStatement.hxx
+++ b/connectivity/source/inc/dbase/DStatement.hxx
@@ -28,7 +28,7 @@ namespace connectivity::dbase
class ODbaseStatement : public file::OStatement
{
protected:
- virtual file::OResultSet* createResultSet() override;
+ virtual rtl::Reference<file::OResultSet> createResultSet() override;
public:
ODbaseStatement( file::OConnection* _pConnection) : file::OStatement( _pConnection){}
DECLARE_SERVICE_INFO();
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index d8e86a3f49cf..973b8ecb3a84 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -48,7 +48,7 @@ namespace connectivity::file
::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; // the parameter columns
// factory method for resultset's
- virtual OResultSet* createResultSet() override;
+ virtual rtl::Reference<OResultSet> createResultSet() override;
::rtl::Reference< OResultSet > makeResultSet();
void initResultSet(OResultSet*);
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 93063d460794..f4b6687dfc02 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -117,7 +117,7 @@ namespace connectivity::file
virtual void parseParamterElem(const OUString& _sColumnName,OSQLParseNode* pRow_Value_Constructor_Elem);
// factory method for resultset's
- virtual OResultSet* createResultSet() = 0;
+ virtual rtl::Reference<OResultSet> createResultSet() = 0;
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override;
// OPropertySetHelper
@@ -175,7 +175,7 @@ namespace connectivity::file
{
protected:
// factory method for resultset's
- virtual OResultSet* createResultSet() override;
+ virtual rtl::Reference<OResultSet> createResultSet() override;
public:
// a Constructor, that is needed for when Returning the Object is needed:
OStatement( OConnection* _pConnection) : OStatement_BASE2( _pConnection){}
diff --git a/connectivity/source/inc/flat/EPreparedStatement.hxx b/connectivity/source/inc/flat/EPreparedStatement.hxx
index 216051d168a9..bb2bf4ad1749 100644
--- a/connectivity/source/inc/flat/EPreparedStatement.hxx
+++ b/connectivity/source/inc/flat/EPreparedStatement.hxx
@@ -28,7 +28,7 @@ namespace connectivity::flat
class OFlatPreparedStatement : public file::OPreparedStatement
{
protected:
- virtual file::OResultSet* createResultSet() override;
+ virtual rtl::Reference<file::OResultSet> createResultSet() override;
public:
OFlatPreparedStatement( file::OConnection* _pConnection) : file::OPreparedStatement( _pConnection){}
DECLARE_SERVICE_INFO();
diff --git a/connectivity/source/inc/flat/EStatement.hxx b/connectivity/source/inc/flat/EStatement.hxx
index add447e5dabc..def70f681be9 100644
--- a/connectivity/source/inc/flat/EStatement.hxx
+++ b/connectivity/source/inc/flat/EStatement.hxx
@@ -28,7 +28,7 @@ namespace connectivity::flat
class OFlatStatement : public file::OStatement
{
protected:
- virtual file::OResultSet* createResultSet() override;
+ virtual rtl::Reference<file::OResultSet> createResultSet() override;
public:
OFlatStatement( file::OConnection* _pConnection) : file::OStatement( _pConnection){}
DECLARE_SERVICE_INFO();
More information about the Libreoffice-commits
mailing list