diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-20 15:56:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-23 06:28:00 +0000 |
| commit | aa0d0536a444fb26d9e570bd6bf6c1bdc3596cf3 (patch) | |
| tree | 8b2a5207e77fa4054a37b33c25378c23a00af8ed /sfx2/source/inc | |
| parent | b722f3d6fc72877e8caaaae7291d5d736ddc494d (diff) | |
tdf#97527 - vcl: reference-count Menu
some places are marked with "dodgy"- need to check those to see
what is going on, because they are leaving dangling pointers behind
in the Menu class
Change-Id: I41d5c7c0fec2f70ce9e3ffdc48cd03d26c0a869b
Reviewed-on: https://gerrit.libreoffice.org/26516
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2/source/inc')
| -rw-r--r-- | sfx2/source/inc/templdgi.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index b8a08d3524ed..13e36c5f1f9a 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -131,7 +131,7 @@ public: } void MakeExpanded_Impl(ExpandedEntries_t& rEntries) const; - virtual std::unique_ptr<PopupMenu> CreateContextMenu() override; + virtual VclPtr<PopupMenu> CreateContextMenu() override; }; class SfxActionListBox : public DropListBox_Impl @@ -140,7 +140,7 @@ protected: public: SfxActionListBox( SfxCommonTemplateDialog_Impl* pParent, WinBits nWinBits ); - virtual std::unique_ptr<PopupMenu> CreateContextMenu() override; + virtual VclPtr<PopupMenu> CreateContextMenu() override; void Recalc(); }; @@ -325,7 +325,7 @@ public: } // normally for derivates from SvTreeListBoxes, but in this case the dialog handles context menus - std::unique_ptr<PopupMenu> CreateContextMenu(); + VclPtr<PopupMenu> CreateContextMenu(); }; class DropToolBox_Impl : public ToolBox, public DropTargetHelper |