From 06e2159f3448e9ce00fd521aadd32075ae93f376 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 20 Aug 2018 14:01:23 +0200 Subject: loplugin:useuniqueptr in PropertyChangeNotifier Change-Id: Ibfbee5d4c9378778ee4a8d70ee1501444f071003 Reviewed-on: https://gerrit.libreoffice.org/59360 Tested-by: Jenkins Reviewed-by: Noel Grandin --- ucb/source/ucp/file/bc.cxx | 5 ++--- ucb/source/ucp/file/filnot.cxx | 4 ++-- ucb/source/ucp/file/filnot.hxx | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'ucb') diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index b457bc87140f..f42cdf84fd76 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -1260,7 +1260,7 @@ BaseContent::cPCL() if( length ) { - ListenerMap* listener = new ListenerMap; + std::unique_ptr listener(new ListenerMap); for( sal_Int32 i = 0; i < length; ++i ) { cppu::OInterfaceContainerHelper* pContainer = m_pPropertyListener->getContainer(seqNames[i]); @@ -1269,8 +1269,7 @@ BaseContent::cPCL() (*listener)[seqNames[i]] = pContainer->getElements(); } - p.reset( new PropertyChangeNotifier( this, - listener ) ); + p.reset( new PropertyChangeNotifier( this, std::move(listener) ) ); } return p; diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx index de5168617d19..c63dae89dcf6 100644 --- a/ucb/source/ucp/file/filnot.cxx +++ b/ucb/source/ucp/file/filnot.cxx @@ -197,9 +197,9 @@ PropertySetInfoChangeNotifier::notifyPropertyRemoved( const OUString & aProperty PropertyChangeNotifier::PropertyChangeNotifier( const css::uno::Reference< XContent >& xCreatorContent, - ListenerMap* pListeners ) + std::unique_ptr pListeners ) : m_xCreatorContent( xCreatorContent ), - m_pListeners( pListeners ) + m_pListeners( std::move(pListeners) ) { } diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx index daf69d662ada..98f0b8983f0b 100644 --- a/ucb/source/ucp/file/filnot.hxx +++ b/ucb/source/ucp/file/filnot.hxx @@ -88,7 +88,7 @@ namespace fileaccess { public: PropertyChangeNotifier( const css::uno::Reference< css::ucb::XContent >& xCreatorContent, - ListenerMap* pListeners ); + std::unique_ptr pListeners ); ~PropertyChangeNotifier(); -- cgit