include/svtools/openfiledroptargetlistener.hxx | 2 +- svtools/source/misc/openfiledroptargetlistener.cxx | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-)
New commits: commit 1b921c2f1ba4bba7e69565fb29cb1738cea25497 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Mon Apr 10 09:42:49 2017 +0200 loplugin:inlinefields in OpenFileDropTargetListener Change-Id: Ib1f7004ce57f144309d396bc71419f3d1036ff74 Reviewed-on: https://gerrit.libreoffice.org/36353 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx index af00e9bc769c..88e7dbe4da71 100644 --- a/include/svtools/openfiledroptargetlistener.hxx +++ b/include/svtools/openfiledroptargetlistener.hxx @@ -45,7 +45,7 @@ class SVT_DLLPUBLIC OpenFileDropTargetListener : public cppu::WeakImplHelper< cs css::uno::WeakReference< css::frame::XFrame > m_xTargetFrame; /// drag/drop info - DataFlavorExVector* m_pFormats; + DataFlavorExVector m_aFormats; public: OpenFileDropTargetListener( const css::uno::Reference< css::uno::XComponentContext >& xContext, 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 ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits