diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-08 14:41:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-09 13:12:47 +0200 |
| commit | 7d521a85858bacdb7b5db359036ccf6f01b709c3 (patch) | |
| tree | ee359fd27d55a0916e18e504d925949aa5b2a378 /vcl/inc/osx | |
| parent | b7abdafcfc42722ab060529864a2109d1e4198c0 (diff) | |
hold and return SalMenu by std::unique_ptr
and drop DestroyMenu, all the implementations just delete the object
Change-Id: I673997ea1a9c5216b100cafdc70a8f697732769b
Reviewed-on: https://gerrit.libreoffice.org/55501
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/inc/osx')
| -rw-r--r-- | vcl/inc/osx/salinst.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h index a19e9e423f9b..fa15a5cb7bca 100644 --- a/vcl/inc/osx/salinst.h +++ b/vcl/inc/osx/salinst.h @@ -118,8 +118,7 @@ public: virtual void AcquireYieldMutex( sal_uInt32 nCount = 1 ) override; virtual bool DoYield(bool bWait, bool bHandleAllCurrentEvents) override; virtual bool AnyInput( VclInputFlags nType ) override; - virtual SalMenu* CreateMenu( bool bMenuBar, Menu* pVCLMenu ) override; - virtual void DestroyMenu( SalMenu* ) override; + virtual std::unique_ptr<SalMenu> CreateMenu( bool bMenuBar, Menu* pVCLMenu ) override; virtual std::unique_ptr<SalMenuItem> CreateMenuItem( const SalItemParams & rItemData ) override; virtual OpenGLContext* CreateOpenGLContext() override; virtual OUString GetConnectionIdentifier() override; |