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 /sw/source/uibase/docvw/AnnotationWin.cxx | |
| 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 'sw/source/uibase/docvw/AnnotationWin.cxx')
| -rw-r--r-- | sw/source/uibase/docvw/AnnotationWin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index 17bc48ebc4b2..8d9bff9a2a51 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -79,7 +79,7 @@ SwAnnotationWin::~SwAnnotationWin() void SwAnnotationWin::dispose() { - delete mpButtonPopup; + mpButtonPopup.disposeAndClear(); sw::sidebarwindows::SwSidebarWin::dispose(); } @@ -220,7 +220,7 @@ sal_uInt32 SwAnnotationWin::CountFollowing() VclPtr<MenuButton> SwAnnotationWin::CreateMenuButton() { - mpButtonPopup = new PopupMenu(SW_RES(MN_ANNOTATION_BUTTON)); + mpButtonPopup = VclPtr<PopupMenu>::Create(SW_RES(MN_ANNOTATION_BUTTON)); OUString aText = mpButtonPopup->GetItemText( FN_DELETE_NOTE_AUTHOR ); SwRewriter aRewriter; aRewriter.AddRule(UndoArg1,GetAuthor()); |