diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-28 16:03:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-05 07:29:27 +0100 |
| commit | f77302d76a5132a4b0f1dfb580111d829dd5415d (patch) | |
| tree | 20f5260b4057ff82bf101a838b5194e973290095 /dbaccess | |
| parent | 4b44ab2fdf0d71428bdec3ca4090e7968851b24d (diff) | |
loplugin:useuniqueptr in OQueryDescriptor_Base
Change-Id: I9cea18df52bc0a35f94c2a42dfbe3edb61e1e8c0
Reviewed-on: https://gerrit.libreoffice.org/50699
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/api/query.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/core/api/querydescriptor.cxx | 8 | ||||
| -rw-r--r-- | dbaccess/source/core/api/querydescriptor.hxx | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index d1ade9cc26d5..d5234c7929dd 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -130,7 +130,7 @@ void OQuery::rebuildColumns() { xColumnDefinitions = xColSup->getColumns(); if ( xColumnDefinitions.is() ) - m_pColumnMediator = new OContainerMediator( m_pColumns, xColumnDefinitions ); + m_pColumnMediator = new OContainerMediator( m_pColumns.get(), xColumnDefinitions ); } // fill the columns with columns from the statement diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index 6ec94bfd291b..84b4ae657bfa 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -120,14 +120,14 @@ OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWea :m_bColumnsOutOfDate(true) ,m_rMutex(_rMutex) { - m_pColumns = new OColumns(_rMySelf, m_rMutex, true,std::vector< OUString>(), this,this); + m_pColumns.reset( new OColumns(_rMySelf, m_rMutex, true,std::vector< OUString>(), this,this) ); } OQueryDescriptor_Base::OQueryDescriptor_Base(const OQueryDescriptor_Base& _rSource,::cppu::OWeakObject& _rMySelf) :m_bColumnsOutOfDate(true) ,m_rMutex(_rSource.m_rMutex) { - m_pColumns = new OColumns(_rMySelf, m_rMutex, true,std::vector< OUString>(), this,this); + m_pColumns.reset( new OColumns(_rMySelf, m_rMutex, true,std::vector< OUString>(), this,this) ); m_sCommand = _rSource.m_sCommand; m_bEscapeProcessing = _rSource.m_bEscapeProcessing; @@ -141,8 +141,6 @@ OQueryDescriptor_Base::~OQueryDescriptor_Base() { m_pColumns->acquire(); m_pColumns->disposing(); - delete m_pColumns; - } sal_Int64 SAL_CALL OQueryDescriptor_Base::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) @@ -204,7 +202,7 @@ Reference< XNameAccess > SAL_CALL OQueryDescriptor_Base::getColumns( ) } } - return m_pColumns; + return m_pColumns.get(); } OUString SAL_CALL OQueryDescriptor_Base::getImplementationName( ) diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx index 479e15d43105..0d2f9fe1da80 100644 --- a/dbaccess/source/core/api/querydescriptor.hxx +++ b/dbaccess/source/core/api/querydescriptor.hxx @@ -55,7 +55,7 @@ private: ::osl::Mutex& m_rMutex; protected: - OColumns* m_pColumns; // our column descriptions + std::unique_ptr<OColumns> m_pColumns; // our column descriptions OUString m_sElementName; virtual ~OQueryDescriptor_Base(); |