commit 1b921c2f1ba4bba7e69565fb29cb1738cea25497
author Noel Grandin <noel.grandin@collabora.co.uk> Mon Apr 10 09:42:49 2017 +0200
committer Noel Grandin <noel.grandin@collabora.co.uk> Mon Apr 10 11:51:14 2017 +0200
tree 2630279a5157c8647351ceb951ced42350d79d09
parent 91afe5519613bc64f344b5bc7e7fee982a859280

loplugin:inlinefields in OpenFileDropTargetListener

Change-Id: Ib1f7004ce57f144309d396bc71419f3d1036ff74
Reviewed-on: https://gerrit.libreoffice.org/36353
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

include/svtools/openfiledroptargetlistener.hxx

diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx
index af00e9b..88e7dbe 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,

svtools/source/misc/openfiledroptargetlistener.cxx

diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx
index df4d03b..802d326 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 )