diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-24 15:12:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-29 18:22:01 +0200 |
| commit | 9a2f5100711232da048f82c80f65913be32ba831 (patch) | |
| tree | 1308b5aed5fbbb1c82df019bbf0e72b48a957362 /svtools | |
| parent | d72a115231879b1d56195b48ae021265c0654805 (diff) | |
loplugin:useuniqueptr in TableControl_Impl
Change-Id: Ida89f2a72395e0a07d57100fda10fa0f739d9eef
Reviewed-on: https://gerrit.libreoffice.org/53602
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/table/tablecontrol_impl.cxx | 9 | ||||
| -rw-r--r-- | svtools/source/table/tablecontrol_impl.hxx | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 8c493e12c787..99428e8b1317 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -230,14 +230,13 @@ namespace svt { namespace table ,m_pVScroll ( nullptr ) ,m_pHScroll ( nullptr ) ,m_pScrollCorner ( nullptr ) - ,m_pSelEngine ( ) ,m_aSelectedRows ( ) ,m_pTableFunctionSet ( new TableFunctionSet( this ) ) ,m_nAnchor ( -1 ) ,m_bUpdatingColWidths ( false ) ,m_pAccessibleTable ( nullptr ) { - m_pSelEngine = new SelectionEngine( m_pDataWindow.get(), m_pTableFunctionSet ); + m_pSelEngine.reset( new SelectionEngine( m_pDataWindow.get(), m_pTableFunctionSet.get() ) ); m_pSelEngine->SetSelectionMode(SelectionMode::Single); m_pDataWindow->SetPosPixel( Point( 0, 0 ) ); m_pDataWindow->Show(); @@ -249,8 +248,8 @@ namespace svt { namespace table m_pHScroll.disposeAndClear(); m_pScrollCorner.disposeAndClear(); m_pDataWindow.disposeAndClear(); - DELETEZ( m_pTableFunctionSet ); - DELETEZ( m_pSelEngine ); + m_pTableFunctionSet.reset(); + m_pSelEngine.reset(); } void TableControl_Impl::setModel( const PTableModel& _pModel ) @@ -2147,7 +2146,7 @@ namespace svt { namespace table SelectionEngine* TableControl_Impl::getSelEngine() { - return m_pSelEngine; + return m_pSelEngine.get(); } bool TableControl_Impl::isRowSelected( RowPos i_row ) const diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index a679bf646b46..51050748176c 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -121,11 +121,11 @@ namespace svt { namespace table VclPtr<ScrollBar> m_pHScroll; VclPtr<ScrollBarBox> m_pScrollCorner; //selection engine - for determining selection range, e.g. single, multiple - SelectionEngine* m_pSelEngine; + std::unique_ptr<SelectionEngine> m_pSelEngine; //vector which contains the selected rows std::vector<RowPos> m_aSelectedRows; //part of selection engine - TableFunctionSet* m_pTableFunctionSet; + std::unique_ptr<TableFunctionSet> m_pTableFunctionSet; //part of selection engine RowPos m_nAnchor; bool m_bUpdatingColWidths; |