diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-10-27 22:31:47 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-10-27 22:11:07 +0000 |
| commit | 89c23b4aaef931b5d6009efaf44ce6e6c976e8d4 (patch) | |
| tree | 73cb7691235d8c723ba5bc8add032daac0a6d53b /svtools/source/contnr | |
| parent | 798c107a1afa6e22a0de97c49d0bda552913e56a (diff) | |
Sub menus no longer need manual disposing
after:
commit ee79a2dd7ea60e902cab3a9203e307b8a78fee23
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Jul 29 14:33:22 2016 +0100
Resolves: tdf#101169 crash using column menu in base
Change-Id: I7c6e54dd5574c61cffd5884d1cf1b63075073001
Reviewed-on: https://gerrit.libreoffice.org/30343
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'svtools/source/contnr')
| -rw-r--r-- | svtools/source/contnr/svimpbox.cxx | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 6cd671b9f5f6..b5355525ee6d 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -2912,20 +2912,6 @@ void SvImpLBox::PaintDDCursor( SvTreeListEntry* pInsertionPos ) pView->SetRasterOp( eOldOp ); } -// Delete all submenus of a PopupMenu, recursively -static void lcl_DeleteSubPopups(PopupMenu* pPopup) -{ - for(sal_uInt16 i = 0; i < pPopup->GetItemCount(); i++) - { - VclPtr<PopupMenu> pSubPopup = pPopup->GetPopupMenu( pPopup->GetItemId( i )); - if(pSubPopup) - { - lcl_DeleteSubPopups(pSubPopup); - pPopup->DisposePopupMenu( pPopup->GetItemId( i )); - } - } -} - void SvImpLBox::Command( const CommandEvent& rCEvt ) { CommandEventId nCommand = rCEvt.GetCommand(); @@ -3024,7 +3010,6 @@ void SvImpLBox::Command( const CommandEvent& rCEvt ) sal_uInt16 nMenuAction = pPopup->Execute( pView, aPopupPos ); if ( nMenuAction ) pView->ExecuteContextMenuAction( nMenuAction ); - lcl_DeleteSubPopups(pPopup.get()); pPopup.disposeAndClear(); } } |