diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-07-02 22:31:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-02 22:31:43 +0200 |
| commit | 5c2002d0d2a0dafe4d4315946c76cef6b2adb9a6 (patch) | |
| tree | 2def7e2eb75dd0eeeef52ae2c6f05bf715fe89e6 /l10ntools | |
| parent | 66d19e8f6acda6de9300d86cb15edd2dd5f7228f (diff) | |
loplugin:casttovoid: l10ntools
Change-Id: I9f21497e821632936074272b52879507f60afe65
Diffstat (limited to 'l10ntools')
| -rw-r--r-- | l10ntools/inc/helpmerge.hxx | 5 | ||||
| -rw-r--r-- | l10ntools/source/helpex.cxx | 4 | ||||
| -rw-r--r-- | l10ntools/source/helpmerge.cxx | 5 |
3 files changed, 5 insertions, 9 deletions
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx index f5af853a51d0..5837cc2f7765 100644 --- a/l10ntools/inc/helpmerge.hxx +++ b/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: 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? |