diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:16:14 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:27 +0100 |
commit | 06c5c630201152964c19c47262a5a54fcb6cf6c2 (patch) | |
tree | 909d2d883848f87711d723ddf354dba6f79d0748 /framework/source/fwe/classes/addonmenu.cxx | |
parent | 88b5e5fd3a6f0d70caf66568c25a3e47e01c71e2 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: Ie178c474921c1695927a9b01a9972baf09fbb73d
Diffstat (limited to 'framework/source/fwe/classes/addonmenu.cxx')
-rw-r--r-- | framework/source/fwe/classes/addonmenu.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index f63e52ebc7e9..c65da97c56d1 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -109,7 +109,7 @@ PopupMenu* AddonMenuManager::CreatePopupMenuType( MenuType eMenuType, const Refe else if ( eMenuType == ADDON_POPUPMENU ) return new AddonPopupMenu( rFrame ); else - return NULL; + return nullptr; } // Create the Add-Ons menu @@ -117,7 +117,7 @@ AddonMenu* AddonMenuManager::CreateAddonMenu( const Reference< XFrame >& rFrame, const Reference< XComponentContext >& rContext ) { AddonsOptions aOptions; - AddonMenu* pAddonMenu = NULL; + AddonMenu* pAddonMenu = nullptr; sal_uInt16 nUniqueMenuId = ADDONMENU_ITEMID_START; const Sequence< Sequence< PropertyValue > >& rAddonMenuEntries = aOptions.GetAddonsMenu(); @@ -131,7 +131,7 @@ AddonMenu* AddonMenuManager::CreateAddonMenu( const Reference< XFrame >& rFrame, if ( pAddonMenu->GetItemCount() == 0 ) { delete pAddonMenu; - pAddonMenu = NULL; + pAddonMenu = nullptr; } } @@ -297,7 +297,7 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent bInsertSeparator = true; else { - PopupMenu* pSubMenu = NULL; + PopupMenu* pSubMenu = nullptr; if ( aAddonSubMenu.getLength() > 0 ) { pSubMenu = AddonMenuManager::CreatePopupMenuType( nSubMenuType, rFrame ); @@ -307,7 +307,7 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent if ( pSubMenu->GetItemCount() == 0 ) { delete pSubMenu; - pSubMenu = NULL; + pSubMenu = nullptr; continue; } } |