summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-18 16:35:42 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-07-18 16:35:42 +0100
commit918b9a4f38d017ecd813fb59d8c288a00557e2fb (patch)
tree0d731e3158575e0580c548be2fa5393ebfb24785
parentf11e85dd4f09f5cd1c7371e6a521dd4d9ec2f70f (diff)
Resolves: tdf#100823 crash during PopupMenu dtor
Change-Id: I6d9aed05a76311a13470c9072543609f5a87501d
-rw-r--r--svtools/source/contnr/svimpbox.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index ddd009e7948a..14fd092bea21 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -3018,13 +3018,14 @@ void SvImpLBox::Command( const CommandEvent& rCEvt )
{
VclPtr<PopupMenu> pPopup = pView->CreateContextMenu();
- if( pPopup )
+ if (pPopup)
{
// do action for selected entry in popup menu
sal_uInt16 nMenuAction = pPopup->Execute( pView, aPopupPos );
if ( nMenuAction )
pView->ExecuteContextMenuAction( nMenuAction );
lcl_DeleteSubPopups(pPopup.get());
+ pPopup.disposeAndClear();
}
}