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/classes | |
parent | 88b5e5fd3a6f0d70caf66568c25a3e47e01c71e2 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: Ie178c474921c1695927a9b01a9972baf09fbb73d
Diffstat (limited to 'framework/source/classes')
-rw-r--r-- | framework/source/classes/fwktabwindow.cxx | 2 | ||||
-rw-r--r-- | framework/source/classes/fwlresid.cxx | 2 | ||||
-rw-r--r-- | framework/source/classes/menumanager.cxx | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx index 6292953bd53b..1055ed04e6aa 100644 --- a/framework/source/classes/fwktabwindow.cxx +++ b/framework/source/classes/fwktabwindow.cxx @@ -238,7 +238,7 @@ bool FwkTabWindow::RemoveEntry( sal_Int32 nIndex ) TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const { - TabEntry* pEntry = NULL; + TabEntry* pEntry = nullptr; TabEntryList::const_iterator pIt; for ( pIt = m_TabList.begin(); diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx index e65bb689df90..5e9dd275ddaf 100644 --- a/framework/source/classes/fwlresid.cxx +++ b/framework/source/classes/fwlresid.cxx @@ -29,7 +29,7 @@ namespace framework ResMgr* FwlResId::GetResManager() { - static ResMgr* pResMgr = NULL; + static ResMgr* pResMgr = nullptr; if ( !pResMgr ) { diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 1e3f31aa57a3..9df0745b9f7b 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -244,7 +244,7 @@ MenuManager::MenuManager( } Reference< XDispatch > aXDispatchRef; - m_aMenuItemHandlerVector.push_back( new MenuItemHandler( nItemId, NULL, aXDispatchRef )); + m_aMenuItemHandlerVector.push_back( new MenuItemHandler( nItemId, nullptr, aXDispatchRef )); } } @@ -294,14 +294,14 @@ MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( sal_uInt16 nItemI return pItemHandler; } - return 0; + return nullptr; } void SAL_CALL MenuManager::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { OUString aFeatureURL = Event.FeatureURL.Complete; - MenuItemHandler* pStatusChangedMenu = NULL; + MenuItemHandler* pStatusChangedMenu = nullptr; { SolarMutexGuard g; @@ -403,7 +403,7 @@ void SAL_CALL MenuManager::disposing( const EventObject& Source ) throw ( Runtim else { // disposing called from menu item dispatcher, remove listener - MenuItemHandler* pMenuItemDisposing = NULL; + MenuItemHandler* pMenuItemDisposing = nullptr; { SolarMutexGuard g; @@ -451,7 +451,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) Reference< XDispatch > aXDispatchRef; MenuItemHandler* pNewMenuItemHandler = new MenuItemHandler( nPickItemId++, - NULL, + nullptr, aXDispatchRef ); for ( int j = 0; j < aPickListEntry.getLength(); j++ ) @@ -573,7 +573,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) OUString aCompactedSystemPath; aTipHelpText = aSystemPath; - oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL ); + oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, nullptr ); if ( !nError ) aMenuTitle = aCompactedSystemPath; else @@ -762,7 +762,7 @@ IMPL_LINK_TYPED( MenuManager, Activate, Menu *, pMenu, bool ) { MenuItemHandler* pMenuItemHandler = *p; if ( pMenuItemHandler && - pMenuItemHandler->pSubMenuManager == 0 && + pMenuItemHandler->pSubMenuManager == nullptr && !pMenuItemHandler->xMenuItemDispatch.is() ) { // There is no dispatch mechanism for the special window list menu items, |