loplugin:useuniqueptr in SvxIconChoiceCtrl_Impl

Change-Id: I01524abe1059e79a77c54c8b00c7f43a8575283f
Reviewed-on: https://gerrit.libreoffice.org/53600Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

svtools/source/contnr/imivctl.hxx

@@ -173,7 +173,7 @@ class SvxIconChoiceCtrl_Impl
     long                    nMaxVirtWidth;  // max. width aVirtOutputSize for ALIGN_TOP
     long                    nMaxVirtHeight; // max. height aVirtOutputSize for ALIGN_LEFT
     std::unique_ptr<SvxIconChoiceCtrlEntryList_impl> pZOrderList;
-    SvxIconChoiceCtrlColumnInfoMap* m_pColumns;
+    std::unique_ptr<SvxIconChoiceCtrlColumnInfoMap> m_pColumns;
     VclPtr<IcnViewEdit_Impl>   pEdit;
     WinBits                 nWinBits;
     long                    nMaxBoundHeight;            // height of highest BoundRects

svtools/source/contnr/imivctl1.cxx

@@ -3294,17 +3294,13 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt )
 
 void SvxIconChoiceCtrl_Impl::ClearColumnList()
 {
-    if (!m_pColumns)
-        return;
-
-    m_pColumns->clear();
-    DELETEZ(m_pColumns);
+    m_pColumns.reset();
 }
 
 void SvxIconChoiceCtrl_Impl::SetColumn( sal_uInt16 nIndex, const SvxIconChoiceCtrlColumnInfo& rInfo)
 {
     if (!m_pColumns)
-        m_pColumns = new SvxIconChoiceCtrlColumnInfoMap;
+        m_pColumns.reset(new SvxIconChoiceCtrlColumnInfoMap);
 
     SvxIconChoiceCtrlColumnInfo* pInfo = new SvxIconChoiceCtrlColumnInfo( rInfo );
     m_pColumns->insert(std::make_pair(nIndex, std::unique_ptr<SvxIconChoiceCtrlColumnInfo>(pInfo)));