[Libreoffice-commits] core.git: svtools/source

Caolán McNamara caolanm at redhat.com
Mon Jul 18 15:37:21 UTC 2016


 svtools/source/contnr/svimpbox.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 918b9a4f38d017ecd813fb59d8c288a00557e2fb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 18 16:35:42 2016 +0100

    Resolves: tdf#100823 crash during PopupMenu dtor
    
    Change-Id: I6d9aed05a76311a13470c9072543609f5a87501d

diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index ddd009e..14fd092 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();
             }
         }
 


More information about the Libreoffice-commits mailing list