diff options
Diffstat (limited to 'l10ntools/source')
-rw-r--r-- | l10ntools/source/helpex.cxx | 4 | ||||
-rw-r--r-- | l10ntools/source/helpmerge.cxx | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx index 660b016cabcd..be64a4a639ea 100644 --- a/l10ntools/source/helpex.cxx +++ b/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() ); } } diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index 007c3e04441d..af48e3c86c85 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/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? |