diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-10-30 14:34:18 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-10-30 15:50:31 +0200 |
| commit | 94876fe2704cb5107234ad76c86122ac9d95f866 (patch) | |
| tree | d55701606099ce3db9f3b051166a4ba33fb58e7f /sc | |
| parent | 99da628e17e873a5fa2f726e7a1732b21c3d4b33 (diff) | |
Let Menu dispose submenus
(I'm not sure about how good are the changes from ScopedVclPtr
to non-scoped, and disposeAndClear to clear. They aren't really
needed, because of the VclReferenceBase::mbDisposed logic. But
at least they should be safe, as long as we have disposeOnce
calls in Menu's dtor.)
See also previous commits:
4433d95b374c13a3501cdf3a6e273f68eb49873a
("MenuItemData now properly disposes the submenu")
89c23b4aaef931b5d6009efaf44ce6e6c976e8d4
("Sub menus no longer need manual disposing")
Change-Id: I9d455a94590f5eec9b097947f6984f1b3e477b52
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/navipi/content.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index fd5bb59af9d4..5139c369dc80 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -580,14 +580,14 @@ void ScContentTree::Command( const CommandEvent& rCEvt ) // Drag-Drop Modus ScopedVclPtrInstance<PopupMenu> aPop; - ScopedVclPtrInstance<ScPopupMenu> aDropMenu( ScResId( RID_POPUP_DROPMODE ) ); + VclPtrInstance<ScPopupMenu> aDropMenu( ScResId( RID_POPUP_DROPMODE ) ); aDropMenu->CheckItem( RID_DROPMODE_URL + pParentWindow->GetDropMode() ); aPop->InsertItem( 1, pParentWindow->GetStrDragMode() ); aPop->SetPopupMenu( 1, aDropMenu.get() ); // angezeigtes Dokument - ScopedVclPtrInstance<ScPopupMenu> aDocMenu; + VclPtrInstance<ScPopupMenu> aDocMenu; aDocMenu->SetMenuFlags( aDocMenu->GetMenuFlags() | MenuFlags::NoAutoMnemonics ); sal_uInt16 i=0; sal_uInt16 nPos=0; |