loplugin:casttovoid: l10ntools

Change-Id: I9f21497e821632936074272b52879507f60afe65

l10ntools/inc/helpmerge.hxx

@@ -47,9 +47,8 @@ public:
     static bool CreatePO( const OString &rPOFile_in, const OString &sHelpFile,
                           XMLFile *pXmlFile, const OString &rGsi1 );
 
-/// Method merges the String from the POfile into XMLfile. Both Strings must
-/// point to existing files.
-    bool Merge( const OString &rPOFile_in, const OString &rDestinationFile_in ,
+/// Method merges the String into XMLfile, which must point to an existing file.
+    bool Merge( const OString &rDestinationFile_in ,
         const OString& sLanguage , MergeDataFile* pMergeDataFile );
 
 private:

l10ntools/source/helpex.cxx

@@ -94,7 +94,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
                     const OString sOutput(
                         aArgs.m_sOutputFile +
                         sXhpFile.copy( sXhpFile.lastIndexOf('/') ));
-                    if( !aParser.Merge( aArgs.m_sMergeSrc, sOutput,
+                    if( !aParser.Merge( sOutput,
                         aArgs.m_sLanguage, pMergeDataFile.get() ))
                     {
                         hasNoError = false;
@@ -113,7 +113,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
                 }
                 hasNoError =
                     aParser.Merge(
-                        aArgs.m_sMergeSrc, aArgs.m_sOutputFile,
+                        aArgs.m_sOutputFile,
                         aArgs.m_sLanguage, pMergeDataFile.get() );
             }
         }

l10ntools/source/helpmerge.cxx

@@ -142,12 +142,9 @@ bool HelpParser::CreatePO(
     return true;
 }
 
-bool HelpParser::Merge( const OString &rPOFile, const OString &rDestinationFile,
+bool HelpParser::Merge( const OString &rDestinationFile,
     const OString& rLanguage , MergeDataFile* pMergeDataFile )
 {
-
-    (void) rPOFile;
-
     SimpleXMLParser aParser;
 
     //TODO: explicit BOM handling?