summaryrefslogtreecommitdiff
path: root/svx/source/mnuctrls
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2016-10-27 20:15:23 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2016-10-27 20:19:40 +0300
commit4433d95b374c13a3501cdf3a6e273f68eb49873a (patch)
treea374148cdeef3b15abfbab9c90352e873a63685f /svx/source/mnuctrls
parenta3b44da9482eb8a0095c85314cd71b7bafb38b29 (diff)
MenuItemData now properly disposes the submenu
At least since: 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: Ib1bc70e8e66f2be123d8a3e5d5e213775e9a5762
Diffstat (limited to 'svx/source/mnuctrls')
-rw-r--r--svx/source/mnuctrls/smarttagmenu.cxx5
1 files changed, 0 insertions, 5 deletions
diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx
index d1d279bd5a58..404062f830aa 100644
--- a/svx/source/mnuctrls/smarttagmenu.cxx
+++ b/svx/source/mnuctrls/smarttagmenu.cxx
@@ -50,7 +50,6 @@ private:
sal_uInt32 nActionID ) : m_xAction( xAction ), m_xSmartTagProperties( xSmartTagProperties ), m_nActionID( nActionID ) {}
};
std::vector< InvokeAction > m_aInvokeActions;
- std::vector< VclPtr< PopupMenu > > m_aSubMenus;
std::unique_ptr< const SvxSmartTagItem > m_pSmartTagItem;
};
@@ -61,15 +60,12 @@ SmartTagMenuController::SmartTagMenuController( const css::uno::Reference< css::
SmartTagMenuController::~SmartTagMenuController()
{
- for (auto& i : m_aSubMenus)
- i.disposeAndClear();
}
void SmartTagMenuController::statusChanged( const css::frame::FeatureStateEvent& rEvent )
throw ( css::uno::RuntimeException, std::exception )
{
resetPopupMenu( m_xPopupMenu );
- m_aSubMenus.clear();
css::uno::Sequence< css::beans::PropertyValue > aProperties;
if ( rEvent.IsEnabled && ( rEvent.State >>= aProperties ) )
@@ -155,7 +151,6 @@ void SmartTagMenuController::FillMenu()
pVCLMenu->InsertItem( nMenuId, aSmartTagCaption );
VclPtrInstance<PopupMenu> pMenu;
pSubMenu = pMenu;
- m_aSubMenus.push_back( pMenu );
pVCLMenu->SetPopupMenu( nMenuId++, pSubMenu );
}
pSubMenu->SetSelectHdl( LINK( this, SmartTagMenuController, MenuSelect ) );