diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-07 10:49:55 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-07 11:33:12 +0000 |
| commit | 6c335f5754ec1aee70cdba2d332e9cece17a7565 (patch) | |
| tree | 01acd92ce6411e99e6498b11b467b41c47cd6c7f /l10ntools/inc/helpmerge.hxx | |
| parent | 47690422e42f5fce29b331218a2d05966c13946d (diff) | |
convert some archaic l10ntools code
Diffstat (limited to 'l10ntools/inc/helpmerge.hxx')
| -rw-r--r-- | l10ntools/inc/helpmerge.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx index a160b158091b..aeb61ae3e4af 100644 --- a/l10ntools/inc/helpmerge.hxx +++ b/l10ntools/inc/helpmerge.hxx @@ -64,7 +64,8 @@ public: /// Method merges the String from the SDFfile into XMLfile. Both Strings must /// point to existing files. - bool Merge( const ByteString &rSDFFile_in, const ByteString &rDestinationFile_in , ByteString& sLanguage , MergeDataFile& aMergeDataFile ); + bool Merge( const ByteString &rSDFFile_in, const ByteString &rDestinationFile_in , + const rtl::OString& sLanguage , MergeDataFile& aMergeDataFile ); bool Merge( const ByteString &rSDFFile, const ByteString &rPathX , const ByteString &rPathY , bool bISO , const std::vector<ByteString>& aLanguages , MergeDataFile& aMergeDataFile , bool bCreateDir ); |