mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:inlinefields in OpenFileDropTargetListener

Browse Source 
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>
This commit is contained in:
Noel Grandin
2017-04-10 09:42:49 +02:00
parent 91afe55196
commit 1b921c2f1b
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/svtools/openfiledroptargetlistener.hxx
View File

@@ -45,7 +45,7 @@ class SVT_DLLPUBLIC OpenFileDropTargetListener : public cppu::WeakImplHelper< cs
css::uno::WeakReference< css::frame::XFrame > m_xTargetFrame; css::uno::WeakReference< css::frame::XFrame > m_xTargetFrame;
/// drag/drop info /// drag/drop info
DataFlavorExVector* m_pFormats; DataFlavorExVector m_aFormats;
public: public:
OpenFileDropTargetListener( const css::uno::Reference< css::uno::XComponentContext >& xContext, OpenFileDropTargetListener( const css::uno::Reference< css::uno::XComponentContext >& xContext,

11
svtools/source/misc/openfiledroptargetlistener.cxx
View File

@@ -37,7 +37,6 @@ OpenFileDropTargetListener::OpenFileDropTargetListener( const css::uno::Referenc
const css::uno::Reference< css::frame::XFrame >& xFrame ) const css::uno::Reference< css::frame::XFrame >& xFrame )
: m_xContext ( xContext ) : m_xContext ( xContext )
, m_xTargetFrame ( xFrame ) , m_xTargetFrame ( xFrame )
, m_pFormats ( new DataFlavorExVector )
{ {
} }
@@ -46,8 +45,6 @@ OpenFileDropTargetListener::~OpenFileDropTargetListener()
{ {
m_xTargetFrame.clear(); m_xTargetFrame.clear();
m_xContext.clear(); m_xContext.clear();
delete m_pFormats;
m_pFormats = nullptr;
} }
@@ -145,8 +142,8 @@ void OpenFileDropTargetListener::implts_BeginDrag( const css::uno::Sequence< css
/* SAFE { */ /* SAFE { */
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
m_pFormats->clear(); m_aFormats.clear();
TransferableDataHelper::FillDataFlavorExVector(rSupportedDataFlavors,*m_pFormats); TransferableDataHelper::FillDataFlavorExVector(rSupportedDataFlavors, m_aFormats);
/* } SAFE */ /* } SAFE */
} }
@@ -155,7 +152,7 @@ void OpenFileDropTargetListener::implts_EndDrag()
/* SAFE { */ /* SAFE { */
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
m_pFormats->clear(); m_aFormats.clear();
/* } SAFE */ /* } SAFE */
} }
@@ -164,7 +161,7 @@ bool OpenFileDropTargetListener::implts_IsDropFormatSupported( SotClipboardForma
/* SAFE { */ /* SAFE { */
SolarMutexGuard aGuard; 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; bool bRet = false;
while ( aIter != aEnd ) while ( aIter != aEnd )