From 1b921c2f1ba4bba7e69565fb29cb1738cea25497 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 10 Apr 2017 09:42:49 +0200 Subject: loplugin:inlinefields in OpenFileDropTargetListener Change-Id: Ib1f7004ce57f144309d396bc71419f3d1036ff74 Reviewed-on: https://gerrit.libreoffice.org/36353 Tested-by: Jenkins Reviewed-by: Noel Grandin --- svtools/source/misc/openfiledroptargetlistener.cxx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'svtools') diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx index df4d03b67474..802d326f480f 100644 --- a/svtools/source/misc/openfiledroptargetlistener.cxx +++ b/svtools/source/misc/openfiledroptargetlistener.cxx @@ -37,7 +37,6 @@ OpenFileDropTargetListener::OpenFileDropTargetListener( const css::uno::Referenc const css::uno::Reference< css::frame::XFrame >& xFrame ) : m_xContext ( xContext ) , m_xTargetFrame ( xFrame ) - , m_pFormats ( new DataFlavorExVector ) { } @@ -46,8 +45,6 @@ OpenFileDropTargetListener::~OpenFileDropTargetListener() { m_xTargetFrame.clear(); m_xContext.clear(); - delete m_pFormats; - m_pFormats = nullptr; } @@ -145,8 +142,8 @@ void OpenFileDropTargetListener::implts_BeginDrag( const css::uno::Sequence< css /* SAFE { */ SolarMutexGuard aGuard; - m_pFormats->clear(); - TransferableDataHelper::FillDataFlavorExVector(rSupportedDataFlavors,*m_pFormats); + m_aFormats.clear(); + TransferableDataHelper::FillDataFlavorExVector(rSupportedDataFlavors, m_aFormats); /* } SAFE */ } @@ -155,7 +152,7 @@ void OpenFileDropTargetListener::implts_EndDrag() /* SAFE { */ SolarMutexGuard aGuard; - m_pFormats->clear(); + m_aFormats.clear(); /* } SAFE */ } @@ -164,7 +161,7 @@ bool OpenFileDropTargetListener::implts_IsDropFormatSupported( SotClipboardForma /* SAFE { */ SolarMutexGuard aGuard; - DataFlavorExVector::iterator aIter( m_pFormats->begin() ), aEnd( m_pFormats->end() ); + DataFlavorExVector::iterator aIter( m_aFormats.begin() ), aEnd( m_aFormats.end() ); bool bRet = false; while ( aIter != aEnd ) -- cgit