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

loplugin:useuniqueptr

Browse Source 
Change-Id: I510731d7364a9fb670782a743cdefc4582e8c593
This commit is contained in:
Stephan Bergmann
2017-01-23 18:03:16 +01:00
parent a90a4810ae
commit c010fe8e5e
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
embedserv/source/inprocserv/advisesink.cxx
View File

@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <sal/config.h>
#include <o3tl/make_unique.hxx>
#if defined _MSC_VER #if defined _MSC_VER
#pragma warning(disable : 4668) #pragma warning(disable : 4668)
#endif #endif
@@ -28,7 +32,6 @@ namespace inprocserv
OleWrapperAdviseSink::OleWrapperAdviseSink() OleWrapperAdviseSink::OleWrapperAdviseSink()
: m_nRefCount( 0 ) : m_nRefCount( 0 )
, m_pFormatEtc( nullptr )
, m_nAspect( DVASPECT_CONTENT ) , m_nAspect( DVASPECT_CONTENT )
, m_nRegID( 0 ) , m_nRegID( 0 )
, m_bObjectAdvise( TRUE ) , m_bObjectAdvise( TRUE )
@@ -42,7 +45,6 @@ OleWrapperAdviseSink::OleWrapperAdviseSink()
OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pListener ) OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pListener )
: m_nRefCount( 0 ) : m_nRefCount( 0 )
, m_pListener( pListener ) , m_pListener( pListener )
, m_pFormatEtc( nullptr )
, m_nAspect( DVASPECT_CONTENT ) , m_nAspect( DVASPECT_CONTENT )
, m_nRegID( 0 ) , m_nRegID( 0 )
, m_bObjectAdvise( TRUE ) , m_bObjectAdvise( TRUE )
@@ -56,7 +58,6 @@ OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pList
OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pListener, FORMATETC* pFormatEtc, DWORD nDataRegFlag ) OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pListener, FORMATETC* pFormatEtc, DWORD nDataRegFlag )
: m_nRefCount( 0 ) : m_nRefCount( 0 )
, m_pListener( pListener ) , m_pListener( pListener )
, m_pFormatEtc( nullptr )
, m_nAspect( DVASPECT_CONTENT ) , m_nAspect( DVASPECT_CONTENT )
, m_nRegID( 0 ) , m_nRegID( 0 )
, m_bObjectAdvise( FALSE ) , m_bObjectAdvise( FALSE )
@@ -67,7 +68,7 @@ OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pList
{ {
if ( pFormatEtc ) if ( pFormatEtc )
{ {
m_pFormatEtc = new FORMATETC; m_pFormatEtc = o3tl::make_unique<FORMATETC>();
m_pFormatEtc->cfFormat = pFormatEtc->cfFormat; m_pFormatEtc->cfFormat = pFormatEtc->cfFormat;
m_pFormatEtc->ptd = nullptr; m_pFormatEtc->ptd = nullptr;
m_pFormatEtc->dwAspect = pFormatEtc->dwAspect; m_pFormatEtc->dwAspect = pFormatEtc->dwAspect;
@@ -79,7 +80,6 @@ OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pList
OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pListener, DWORD nAspect, DWORD nViewRegFlag ) OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pListener, DWORD nAspect, DWORD nViewRegFlag )
: m_nRefCount( 0 ) : m_nRefCount( 0 )
, m_pListener( pListener ) , m_pListener( pListener )
, m_pFormatEtc( nullptr )
, m_nAspect( nAspect ) , m_nAspect( nAspect )
, m_nRegID( 0 ) , m_nRegID( 0 )
, m_bObjectAdvise( TRUE ) , m_bObjectAdvise( TRUE )
@@ -91,9 +91,7 @@ OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pList
} }
OleWrapperAdviseSink::~OleWrapperAdviseSink() OleWrapperAdviseSink::~OleWrapperAdviseSink()
{ {}
delete m_pFormatEtc;
}
STDMETHODIMP OleWrapperAdviseSink::QueryInterface( REFIID riid , void** ppv ) STDMETHODIMP OleWrapperAdviseSink::QueryInterface( REFIID riid , void** ppv )
{ {

8
embedserv/source/inprocserv/advisesink.hxx
View File

@@ -20,6 +20,10 @@
#ifndef INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_ADVISESINK_HXX #ifndef INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_ADVISESINK_HXX
#define INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_ADVISESINK_HXX #define INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_ADVISESINK_HXX
#include <sal/config.h>
#include <memory>
#include <windows.h> #include <windows.h>
#include "smartpointer.hxx" #include "smartpointer.hxx"
@@ -33,7 +37,7 @@ protected:
ComSmart< IAdviseSink > m_pListener; ComSmart< IAdviseSink > m_pListener;
DWORD m_nListenerID; DWORD m_nListenerID;
FORMATETC* m_pFormatEtc; std::unique_ptr<FORMATETC> m_pFormatEtc;
DWORD m_nAspect; DWORD m_nAspect;
DWORD m_nRegID; DWORD m_nRegID;
@@ -66,7 +70,7 @@ public:
DWORD GetDataAdviseFlag() { return m_nDataRegFlag; } DWORD GetDataAdviseFlag() { return m_nDataRegFlag; }
DWORD GetViewAdviseFlag() { return m_nViewRegFlag; } DWORD GetViewAdviseFlag() { return m_nViewRegFlag; }
FORMATETC* GetFormatEtc() { return m_pFormatEtc; } FORMATETC* GetFormatEtc() { return m_pFormatEtc.get(); }
DWORD GetAspect() { return m_nAspect; } DWORD GetAspect() { return m_nAspect; }
ComSmart< IAdviseSink >& GetOrigAdvise() { return m_pListener; } ComSmart< IAdviseSink >& GetOrigAdvise() { return m_pListener; }
void DisconnectOrigAdvise() { m_pListener = nullptr; } void DisconnectOrigAdvise() { m_pListener = nullptr; }