diff options
Diffstat (limited to 'cui/source/tabpages/tpline.cxx')
| -rw-r--r-- | cui/source/tabpages/tpline.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 4c12af016a0e..ca323ab469ea 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -229,10 +229,14 @@ void SvxLineTabPage::dispose() // Symbols on a line (e.g. StarCharts), dtor new! if (m_pSymbolMB) { - delete m_pSymbolMB->GetPopupMenu()->GetPopupMenu( MN_GALLERY ); + VclPtr<PopupMenu> p = m_pSymbolMB->GetPopupMenu()->GetPopupMenu( MN_GALLERY ); + p.disposeAndClear(); // NoelG: dodgy, this leaves a dangling pointer if(m_pSymbolList) - delete m_pSymbolMB->GetPopupMenu()->GetPopupMenu( MN_SYMBOLS ); + { + VclPtr<PopupMenu> p2 = m_pSymbolMB->GetPopupMenu()->GetPopupMenu( MN_SYMBOLS ); + p2.disposeAndClear(); // NoelG: dodgy, this leaves a dangling pointer + } m_pSymbolMB = nullptr; } @@ -290,7 +294,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton) // Get gallery entries GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, m_aGrfNames); - PopupMenu* pPopup = new PopupMenu; + VclPtrInstance<PopupMenu> pPopup; sal_uInt32 i = 0; m_nNumMenuGalleryItems = m_aGrfNames.size(); for(std::vector<OUString>::iterator it = m_aGrfNames.begin(); it != m_aGrfNames.end(); ++it, ++i) @@ -363,7 +367,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton) pView->hideMarkHandles(); pView->ShowSdrPage(pPage); - PopupMenu* pPopup = new PopupMenu; + VclPtrInstance<PopupMenu> pPopup; // Generate invisible square to give all symbols a // bitmap size, which is independent from specific glyph |