diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-14 16:56:18 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-16 14:19:18 +0000 |
| commit | 3b658759c945a5e2da7b2c6acfdecc9c3d9c6a34 (patch) | |
| tree | ed79ef1d1dd3683e371b02d0b402aa45f654590a /embedserv/source/inprocserv/advisesink.cxx | |
| parent | d11ac6045926d4c6e392b3797939fbb7c7d37b27 (diff) | |
clang-cl loplugin: embedserv
Change-Id: I9901dac882a74453015881ded2355ff0a51b50d5
Reviewed-on: https://gerrit.libreoffice.org/29868
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'embedserv/source/inprocserv/advisesink.cxx')
| -rw-r--r-- | embedserv/source/inprocserv/advisesink.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/embedserv/source/inprocserv/advisesink.cxx b/embedserv/source/inprocserv/advisesink.cxx index eb6488c91c58..e036e30850b3 100644 --- a/embedserv/source/inprocserv/advisesink.cxx +++ b/embedserv/source/inprocserv/advisesink.cxx @@ -28,7 +28,7 @@ namespace inprocserv OleWrapperAdviseSink::OleWrapperAdviseSink() : m_nRefCount( 0 ) -, m_pFormatEtc( NULL ) +, m_pFormatEtc( nullptr ) , m_nAspect( DVASPECT_CONTENT ) , m_nRegID( 0 ) , m_bObjectAdvise( TRUE ) @@ -42,7 +42,7 @@ OleWrapperAdviseSink::OleWrapperAdviseSink() OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pListener ) : m_nRefCount( 0 ) , m_pListener( pListener ) -, m_pFormatEtc( NULL ) +, m_pFormatEtc( nullptr ) , m_nAspect( DVASPECT_CONTENT ) , m_nRegID( 0 ) , m_bObjectAdvise( TRUE ) @@ -56,7 +56,7 @@ OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pList OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pListener, FORMATETC* pFormatEtc, DWORD nDataRegFlag ) : m_nRefCount( 0 ) , m_pListener( pListener ) -, m_pFormatEtc( NULL ) +, m_pFormatEtc( nullptr ) , m_nAspect( DVASPECT_CONTENT ) , m_nRegID( 0 ) , m_bObjectAdvise( FALSE ) @@ -69,7 +69,7 @@ OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pList { m_pFormatEtc = new FORMATETC; m_pFormatEtc->cfFormat = pFormatEtc->cfFormat; - m_pFormatEtc->ptd = NULL; + m_pFormatEtc->ptd = nullptr; m_pFormatEtc->dwAspect = pFormatEtc->dwAspect; m_pFormatEtc->lindex = pFormatEtc->lindex; m_pFormatEtc->tymed = pFormatEtc->tymed; @@ -79,7 +79,7 @@ OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pList OleWrapperAdviseSink::OleWrapperAdviseSink( const ComSmart< IAdviseSink >& pListener, DWORD nAspect, DWORD nViewRegFlag ) : m_nRefCount( 0 ) , m_pListener( pListener ) -, m_pFormatEtc( NULL ) +, m_pFormatEtc( nullptr ) , m_nAspect( nAspect ) , m_nRegID( 0 ) , m_bObjectAdvise( TRUE ) @@ -97,17 +97,17 @@ OleWrapperAdviseSink::~OleWrapperAdviseSink() STDMETHODIMP OleWrapperAdviseSink::QueryInterface( REFIID riid , void** ppv ) { - *ppv=NULL; + *ppv=nullptr; if ( riid == IID_IUnknown ) - *ppv = (IUnknown*)this; + *ppv = static_cast<IUnknown*>(this); if ( riid == IID_IAdviseSink ) - *ppv = (IAdviseSink*)this; + *ppv = static_cast<IAdviseSink*>(this); - if ( *ppv != NULL ) + if ( *ppv != nullptr ) { - ((IUnknown*)*ppv)->AddRef(); + static_cast<IUnknown*>(*ppv)->AddRef(); return S_OK; } |