diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-13 15:11:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-15 10:10:39 +0200 |
| commit | a84abd9e29b1920af87a1c7510bd92355594f9af (patch) | |
| tree | 5d52778f4677855a1f1915c80d5a15c5c44535ca /framework/inc/uielement | |
| parent | 9b9f60dd3adafe2364cb9f8122b430f729f0ad1c (diff) | |
loplugin:useuniqueptr in MenuBarManager
Change-Id: Iffdd62e8af5fa31caecc6ea01bd5e21de950862c
Reviewed-on: https://gerrit.libreoffice.org/59021
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/inc/uielement')
| -rw-r--r-- | framework/inc/uielement/menubarmanager.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index ba77df9457ab..a1fbdb82d0fe 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -167,12 +167,12 @@ class MenuBarManager final : vcl::KeyCode aKeyCode; }; - void RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuShortCuts ); + void RetrieveShortcuts( std::vector< std::unique_ptr<MenuItemHandler> >& aMenuShortCuts ); static void UpdateSpecialWindowMenu( Menu* pMenu, const css::uno::Reference< css::uno::XComponentContext >& xContext ); static void FillMenuImages( css::uno::Reference< css::frame::XFrame > const & xFrame, Menu* _pMenu, bool bShowMenuImages ); static void impl_RetrieveShortcutsFromConfiguration( const css::uno::Reference< css::ui::XAcceleratorConfiguration >& rAccelCfg, const css::uno::Sequence< OUString >& rCommands, - std::vector< MenuItemHandler* >& aMenuShortCuts ); + std::vector< std::unique_ptr<MenuItemHandler> >& aMenuShortCuts ); static void MergeAddonMenus( Menu* pMenuBar, const MergeMenuInstructionContainer&, const OUString& aModuleIdentifier ); MenuItemHandler* GetMenuItemHandler( sal_uInt16 nItemId ); @@ -195,7 +195,7 @@ class MenuBarManager final : VclPtr<Menu> m_pVCLMenu; css::uno::Reference< css::frame::XFrame > m_xFrame; css::uno::Reference< css::frame::XUIControllerFactory > m_xPopupMenuControllerFactory; - ::std::vector< MenuItemHandler* > m_aMenuItemHandlerVector; + ::std::vector< std::unique_ptr<MenuItemHandler> > m_aMenuItemHandlerVector; css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchProvider; css::uno::Reference< css::ui::XImageManager > m_xDocImageManager; css::uno::Reference< css::ui::XImageManager > m_xModuleImageManager; |