diff options
Diffstat (limited to 'vcl/source/window/menuitemlist.hxx')
| -rw-r--r-- | vcl/source/window/menuitemlist.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx index 6f2b2631bdef..3f7f8d2d6166 100644 --- a/vcl/source/window/menuitemlist.hxx +++ b/vcl/source/window/menuitemlist.hxx @@ -62,28 +62,28 @@ struct MenuItemData : nId(0) , eType(MenuItemType::DONTKNOW) , nBits(MenuItemBits::NONE) - , pSubMenu(NULL) - , pAutoSubMenu(NULL) + , pSubMenu(nullptr) + , pAutoSubMenu(nullptr) , nUserValue(0) - , aUserValueReleaseFunc(0) + , aUserValueReleaseFunc(nullptr) , bChecked(false) , bEnabled(false) , bVisible(false) , bIsTemporary(false) , bMirrorMode(false) , nItemImageAngle(0) - , pSalMenuItem(NULL) + , pSalMenuItem(nullptr) { } MenuItemData( const OUString& rStr, const Image& rImage ) : nId(0) , eType(MenuItemType::DONTKNOW) , nBits(MenuItemBits::NONE) - , pSubMenu(NULL) - , pAutoSubMenu(NULL) + , pSubMenu(nullptr) + , pAutoSubMenu(nullptr) , aText(rStr) , nUserValue(0) - , aUserValueReleaseFunc(0) + , aUserValueReleaseFunc(nullptr) , aImage(rImage) , bChecked(false) , bEnabled(false) @@ -91,7 +91,7 @@ struct MenuItemData , bIsTemporary(false) , bMirrorMode(false) , nItemImageAngle(0) - , pSalMenuItem(NULL) + , pSalMenuItem(nullptr) { } ~MenuItemData(); @@ -134,7 +134,7 @@ public: } MenuItemData* GetDataFromPos( size_t nPos ) const { - return ( nPos < maItemList.size() ) ? maItemList[ nPos ] : NULL; + return ( nPos < maItemList.size() ) ? maItemList[ nPos ] : nullptr; } MenuItemData* SearchItem( |