diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-30 09:37:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-05 07:53:55 +0100 |
| commit | 748167da4e5a7f406d3fec93c9e61a534ec64037 (patch) | |
| tree | 31586bd0c3261a6d805e555f2ec27de656bf7363 /connectivity | |
| parent | 51ee91a3ca869be23153a235cbf33d4d20267fce (diff) | |
loplugin:useuniqueptr in OStatement_Base
Change-Id: I41bc59c7ff7d711e0fc877e843625fa54c96b6bc
Reviewed-on: https://gerrit.libreoffice.org/49183
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/file/FStatement.cxx | 5 | ||||
| -rw-r--r-- | connectivity/source/inc/file/FStatement.hxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 8c4c8bc2988e..765c7a542531 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -87,7 +87,6 @@ OStatement_Base::~OStatement_Base() { osl_atomic_increment( &m_refCount ); disposing(); - delete m_pSQLAnalyzer; } void OStatement_Base::disposeResultSet() @@ -429,7 +428,7 @@ void OStatement_Base::construct(const OUString& sql) // create the column mapping createColumnMapping(); - m_pSQLAnalyzer = new OSQLAnalyzer(m_pConnection.get()); + m_pSQLAnalyzer.reset( new OSQLAnalyzer(m_pConnection.get()) ); Reference<XIndexesSupplier> xIndexSup(xTunnel,UNO_QUERY); if(xIndexSup.is()) @@ -455,7 +454,7 @@ void OStatement_Base::initializeResultSet(OResultSet* _pResult) { GetAssignValues(); - _pResult->setSqlAnalyzer(m_pSQLAnalyzer); + _pResult->setSqlAnalyzer(m_pSQLAnalyzer.get()); _pResult->setOrderByColumns(m_aOrderbyColumnNumber); _pResult->setOrderByAscending(m_aOrderbyAscending); _pResult->setBindingRow(m_aRow); diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index fd5006c83253..bb759444fe5c 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -78,7 +78,7 @@ namespace connectivity rtl::Reference<OConnection> m_pConnection;// The owning Connection object connectivity::OSQLParseNode* m_pParseTree; - OSQLAnalyzer* m_pSQLAnalyzer; //the sql analyzer used by the resultset + std::unique_ptr<OSQLAnalyzer> m_pSQLAnalyzer; //the sql analyzer used by the resultset rtl::Reference<OFileTable> m_pTable; // the current table OValueRefRow m_aSelectRow; |