loplugin:useuniqueptr in OQueryDescriptor_Base

Change-Id: I9cea18df52bc0a35f94c2a42dfbe3edb61e1e8c0
Reviewed-on: https://gerrit.libreoffice.org/50699Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

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

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(  )

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();