loplugin:nullptr

Change-Id: I134ca6b0e69124739b734dfb49763da4284f7412
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129652
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2022-02-08 07:53:37 +01:00
parent d8be929f4c
commit 7a6786c570
2 changed files with 4 additions and 3 deletions

View file

@ -275,7 +275,7 @@ public:
static Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor) static Inst * create(InstCtor aInstCtor, GuardCtor aGuardCtor)
{ {
#if defined _MSC_VER #if defined _MSC_VER
static Inst * m_pInstance = 0; static Inst * m_pInstance = NULL;
#endif // _MSC_VER #endif // _MSC_VER
Inst * p = m_pInstance; Inst * p = m_pInstance;
if (!p) if (!p)
@ -300,7 +300,7 @@ public:
DataCtor aDataCtor) DataCtor aDataCtor)
{ {
#if defined _MSC_VER #if defined _MSC_VER
static Inst * m_pInstance = 0; static Inst * m_pInstance = NULL;
#endif // _MSC_VER #endif // _MSC_VER
Inst * p = m_pInstance; Inst * p = m_pInstance;
if (!p) if (!p)

View file

@ -61,7 +61,8 @@ enum DM_NIR {
template<typename T, typename Ifc> HRESULT template<typename T, typename Ifc> HRESULT
createInstance(REFIID iid, Ifc ** ppIfc) createInstance(REFIID iid, Ifc ** ppIfc)
{ {
return CComCreator< CComObject<T> >::CreateInstance(0, iid, reinterpret_cast<void**>(ppIfc)); return
CComCreator< CComObject<T> >::CreateInstance(nullptr, iid, reinterpret_cast<void**>(ppIfc));
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */