diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-01-21 16:28:33 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-01-24 08:36:24 +0100 |
| commit | 654c5272299057681d295afb76fc984b20868c7c (patch) | |
| tree | 3deb7bb0b8b787f90ae5b95b59f41d9debcbc8ba /toolkit/source | |
| parent | b35f6971561bc095965e82f230e0307f6694228b (diff) | |
Use ContainerType().swap and avoid local variables
Change-Id: I773555180758a97aff37f9bc27de83c355d71521
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109761
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'toolkit/source')
4 files changed, 5 insertions, 12 deletions
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index 8b97158d0df0..3d65945cede3 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -369,8 +369,7 @@ private: m_aColumns.erase( m_aColumns.begin() ); } - Columns aEmpty; - m_aColumns.swap( aEmpty ); + Columns().swap(m_aColumns); } diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index c700ad79b344..f6c1beb9f14a 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -466,12 +466,8 @@ private: rBHelper.aLC.disposeAndClear( aEvent ); ::osl::MutexGuard aGuard( m_aMutex ); - GridData aEmptyData; - m_aData.swap( aEmptyData ); - - ::std::vector< Any > aEmptyRowHeaders; - m_aRowHeaders.swap( aEmptyRowHeaders ); - + GridData().swap(m_aData); + std::vector<Any>().swap(m_aRowHeaders); m_nColumnCount = 0; } diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index ffbb6528dc62..ffd9b0f9067b 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -213,8 +213,7 @@ public: template< class STLCONTAINER > void lcl_clear( STLCONTAINER& i_container ) { - STLCONTAINER empty; - empty.swap( i_container ); + STLCONTAINER().swap(i_container); } SortableGridDataModel::SortableGridDataModel( Reference< XComponentContext > const & rxContext ) diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index fde094051708..0a7457239c43 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -2026,8 +2026,7 @@ struct UnoControlListBoxModel_Data void removeAllItems() { - ::std::vector< ListItem > aEmpty; - m_aListItems.swap( aEmpty ); + std::vector<ListItem>().swap(m_aListItems); } public: |