diff options
Diffstat (limited to 'framework/source/uielement')
32 files changed, 83 insertions, 83 deletions
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index ead89e761b90..6334060ae512 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -149,7 +149,7 @@ void SAL_CALL AddonsToolBarManager::dispose() throw( RuntimeException, std::exce { AddonsParams* pRuntimeItemData = static_cast<AddonsParams*>(m_pToolBar->GetItemData( nId )); delete pRuntimeItemData; - m_pToolBar->SetItemData( nId, NULL ); + m_pToolBar->SetItemData( nId, nullptr ); } } } @@ -306,7 +306,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue } else { - ::cppu::OWeakObject* pController = 0; + ::cppu::OWeakObject* pController = nullptr; pController = ToolBarMerger::CreateController( m_xContext, m_xFrame, m_pToolBar, aURL, nId, nWidth, aControlType ); xController.set( pController, UNO_QUERY ); diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 793a521b3bd1..5ce44fd4ad6a 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -105,8 +105,8 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument if ( xFrame.is() && m_aConfigData.getLength() > 0 ) { // Create VCL based toolbar which will be filled with settings data - ToolBox* pToolBar = 0; - AddonsToolBarManager* pToolBarManager = 0; + ToolBox* pToolBar = nullptr; + AddonsToolBarManager* pToolBarManager = nullptr; { SolarMutexGuard aSolarMutexGuard; vcl::Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index b4748579a86a..808fddad43e8 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -82,7 +82,7 @@ ComboBoxControl::~ComboBoxControl() void ComboBoxControl::dispose() { - m_pComboboxToolbarController = 0; + m_pComboboxToolbarController = nullptr; ComboBox::dispose(); } @@ -147,7 +147,7 @@ ComboboxToolbarController::ComboboxToolbarController( sal_Int32 nWidth, const OUString& aCommand ) : ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) - , m_pComboBox( 0 ) + , m_pComboBox( nullptr ) { m_pComboBox = VclPtr<ComboBoxControl>::Create( m_pToolbar, WB_DROPDOWN, this ); if ( nWidth == 0 ) @@ -170,7 +170,7 @@ throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; - m_pToolbar->SetItemWindow( m_nID, 0 ); + m_pToolbar->SetItemWindow( m_nID, nullptr ); m_pComboBox.disposeAndClear(); ComplexToolbarController::dispose(); diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 4f3d6ea602d0..7fb4d97720bb 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -72,7 +72,7 @@ throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; - m_pToolbar->SetItemWindow( m_nID, 0 ); + m_pToolbar->SetItemWindow( m_nID, nullptr ); svt::ToolboxController::dispose(); m_xURLTransformer.clear(); @@ -124,7 +124,7 @@ throw ( RuntimeException, std::exception ) pExecuteInfo->xDispatch = xDispatch; pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; - Application::PostUserEvent( LINK(0, ComplexToolbarController , ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( LINK(nullptr, ComplexToolbarController , ExecuteHdl_Impl), pExecuteInfo ); } } @@ -260,7 +260,7 @@ void ComplexToolbarController::addNotifyInfo( aInfoSeq[nCount].Value = uno::makeAny( getFrameInterface() ); pNotifyInfo->aInfoSeq = aInfoSeq; - Application::PostUserEvent( LINK(0, ComplexToolbarController, Notify_Impl), pNotifyInfo ); + Application::PostUserEvent( LINK(nullptr, ComplexToolbarController, Notify_Impl), pNotifyInfo ); } } diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 9f2970a97291..dc9c604a2ad6 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -242,7 +242,7 @@ private: ControlMenuController::ControlMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase( xContext ), - m_pResPopupMenu( 0 ) + m_pResPopupMenu( nullptr ) { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); m_bShowMenuImages = rSettings.GetUseImagesInMenus(); @@ -278,7 +278,7 @@ void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; @@ -320,7 +320,7 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve } } - VCLXPopupMenu* pPopupMenu = NULL; + VCLXPopupMenu* pPopupMenu = nullptr; if ( nMenuId ) pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( m_xPopupMenu )); @@ -391,7 +391,7 @@ void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& ) // XPopupMenuController void ControlMenuController::impl_setPopupMenu() { - if ( m_pResPopupMenu == 0 ) + if ( m_pResPopupMenu == nullptr ) { std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag())); if ( pResMgr ) diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 72adca5533a3..2dd8223f774c 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -79,7 +79,7 @@ ListBoxControl::~ListBoxControl() void ListBoxControl::dispose() { - m_pListBoxListener = 0; + m_pListBoxListener = nullptr; ListBox::dispose(); } @@ -130,7 +130,7 @@ DropdownToolbarController::DropdownToolbarController( sal_Int32 nWidth, const OUString& aCommand ) : ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) - , m_pListBoxControl( 0 ) + , m_pListBoxControl( nullptr ) { m_pListBoxControl = VclPtr<ListBoxControl>::Create( m_pToolbar, WB_DROPDOWN|WB_AUTOHSCROLL|WB_BORDER, this ); if ( nWidth == 0 ) @@ -154,7 +154,7 @@ throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; - m_pToolbar->SetItemWindow( m_nID, 0 ); + m_pToolbar->SetItemWindow( m_nID, nullptr ); m_pListBoxControl.disposeAndClear(); ComplexToolbarController::dispose(); diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index b0134c4a2ca9..0ffc7455826e 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -78,7 +78,7 @@ EditControl::~EditControl() void EditControl::dispose() { - m_pEditToolbarController = 0; + m_pEditToolbarController = nullptr; Edit::dispose(); } @@ -129,7 +129,7 @@ EditToolbarController::EditToolbarController( sal_Int32 nWidth, const OUString& aCommand ) : ComplexToolbarController( rxContext, rFrame, pToolbar, nID, aCommand ) - , m_pEditControl( 0 ) + , m_pEditControl( nullptr ) { m_pEditControl = VclPtr<EditControl>::Create( m_pToolbar, WB_BORDER, this ); if ( nWidth == 0 ) @@ -151,7 +151,7 @@ throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; - m_pToolbar->SetItemWindow( m_nID, 0 ); + m_pToolbar->SetItemWindow( m_nID, nullptr ); m_pEditControl.disposeAndClear(); ComplexToolbarController::dispose(); diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 6e529b734e88..6ef837dddb62 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -76,7 +76,7 @@ void FontMenuController::fillPopupMenu( const Sequence< OUString >& rFontNameSeq { const OUString* pFontNameArray = rFontNameSeq.getConstArray(); VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 4f7d60eb67b7..7bbfc048d864 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -60,7 +60,7 @@ DEFINE_INIT_SERVICE ( FontSizeMenuController, {} ) FontSizeMenuController::FontSizeMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : svt::PopupMenuControllerBase( xContext ), - m_pHeightArray( 0 ) + m_pHeightArray( nullptr ) { } @@ -126,7 +126,7 @@ void FontSizeMenuController::setCurHeight( long nHeight, Reference< css::awt::XP void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx index bbdb74e78357..7432e8c4da65 100644 --- a/framework/source/uielement/genericstatusbarcontroller.cxx +++ b/framework/source/uielement/genericstatusbarcontroller.cxx @@ -75,7 +75,7 @@ throw ( RuntimeException, std::exception ) svt::StatusbarController::dispose(); SolarMutexGuard aGuard; - m_pItemData = NULL; + m_pItemData = nullptr; m_xGraphic.clear(); m_xStatusbarItem.clear(); diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index cfb1f8c68634..0f93f62e5fa9 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -172,7 +172,7 @@ throw ( RuntimeException, std::exception ) pExecuteInfo->xDispatch = xDispatch; pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; - Application::PostUserEvent( LINK(0, GenericToolbarController , ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( LINK(nullptr, GenericToolbarController , ExecuteHdl_Impl), pExecuteInfo ); } } @@ -297,7 +297,7 @@ MenuToolbarController::MenuToolbarController( const Reference< XComponentContext const Reference< XIndexAccess >& xMenuDesc ) : GenericToolbarController( rxContext, rFrame, pToolBar, nID, aCommand ), m_xMenuDesc( xMenuDesc ), - pMenu( NULL ), + pMenu( nullptr ), m_aModuleIdentifier( aModuleIdentifier ) { } @@ -313,7 +313,7 @@ MenuToolbarController::~MenuToolbarController() if ( pMenu ) { delete pMenu; - pMenu = NULL; + pMenu = nullptr; } } @@ -357,14 +357,14 @@ MenuToolbarController::createPopupWindow() throw (css::uno::RuntimeException, st } if ( !pMenu || !m_pToolbar ) - return NULL; + return nullptr; OSL_ENSURE ( pMenu->GetItemCount(), "Empty PopupMenu!" ); ::Rectangle aRect( m_pToolbar->GetItemRect( m_nID ) ); pMenu->Execute( m_pToolbar, aRect, PopupMenuFlags::ExecuteDown ); - return NULL; + return nullptr; } } // namespace diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 9e170df97dea..7a10e8572f43 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -75,7 +75,7 @@ HeaderMenuController::~HeaderMenuController() void HeaderMenuController::fillPopupMenu( const Reference< css::frame::XModel >& rModel, Reference< css::awt::XPopupMenu >& rPopupMenu ) { VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 034c985b245e..a9c2a2239d6b 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -159,7 +159,7 @@ void LanguageSelectionMenuController::impl_setPopupMenu() void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu , const Mode eMode ) { VCLXPopupMenu* pVCLPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pPopupMenu = 0; + PopupMenu* pPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 4dc434ca5235..588675399e57 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -72,7 +72,7 @@ MacrosMenuController::~MacrosMenuController() void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { VCLXPopupMenu* pVCLPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pPopupMenu = 0; + PopupMenu* pPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 5c46e755428f..2c0db7b83eea 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -264,7 +264,7 @@ void MenuBarManager::Destroy() if ( m_bDeleteMenu ) { delete m_pVCLMenu; - m_pVCLMenu = 0; + m_pVCLMenu = nullptr; } } } @@ -512,7 +512,7 @@ MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( sal_uInt16 return pItemHandler; } - return 0; + return nullptr; } // Helper to set request images flag @@ -561,7 +561,7 @@ void MenuBarManager::RemoveListener() { { // Remove popup menu from menu structure - m_pVCLMenu->SetPopupMenu( pItemHandler->nItemId, 0 ); + m_pVCLMenu->SetPopupMenu( pItemHandler->nItemId, nullptr ); } Reference< css::lang::XEventListener > xEventListener( pItemHandler->xPopupMenuController, UNO_QUERY ); @@ -610,12 +610,12 @@ void MenuBarManager::RemoveListener() { } - m_xFrame = 0; + m_xFrame = nullptr; } void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( RuntimeException, std::exception ) { - MenuItemHandler* pMenuItemDisposing = NULL; + MenuItemHandler* pMenuItemDisposing = nullptr; SolarMutexGuard g; @@ -656,7 +656,7 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run { // Remove popup menu from menu structure as we release our reference to // the controller. - m_pVCLMenu->SetPopupMenu( pMenuItemDisposing->nItemId, 0 ); + m_pVCLMenu->SetPopupMenu( pMenuItemDisposing->nItemId, nullptr ); } pMenuItemDisposing->xPopupMenuController.clear(); @@ -819,7 +819,7 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, bool ) vcl::KeyCode aKeyCode( KEY_F1 ); pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode ); } - else if ( pMenu->GetPopupMenu( pMenuItemHandler->nItemId ) == 0 ) + else if ( pMenu->GetPopupMenu( pMenuItemHandler->nItemId ) == nullptr ) pMenu->SetAccelKey( pMenuItemHandler->nItemId, pMenuItemHandler->aKeyCode ); } } @@ -1387,7 +1387,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF vcl::KeyCode aKeyCode( KEY_F1 ); pMenu->SetAccelKey( pMenuItemHandler->nItemId, aKeyCode ); } - else if ( pMenu->GetPopupMenu( pMenuItemHandler->nItemId ) == 0 ) + else if ( pMenu->GetPopupMenu( pMenuItemHandler->nItemId ) == nullptr ) pMenu->SetAccelKey( pMenuItemHandler->nItemId, pMenuItemHandler->aKeyCode ); } } diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index bc9acf4bec67..1a95812a87fa 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -86,7 +86,7 @@ ReferencePathInfo MenuBarMerger::FindReferencePath( ReferencePathInfo aResult; if ( !nCount ) { - aResult.pPopupMenu = NULL; + aResult.pPopupMenu = nullptr; aResult.nPos = 0; aResult.nLevel = -1; aResult.eResult = RP_MENUITEM_NOT_FOUND; @@ -119,7 +119,7 @@ ReferencePathInfo MenuBarMerger::FindReferencePath( { sal_uInt16 nItemId = pCurrMenu->GetItemId( nTmpPos ); Menu* pTmpMenu = pCurrMenu->GetPopupMenu( nItemId ); - if ( pTmpMenu != 0 ) + if ( pTmpMenu != nullptr ) pCurrMenu = pTmpMenu; else { diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 71c21ba786c0..b1f63fba368f 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -125,8 +125,8 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th if ( xFrame.is() && m_xConfigSource.is() ) { // Create VCL menubar which will be filled with settings data - MenuBar* pVCLMenuBar = 0; - VCLXMenuBar* pAwtMenuBar = 0; + MenuBar* pVCLMenuBar = nullptr; + VCLXMenuBar* pAwtMenuBar = nullptr; { SolarMutexGuard aSolarMutexGuard; pVCLMenuBar = new MenuBar(); diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 9ffa365c32f5..9029ccc49449 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -314,7 +314,7 @@ NewMenuController::~NewMenuController() void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; @@ -434,7 +434,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent pNewDocument->xDispatch = xDispatch; pNewDocument->aTargetURL = aTargetURL; pNewDocument->aArgSeq = aArgsList; - Application::PostUserEvent( LINK(0, NewMenuController, ExecuteHdl_Impl), pNewDocument ); + Application::PostUserEvent( LINK(nullptr, NewMenuController, ExecuteHdl_Impl), pNewDocument ); } } diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index a73d61183891..ddc90894d3af 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -106,7 +106,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< css::embed::VerbDescri { const css::embed::VerbDescriptor* pVerbCommandArray = rVerbCommandSeq.getConstArray(); VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 767fa812e06a..7b36967650b8 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -431,13 +431,13 @@ throw ( css::uno::RuntimeException, std::exception ) if ( m_xPopupMenu.is() ) { // TODO investigate how to wrap Get/SetUserValue in css::awt::XMenu - MenuAttributes* pMenuAttributes( 0 ); + MenuAttributes* pMenuAttributes( nullptr ); VCLXPopupMenu* pTkPopupMenu = static_cast<VCLXPopupMenu *>( VCLXMenu::GetImplementation( m_xPopupMenu ) ); SolarMutexGuard aSolarMutexGuard; PopupMenu* pVCLPopupMenu = pTkPopupMenu ? - dynamic_cast< PopupMenu * >( pTkPopupMenu->GetMenu() ) : NULL; + dynamic_cast< PopupMenu * >( pTkPopupMenu->GetMenu() ) : nullptr; if ( pVCLPopupMenu ) pMenuAttributes = reinterpret_cast< MenuAttributes* >( diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 33e3efea200c..a86995d903ff 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -144,7 +144,7 @@ RecentFilesMenuController::~RecentFilesMenuController() void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; @@ -317,7 +317,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) pLoadRecentFile->aTargetURL = aTargetURL; pLoadRecentFile->aArgSeq = aArgsList; - Application::PostUserEvent( LINK(0, RecentFilesMenuController, ExecuteHdl_Impl), pLoadRecentFile ); + Application::PostUserEvent( LINK(nullptr, RecentFilesMenuController, ExecuteHdl_Impl), pLoadRecentFile ); } } diff --git a/framework/source/uielement/saveasmenucontroller.cxx b/framework/source/uielement/saveasmenucontroller.cxx index 77e3f0267473..fe6aeb67b8c0 100644 --- a/framework/source/uielement/saveasmenucontroller.cxx +++ b/framework/source/uielement/saveasmenucontroller.cxx @@ -103,7 +103,7 @@ SaveAsMenuController::~SaveAsMenuController() void SaveAsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu ) { VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( rPopupMenu )); - PopupMenu* pVCLPopupMenu = 0; + PopupMenu* pVCLPopupMenu = nullptr; SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index b44899375fe7..c190d77f9303 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -89,7 +89,7 @@ SpinfieldControl::~SpinfieldControl() void SpinfieldControl::dispose() { - m_pSpinfieldToolbarController = 0; + m_pSpinfieldToolbarController = nullptr; SpinField::dispose(); } @@ -189,7 +189,7 @@ SpinfieldToolbarController::SpinfieldToolbarController( , m_nMin( 0.0 ) , m_nValue( 0.0 ) , m_nStep( 0.0 ) - , m_pSpinfieldControl( 0 ) + , m_pSpinfieldControl( nullptr ) { m_pSpinfieldControl = VclPtr<SpinfieldControl>::Create( m_pToolbar, WB_SPIN|WB_BORDER, this ); if ( nWidth == 0 ) @@ -211,7 +211,7 @@ throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; - m_pToolbar->SetItemWindow( m_nID, 0 ); + m_pToolbar->SetItemWindow( m_nID, nullptr ); m_pSpinfieldControl.disposeAndClear(); ComplexToolbarController::dispose(); diff --git a/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx index 2f520ec46d95..7189e6615a57 100644 --- a/framework/source/uielement/statusbar.cxx +++ b/framework/source/uielement/statusbar.cxx @@ -28,7 +28,7 @@ FrameworkStatusBar::FrameworkStatusBar( vcl::Window* pParent, WinBits nWinBits ) : StatusBar( pParent, nWinBits ), - m_pMgr( NULL ) + m_pMgr( nullptr ) { // set optimal size SetOutputSizePixel( CalcWindowSizePixel() ); diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx index 6b9fde6504e0..22c75144bd14 100644 --- a/framework/source/uielement/statusbaritem.cxx +++ b/framework/source/uielement/statusbaritem.cxx @@ -85,8 +85,8 @@ StatusbarItem::~StatusbarItem() void SAL_CALL StatusbarItem::disposing() { osl::MutexGuard aGuard( m_aMutex ); - m_pItemData = 0; - m_pStatusBar = 0; + m_pItemData = nullptr; + m_pStatusBar = nullptr; } OUString SAL_CALL StatusbarItem::getCommand() diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 3019ebe2a03c..389d1f5d1afc 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -370,7 +370,7 @@ void StatusBarManager::CreateControllers() if ( !xController.is() ) { - svt::StatusbarController* pController( 0 ); + svt::StatusbarController* pController( nullptr ); // 2) Old SFX2 Statusbar controllers pController = CreateStatusBarController( m_xFrame, m_pStatusBar, nId, aCommandURL ); diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 1aab781592a6..7c3b82a6fe60 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -101,8 +101,8 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) if ( xFrame.is() && m_xConfigSource.is() ) { // Create VCL based toolbar which will be filled with settings data - StatusBar* pStatusBar( 0 ); - StatusBarManager* pStatusBarManager( 0 ); + StatusBar* pStatusBar( nullptr ); + StatusBarManager* pStatusBarManager( nullptr ); { SolarMutexGuard aSolarMutexGuard; vcl::Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx index 2df9de37eb81..4588c6a311da 100644 --- a/framework/source/uielement/subtoolbarcontroller.cxx +++ b/framework/source/uielement/subtoolbarcontroller.cxx @@ -109,7 +109,7 @@ SubToolBarController::SubToolBarController( const css::uno::Sequence< css::uno:: SubToolBarController::~SubToolBarController() { disposeUIElement(); - m_xUIElement = 0; + m_xUIElement = nullptr; } void SubToolBarController::disposeUIElement() @@ -129,7 +129,7 @@ void SubToolBarController::statusChanged( const css::frame::FeatureStateEvent& E if ( m_bDisposed ) return; - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) { @@ -192,7 +192,7 @@ css::uno::Reference< css::awt::XWindow > SubToolBarController::createPopupWindow { SolarMutexGuard aGuard; - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) { @@ -287,7 +287,7 @@ void SubToolBarController::updateImage() SolarMutexGuard aGuard; if ( !m_aLastCommand.isEmpty() ) { - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) { @@ -352,7 +352,7 @@ void SubToolBarController::endPopupMode( const css::awt::EndPopupModeEvent& e ) } disposeUIElement(); } - m_xUIElement = 0; + m_xUIElement = nullptr; // if the toolbar was teared-off recreate it and place it at the given position if( e.bTearoff ) @@ -412,7 +412,7 @@ void SubToolBarController::update() { svt::ToolboxController::update(); - ToolBox* pToolBox = 0; + ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; if ( getToolboxId( nId, &pToolBox ) ) { @@ -432,7 +432,7 @@ void SubToolBarController::dispose() svt::ToolboxController::dispose(); disposeUIElement(); - m_xUIElement = 0; + m_xUIElement = nullptr; } OUString SubToolBarController::getImplementationName() diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index cdf6b582ad5a..3847e2d68c70 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -768,7 +768,7 @@ void ToolBarManager::RemoveControllers() { } } - m_pToolBar->SetItemWindow(nItemId, 0); + m_pToolBar->SetItemWindow(nItemId, nullptr); } } m_aControllerMap.clear(); @@ -868,7 +868,7 @@ void ToolBarManager::CreateControllers() CommandToInfoMap::iterator pCommandIter = m_aCommandMap.find( aCommandURL ); sal_Int16 nWidth = ( pCommandIter != m_aCommandMap.end() ? pCommandIter->second.nWidth : 0 ); - svt::ToolboxController* pController( 0 ); + svt::ToolboxController* pController( nullptr ); if ( bHasDisabledEntries ) { @@ -926,7 +926,7 @@ void ToolBarManager::CreateControllers() pController = CreateToolBoxController( m_xFrame, m_pToolBar, nId, aCommandURL ); if ( !pController ) { - if ( m_pToolBar->GetItemData( nId ) != 0 ) + if ( m_pToolBar->GetItemData( nId ) != nullptr ) { // retrieve additional parameters OUString aControlType = static_cast< AddonsParams* >( m_pToolBar->GetItemData( nId ))->aControlType; @@ -1593,7 +1593,7 @@ void ToolBarManager::ImplClearPopupMenu( ToolBox *pToolBar ) { pItemMenu->Clear(); delete pItemMenu; - pItemMenu = NULL; + pItemMenu = nullptr; pMenu->SetPopupMenu( 1, pItemMenu ); } @@ -1678,7 +1678,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const xDisp = xProv->queryDispatch( aURL, OUString(), 0 ); if ( !xDisp.is() || IsPluginMode() ) - return 0; + return nullptr; } // popup menu for quick customization @@ -1826,7 +1826,7 @@ IMPL_LINK_TYPED( ToolBarManager, Command, CommandEvent const *, pCmdEvt, void ) //fdo#86820 We may have been disposed and so have a NULL m_pToolBar by //executing a menu entry, e.g. inserting a chart replaces the toolbars - pManagerMenu = m_bDisposed ? NULL : m_pToolBar->GetMenu(); + pManagerMenu = m_bDisposed ? nullptr : m_pToolBar->GetMenu(); if (pManagerMenu) { // Unlink our listeners again -- see above for why. @@ -1897,7 +1897,7 @@ IMPL_LINK_TYPED( ToolBarManager, MenuSelect, Menu*, pMenu, bool ) pExecuteInfo->nCmd = EXEC_CMD_DOCKTOOLBAR; pExecuteInfo->xLayoutManager = getLayoutManagerFromFrame( m_xFrame ); - Application::PostUserEvent( LINK(0, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( LINK(nullptr, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo ); break; } @@ -1909,7 +1909,7 @@ IMPL_LINK_TYPED( ToolBarManager, MenuSelect, Menu*, pMenu, bool ) pExecuteInfo->nCmd = EXEC_CMD_DOCKALLTOOLBARS; pExecuteInfo->xLayoutManager = getLayoutManagerFromFrame( m_xFrame ); - Application::PostUserEvent( LINK(0, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( LINK(nullptr, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo ); break; } @@ -1937,7 +1937,7 @@ IMPL_LINK_TYPED( ToolBarManager, MenuSelect, Menu*, pMenu, bool ) pExecuteInfo->xLayoutManager = getLayoutManagerFromFrame( m_xFrame ); pExecuteInfo->xWindow = VCLUnoHelper::GetInterface( m_pToolBar ); - Application::PostUserEvent( LINK(0, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( LINK(nullptr, ToolBarManager, ExecuteHdl_Impl), pExecuteInfo ); break; } diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 06a6658e3a97..5810412bb8c8 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -634,7 +634,7 @@ bool ToolBarMerger::RemoveItems( sal_uInt16 nWidth, const OUString& rControlType ) { - ::cppu::OWeakObject* pResult( 0 ); + ::cppu::OWeakObject* pResult( nullptr ); if ( rControlType == TOOLBARCONTROLLER_BUTTON ) pResult = new ButtonToolbarController( rxContext, pToolbar, rCommandURL ); diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index bf9c793f9f30..59ee67b353cf 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -442,7 +442,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r { SolarMutexGuard aGuard; VCLXPopupMenu* pXPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( m_xPopupMenu )); - PopupMenu* pVCLPopupMenu = pXPopupMenu ? static_cast<PopupMenu *>(pXPopupMenu->GetMenu()) : NULL; + PopupMenu* pVCLPopupMenu = pXPopupMenu ? static_cast<PopupMenu *>(pXPopupMenu->GetMenu()) : nullptr; assert(pVCLPopupMenu); if (pVCLPopupMenu) pVCLPopupMenu->SetUserValue( nIndex, sal_uIntPtr( aSortedTbs[i].bContextSensitive ? 1L : 0L )); @@ -551,7 +551,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev { SolarMutexGuard aGuard; VCLXPopupMenu* pXPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( xPopupMenu )); - PopupMenu* pVCLPopupMenu = pXPopupMenu ? static_cast<PopupMenu *>(pXPopupMenu->GetMenu()) : NULL; + PopupMenu* pVCLPopupMenu = pXPopupMenu ? static_cast<PopupMenu *>(pXPopupMenu->GetMenu()) : nullptr; SAL_WARN_IF(!pVCLPopupMenu, "framework", "worrying lack of popup menu"); if (!pVCLPopupMenu) @@ -713,7 +713,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r pExecuteInfo->xDispatch = xDispatch; pExecuteInfo->aTargetURL = aTargetURL; pExecuteInfo->aArgs = aArgs; - Application::PostUserEvent( LINK(0, ToolbarsMenuController, ExecuteHdl_Impl), pExecuteInfo ); + Application::PostUserEvent( LINK(nullptr, ToolbarsMenuController, ExecuteHdl_Impl), pExecuteInfo ); } } else diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index 4789e1c5a823..7b9cbb2d6ba3 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -141,8 +141,8 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th if ( xFrame.is() && m_xConfigSource.is() ) { // Create VCL based toolbar which will be filled with settings data - ToolBox* pToolBar = 0; - ToolBarManager* pToolBarManager = 0; + ToolBox* pToolBar = nullptr; + ToolBarManager* pToolBarManager = nullptr; { SolarMutexGuard aSolarMutexGuard; vcl::Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); |