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 /include/vcl/menu.hxx | |
| 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 'include/vcl/menu.hxx')
| -rw-r--r-- | include/vcl/menu.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 6c73d802802f..705486ab7356 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -157,7 +157,7 @@ private: css::uno::Reference<css::accessibility::XAccessible > mxAccessible; mutable std::unique_ptr<vcl::MenuLayoutData> mpLayoutData; - SalMenu* mpSalMenu; + std::unique_ptr<SalMenu> mpSalMenu; protected: SAL_DLLPRIVATE Menu* ImplGetStartMenu(); @@ -181,7 +181,7 @@ protected: DECL_DLLPRIVATE_LINK(ImplCallSelect, void*, void ); SAL_DLLPRIVATE void ImplFillLayoutData() const; - SAL_DLLPRIVATE SalMenu* ImplGetSalMenu() { return mpSalMenu; } + SAL_DLLPRIVATE SalMenu* ImplGetSalMenu() { return mpSalMenu.get(); } SAL_DLLPRIVATE void ImplClearSalMenu(); SAL_DLLPRIVATE OUString ImplGetHelpText( sal_uInt16 nItemId ) const; |