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/source/window/menuitemlist.cxx | |
| 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/source/window/menuitemlist.cxx')
| -rw-r--r-- | vcl/source/window/menuitemlist.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx index f9306c864249..7778a8004b53 100644 --- a/vcl/source/window/menuitemlist.cxx +++ b/vcl/source/window/menuitemlist.cxx @@ -34,8 +34,7 @@ MenuItemData::~MenuItemData() { if (aUserValueReleaseFunc) aUserValueReleaseFunc(nUserValue); - if( pSalMenuItem ) - ImplGetSVData()->mpDefInst->DestroyMenuItem( pSalMenuItem ); + pSalMenuItem.reset(); pSubMenu.disposeAndClear(); } @@ -73,7 +72,7 @@ MenuItemData* MenuItemList::Insert( aSalMIData.aText = rStr; // Native-support: returns NULL if not supported - pData->pSalMenuItem = ImplGetSVData()->mpDefInst->CreateMenuItem( &aSalMIData ); + pData->pSalMenuItem = ImplGetSVData()->mpDefInst->CreateMenuItem( aSalMIData ); if( nPos < maItemList.size() ) { maItemList.insert( maItemList.begin() + nPos, std::unique_ptr<MenuItemData>(pData) ); @@ -106,7 +105,7 @@ void MenuItemList::InsertSeparator(const OString &rIdent, size_t nPos) aSalMIData.aImage = Image(); // Native-support: returns NULL if not supported - pData->pSalMenuItem = ImplGetSVData()->mpDefInst->CreateMenuItem( &aSalMIData ); + pData->pSalMenuItem = ImplGetSVData()->mpDefInst->CreateMenuItem( aSalMIData ); if( nPos < maItemList.size() ) { maItemList.insert( maItemList.begin() + nPos, std::unique_ptr<MenuItemData>(pData) ); |