loplugin:useuniqueptr in SwXMLImport

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

sw/source/filter/xml/xmlimp.cxx

@@ -59,6 +59,7 @@
 #include <strings.hrc>
 #include <svl/stritem.hxx>
 #include "xmlimp.hxx"
+#include "xmlimpit.hxx"
 #include "xmltexti.hxx"
 #include <list.hxx>
 #include <swdll.hxx>
@@ -358,7 +359,7 @@ void SwXMLDocStylesContext_Impl::EndElement()
 const SvXMLTokenMap& SwXMLImport::GetDocElemTokenMap()
 {
     if( !m_pDocElemTokenMap )
-        m_pDocElemTokenMap = new SvXMLTokenMap( aDocTokenMap );
+        m_pDocElemTokenMap.reset( new SvXMLTokenMap( aDocTokenMap ) );
 
     return *m_pDocElemTokenMap;
 }
@@ -436,9 +437,9 @@ SwXMLImport::~SwXMLImport() throw ()
         SAL_WARN("sw", "endDocument skipped, dropping shapes now to avoid dangling SvTextShapeImportHelper pointing to this");
         ClearShapeImport();
     }
-    delete m_pDocElemTokenMap;
-    delete m_pTableElemTokenMap;
-    delete m_pTableCellAttrTokenMap;
+    m_pDocElemTokenMap.reset();
+    m_pTableElemTokenMap.reset();
+    m_pTableCellAttrTokenMap.reset();
     FinitItemImport();
 }
 

sw/source/filter/xml/xmlimp.hxx

@@ -63,11 +63,11 @@ class SwXMLImport: public SvXMLImport
 {
     std::unique_ptr<SwNodeIndex> m_pSttNdIdx;
 
-    SvXMLUnitConverter      *m_pTwipUnitConv;
-    SvXMLImportItemMapper   *m_pTableItemMapper;// paragraph item import
-    SvXMLTokenMap           *m_pDocElemTokenMap;
-    SvXMLTokenMap           *m_pTableElemTokenMap;
-    SvXMLTokenMap           *m_pTableCellAttrTokenMap;
+    std::unique_ptr<SvXMLUnitConverter> m_pTwipUnitConv;
+    std::unique_ptr<SvXMLImportItemMapper> m_pTableItemMapper;// paragraph item import
+    std::unique_ptr<SvXMLTokenMap> m_pDocElemTokenMap;
+    std::unique_ptr<SvXMLTokenMap> m_pTableElemTokenMap;
+    std::unique_ptr<SvXMLTokenMap> m_pTableCellAttrTokenMap;
 
     rtl::Reference<SvXMLGraphicHelper> m_xGraphicStorageHandler;
 

sw/source/filter/xml/xmlitemi.cxx

@@ -318,21 +318,21 @@ SvXMLImportContextRef SwXMLItemSetContext_Impl::CreateChildContext(
 
 void SwXMLImport::InitItemImport()
 {
-    m_pTwipUnitConv = new SvXMLUnitConverter( GetComponentContext(),
-            util::MeasureUnit::TWIP, util::MeasureUnit::TWIP );
+    m_pTwipUnitConv.reset( new SvXMLUnitConverter( GetComponentContext(),
+            util::MeasureUnit::TWIP, util::MeasureUnit::TWIP ) );
 
     m_xTableItemMap = new SvXMLItemMapEntries( aXMLTableItemMap );
     m_xTableColItemMap = new SvXMLItemMapEntries( aXMLTableColItemMap );
     m_xTableRowItemMap = new SvXMLItemMapEntries( aXMLTableRowItemMap );
     m_xTableCellItemMap = new SvXMLItemMapEntries( aXMLTableCellItemMap );
 
-    m_pTableItemMapper = new SwXMLImportTableItemMapper_Impl( m_xTableItemMap );
+    m_pTableItemMapper.reset( new SwXMLImportTableItemMapper_Impl( m_xTableItemMap ) );
 }
 
 void SwXMLImport::FinitItemImport()
 {
-    delete m_pTableItemMapper;
-    delete m_pTwipUnitConv;
+    m_pTableItemMapper.reset();
+    m_pTwipUnitConv.reset();
 }
 
 SvXMLImportContext *SwXMLImport::CreateTableItemImportContext(

sw/source/filter/xml/xmltbli.cxx

@@ -152,7 +152,7 @@ static const SvXMLTokenMapEntry aTableCellAttrTokenMap[] =
 const SvXMLTokenMap& SwXMLImport::GetTableElemTokenMap()
 {
     if( !m_pTableElemTokenMap )
-        m_pTableElemTokenMap = new SvXMLTokenMap( aTableElemTokenMap );
+        m_pTableElemTokenMap.reset(new SvXMLTokenMap( aTableElemTokenMap ));
 
     return *m_pTableElemTokenMap;
 }
@@ -160,7 +160,7 @@ const SvXMLTokenMap& SwXMLImport::GetTableElemTokenMap()
 const SvXMLTokenMap& SwXMLImport::GetTableCellAttrTokenMap()
 {
     if( !m_pTableCellAttrTokenMap )
-        m_pTableCellAttrTokenMap = new SvXMLTokenMap( aTableCellAttrTokenMap );
+        m_pTableCellAttrTokenMap.reset(new SvXMLTokenMap( aTableCellAttrTokenMap ));
 
     return *m_pTableCellAttrTokenMap;
 }