diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:25:17 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:48 +0100 |
commit | 28f4bee7bd7378141d8569186162e1a3166eb012 (patch) | |
tree | 97cb855eec76da937068cda5c5f0f7d5bcd61e47 /svtools/source/uno/unoevent.cxx | |
parent | bf057fab3c0d17bf2832c8d9fc6d34b1b859e660 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I7fc4b4d5c895f241cfb052b009e943e073f3befe
Diffstat (limited to 'svtools/source/uno/unoevent.cxx')
-rw-r--r-- | svtools/source/uno/unoevent.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index 5abca39ef371..74ac2a7c9ee4 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -52,7 +52,7 @@ SvBaseEventDescriptor::SvBaseEventDescriptor( const SvEventDescription* pSupport mpSupportedMacroItems(pSupportedMacroItems), mnMacroItems(0) { - assert(pSupportedMacroItems != NULL && "Need a list of supported events!"); + assert(pSupportedMacroItems != nullptr && "Need a list of supported events!"); for( ; mpSupportedMacroItems[mnMacroItems].mnEvent != 0; mnMacroItems++) ; } @@ -426,7 +426,7 @@ SvDetachedEventDescriptor::SvDetachedEventDescriptor( // ... and initialize for(sal_Int16 i = 0; i < mnMacroItems; i++) { - aMacros[i] = NULL; + aMacros[i] = nullptr; } } @@ -435,7 +435,7 @@ SvDetachedEventDescriptor::~SvDetachedEventDescriptor() // delete contents of aMacros for(sal_Int16 i = 0; i < mnMacroItems; i++) { - if (NULL != aMacros[i]) + if (nullptr != aMacros[i]) delete aMacros[i]; } @@ -503,7 +503,7 @@ bool SvDetachedEventDescriptor::hasById( if (-1 == nIndex) throw IllegalArgumentException(); - return (NULL != aMacros[nIndex]) && aMacros[nIndex]->HasMacro(); + return (nullptr != aMacros[nIndex]) && aMacros[nIndex]->HasMacro(); } @@ -531,7 +531,7 @@ void SvMacroTableEventDescriptor::copyMacrosFromTable( { const sal_uInt16 nEvent = mpSupportedMacroItems[i].mnEvent; const SvxMacro* pMacro = rMacroTable.Get(nEvent); - if (NULL != pMacro) + if (nullptr != pMacro) replaceByName(nEvent, *pMacro); } |