diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-14 16:55:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-16 14:19:16 +0000 |
| commit | d11ac6045926d4c6e392b3797939fbb7c7d37b27 (patch) | |
| tree | b6b99803b11f8f9d84bba39ee2d38430c4f59c69 /extensions/source/activex/SODispatchInterceptor.cxx | |
| parent | 099ef29c47970d4b9d20f31d0ccbef93c492226b (diff) | |
clang-cl loplugin: extensions
Change-Id: I659d8a3b098c7417235006c86ea60e7fe1e56a44
Reviewed-on: https://gerrit.libreoffice.org/29867
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'extensions/source/activex/SODispatchInterceptor.cxx')
| -rw-r--r-- | extensions/source/activex/SODispatchInterceptor.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx index fda4d06d3850..8f90d4fb7f91 100644 --- a/extensions/source/activex/SODispatchInterceptor.cxx +++ b/extensions/source/activex/SODispatchInterceptor.cxx @@ -90,7 +90,7 @@ STDMETHODIMP SODispatchInterceptor::queryDispatch( IDispatch FAR* aURL, { if( !m_xSlave ) { - *retVal = NULL; + *retVal = nullptr; return S_OK; } @@ -101,9 +101,9 @@ STDMETHODIMP SODispatchInterceptor::queryDispatch( IDispatch FAR* aURL, aArgs[2] = CComVariant( aURL ); hr = ExecuteFunc( m_xSlave, L"queryDispatch", aArgs, 3, &aResult ); - if( !SUCCEEDED( hr ) || aResult.vt != VT_DISPATCH || aResult.pdispVal == NULL ) + if( !SUCCEEDED( hr ) || aResult.vt != VT_DISPATCH || aResult.pdispVal == nullptr ) { - *retVal = NULL; + *retVal = nullptr; return S_OK; } @@ -143,7 +143,7 @@ STDMETHODIMP SODispatchInterceptor::queryDispatches( SAFEARRAY FAR* aDescripts, CComVariant pValues[3]; hr = GetPropertiesFromIDisp( pElem, pMemberNames, pValues, 3 ); if( !SUCCEEDED( hr ) ) return hr; - if( pValues[0].vt != VT_DISPATCH || pValues[0].pdispVal == NULL + if( pValues[0].vt != VT_DISPATCH || pValues[0].pdispVal == nullptr || pValues[1].vt != VT_BSTR || pValues[2].vt != VT_I4 ) return E_FAIL; @@ -164,7 +164,7 @@ STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR CComVariant pValue; HRESULT hr = GetPropertiesFromIDisp( aURL, &pUrlName, &pValue, 1 ); if( !SUCCEEDED( hr ) ) return hr; - if( pValue.vt != VT_BSTR || pValue.bstrVal == NULL ) + if( pValue.vt != VT_BSTR || pValue.bstrVal == nullptr ) return E_FAIL; USES_CONVERSION; @@ -184,7 +184,7 @@ STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR { CComVariant pVarElem; SafeArrayGetElement( aArgs, &ind, &pVarElem ); - if( pVarElem.vt == VT_DISPATCH && pVarElem.pdispVal != NULL ) + if( pVarElem.vt == VT_DISPATCH && pVarElem.pdispVal != nullptr ) { OLECHAR const * pMemberNames[2] = { L"Name", L"Value" }; CComVariant pValues[2]; |