loplugin:useuniqueptr in l10ntools

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

l10ntools/source/helpmerge.cxx

@@ -150,14 +150,13 @@ bool HelpParser::Merge( const OString &rDestinationFile,
 
     //TODO: explicit BOM handling?
 
-    XMLFile* xmlfile = aParser.Execute( sHelpFile, new XMLFile( OString('0') ) );
+    std::unique_ptr<XMLFile> xmlfile(aParser.Execute( sHelpFile, new XMLFile( OString('0') ) ));
     if (!xmlfile)
     {
         SAL_WARN("l10ntools", "could not parse " << sHelpFile);
         return false;
     }
-    MergeSingleFile( xmlfile , pMergeDataFile , rLanguage , rDestinationFile );
-    delete xmlfile;
+    MergeSingleFile( xmlfile.get() , pMergeDataFile , rLanguage , rDestinationFile );
     return true;
 }
 

l10ntools/source/treemerge.cxx

@@ -253,11 +253,11 @@ void TreeParser::Merge(
     assert( m_bIsInitialized );
 
     const xmlNodePtr pRootNode = xmlDocGetRootElement( m_pSource );
-    MergeDataFile* pMergeDataFile = nullptr;
+    std::unique_ptr<MergeDataFile> pMergeDataFile;
     if( m_sLang != "qtz" && m_sLang != "en-US" )
     {
-        pMergeDataFile = new MergeDataFile(
-            rMergeSrc, static_cast<OString>( m_pSource->name ), false, false );
+        pMergeDataFile.reset(new MergeDataFile(
+            rMergeSrc, static_cast<OString>( m_pSource->name ), false, false ));
         const std::vector<OString> vLanguages = pMergeDataFile->GetLanguages();
         if( vLanguages.size()>=1 && vLanguages[0] != m_sLang )
         {
@@ -266,15 +266,14 @@ void TreeParser::Merge(
                     " Mergedata file: ")
                 << m_sLang << " - "
                 << vLanguages[0] << std::endl;
-            delete pMergeDataFile;
             return;
         }
     }
     lcl_MergeLevel(
         m_pSource, pRootNode, reinterpret_cast<const xmlChar *>("help_section"),
-        pMergeDataFile, m_sLang, rXhpRoot );
+        pMergeDataFile.get(), m_sLang, rXhpRoot );
 
-    delete pMergeDataFile;
+    pMergeDataFile.reset();
     xmlSaveFile( rDestinationFile.getStr(), m_pSource );
     xmlFreeDoc( m_pSource );
     xmlCleanupParser();