SvxSmartTagsControl: Do not leak sub menus

And while on it, move other things to smart pointers as well.

Change-Id: I8b234b8a9fe60e0ca82bb08e48f6b7db94cbcd4d

1 files changed, 4 insertions, 6 deletions

diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 0a47bf94046e..ab7d1fd1a63e 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -45,7 +45,7 @@ SvxSmartTagsControl::SvxSmartTagsControl
     mrParent    ( rMenu ),
     mpSmartTagItem( nullptr )
 {
-    rMenu.SetPopupMenu( _nId, mpMenu );
+    rMenu.SetPopupMenu( _nId, mpMenu.get() );
 }
 
 
@@ -93,12 +93,13 @@ void SvxSmartTagsControl::FillMenu()
         const OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, rLocale);
 
         // no sub-menus if there's only one smart tag type listed:
-        PopupMenu* pSbMenu = mpMenu;
+        PopupMenu* pSbMenu = mpMenu.get();
         if ( 1 < rActionComponentsSequence.getLength() )
         {
             mpMenu->InsertItem(nMenuId, aSmartTagCaption, MenuItemBits::NONE, OString(), nMenuPos++);
             pSbMenu = new PopupMenu;
             mpMenu->SetPopupMenu( nMenuId++, pSbMenu );
+            maSubMenus.push_back( std::unique_ptr< PopupMenu >( pSbMenu ) );
         }
         pSbMenu->SetSelectHdl( LINK( this, SvxSmartTagsControl, MenuSelect ) );
 
@@ -145,8 +146,7 @@ void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const S
         const SvxSmartTagItem* pSmartTagItem = dynamic_cast<const SvxSmartTagItem*>( pState  );
         if ( nullptr != pSmartTagItem )
         {
-            delete mpSmartTagItem;
-            mpSmartTagItem = new SvxSmartTagItem( *pSmartTagItem );
+            mpSmartTagItem.reset( new SvxSmartTagItem( *pSmartTagItem ) );
             FillMenu();
         }
     }
@@ -192,8 +192,6 @@ IMPL_LINK_TYPED( SvxSmartTagsControl, MenuSelect, Menu *, pMen, bool )
 
 SvxSmartTagsControl::~SvxSmartTagsControl()
 {
-    delete mpSmartTagItem;
-    delete mpMenu;
 }