From 654c5272299057681d295afb76fc984b20868c7c Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Thu, 21 Jan 2021 16:28:33 +0300 Subject: 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 Reviewed-by: Mike Kaganski --- extensions/source/propctrlr/eventhandler.cxx | 6 ++---- extensions/source/propctrlr/pcrcommon.hxx | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'extensions') diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 4ec979682aea..f20107448ccb 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -462,8 +462,7 @@ namespace pcr m_xComponent.set( _rxIntrospectee, UNO_QUERY_THROW ); m_bEventsMapInitialized = false; - EventMap aEmpty; - m_aEvents.swap( aEmpty ); + EventMap().swap(m_aEvents); m_bIsDialogElement = false; m_nGridColumnType = -1; @@ -824,8 +823,7 @@ namespace pcr void SAL_CALL EventHandler::disposing() { - EventMap aEmpty; - m_aEvents.swap( aEmpty ); + EventMap().swap(m_aEvents); m_xComponent.clear(); } diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index 4544ba244c4c..ccaa39136a15 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -58,8 +58,7 @@ namespace pcr template< class CONTAINER > void clearContainer( CONTAINER& _rContainer ) { - CONTAINER aEmpty; - _rContainer.swap( aEmpty ); + CONTAINER().swap(_rContainer); } -- cgit