diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-08 14:27:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-09 13:12:30 +0200 |
| commit | b7abdafcfc42722ab060529864a2109d1e4198c0 (patch) | |
| tree | 9709bb6dfd778d7af797d9351ff293a5fba41e40 /vcl/inc/salinst.hxx | |
| parent | 6d008c9e1dbe4240a10c8789860dc30b0cb0b2d5 (diff) | |
return and hold SalMenuItem by std::unique_ptr
and drop DestroyMenuItem, all the implementations were just deleting the
pointer
Change-Id: I058817b963988b1e399279f61f45716a2cdba023
Reviewed-on: https://gerrit.libreoffice.org/55500
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/inc/salinst.hxx')
| -rw-r--r-- | vcl/inc/salinst.hxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index c8f330350ad4..3924ee3d497f 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -154,8 +154,7 @@ public: // menus virtual SalMenu* CreateMenu( bool bMenuBar, Menu* pMenu ); virtual void DestroyMenu( SalMenu* pMenu); - virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ); - virtual void DestroyMenuItem( SalMenuItem* pItem ); + virtual std::unique_ptr<SalMenuItem> CreateMenuItem( const SalItemParams& pItemData ); // may return NULL to disable session management, only used by X11 backend virtual std::unique_ptr<SalSession> CreateSalSession(); |