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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/tabpages/numpages.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/tpline.cxx | 12 |
2 files changed, 0 insertions, 16 deletions
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index fc2719c15c77..5846d9ea4f65 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1188,10 +1188,6 @@ SvxNumOptionsTabPage::~SvxNumOptionsTabPage() void SvxNumOptionsTabPage::dispose() { - if (m_pBitmapMB) - { - m_pBitmapMB->GetPopupMenu()->DisposePopupMenu(m_nGalleryId); - } delete pActNum; pActNum = nullptr; delete pSaveNum; diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 43f51a5485fd..11ffd614387d 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -227,18 +227,6 @@ SvxLineTabPage::~SvxLineTabPage() void SvxLineTabPage::dispose() { - // Symbols on a line (e.g. StarCharts), dtor new! - if (m_pSymbolMB) - { - m_pSymbolMB->GetPopupMenu()->DisposePopupMenu( MN_GALLERY ); - - if(m_pSymbolList) - { - m_pSymbolMB->GetPopupMenu()->DisposePopupMenu( MN_SYMBOLS ); - } - m_pSymbolMB = nullptr; - } - for (SvxBmpItemInfo* pInfo : m_aGrfBrushItems) { delete pInfo->pBrushItem; |