diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:28:29 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:32:00 +0100 |
| commit | d3b6cb7ec2da4afb5687c9d28b2be2f96e6aa7b1 (patch) | |
| tree | e9d209d6d5f06cacd8e0df78c7f6b8ad45d74be5 /vcl/source/window/menuitemlist.cxx | |
| parent | 45979047abbd9da7a29401f298e8ef9ab58ad337 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I05e89f9896170d4df3d1377549ea074f06b884a0
Diffstat (limited to 'vcl/source/window/menuitemlist.cxx')
| -rw-r--r-- | vcl/source/window/menuitemlist.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx index c104ba8a1ef8..d1042b4fb30b 100644 --- a/vcl/source/window/menuitemlist.cxx +++ b/vcl/source/window/menuitemlist.cxx @@ -36,9 +36,9 @@ MenuItemData::~MenuItemData() aUserValueReleaseFunc(nUserValue); if( pAutoSubMenu ) { - static_cast<PopupMenu*>(pAutoSubMenu)->pRefAutoSubMenu = NULL; + static_cast<PopupMenu*>(pAutoSubMenu)->pRefAutoSubMenu = nullptr; delete pAutoSubMenu; - pAutoSubMenu = NULL; + pAutoSubMenu = nullptr; } if( pSalMenuItem ) ImplGetSVData()->mpDefInst->DestroyMenuItem( pSalMenuItem ); @@ -66,8 +66,8 @@ MenuItemData* MenuItemList::Insert( pData->sIdent = rIdent; pData->eType = eType; pData->nBits = nBits; - pData->pSubMenu = NULL; - pData->pAutoSubMenu = NULL; + pData->pSubMenu = nullptr; + pData->pAutoSubMenu = nullptr; pData->nUserValue = 0; pData->bChecked = false; pData->bEnabled = true; @@ -102,8 +102,8 @@ void MenuItemList::InsertSeparator(const OString &rIdent, size_t nPos) pData->sIdent = rIdent; pData->eType = MenuItemType::SEPARATOR; pData->nBits = MenuItemBits::NONE; - pData->pSubMenu = NULL; - pData->pAutoSubMenu = NULL; + pData->pSubMenu = nullptr; + pData->pAutoSubMenu = nullptr; pData->nUserValue = 0; pData->bChecked = false; pData->bEnabled = true; @@ -116,7 +116,7 @@ void MenuItemList::InsertSeparator(const OString &rIdent, size_t nPos) aSalMIData.nId = 0; aSalMIData.eType = MenuItemType::SEPARATOR; aSalMIData.nBits = MenuItemBits::NONE; - aSalMIData.pMenu = NULL; + aSalMIData.pMenu = nullptr; aSalMIData.aText.clear(); aSalMIData.aImage = Image(); @@ -149,7 +149,7 @@ MenuItemData* MenuItemList::GetData( sal_uInt16 nSVId, size_t& rPos ) const return maItemList[ i ]; } } - return NULL; + return nullptr; } MenuItemData* MenuItemList::SearchItem( @@ -221,7 +221,7 @@ MenuItemData* MenuItemList::SearchItem( } } - return NULL; + return nullptr; } size_t MenuItemList::GetItemCount( sal_Unicode cSelectChar ) const |