diff options
| author | Nils Fuhrmann <nf@openoffice.org> | 2001-04-25 09:17:04 +0000 |
|---|---|---|
| committer | Nils Fuhrmann <nf@openoffice.org> | 2001-04-25 09:17:04 +0000 |
| commit | a29b01ab8255ee0d83fce6656e43d6dbb7e03c14 (patch) | |
| tree | 1f8241fe3ebb876b7b63949a0f60650eb30bfca9 /transex3/source/merge.cxx | |
| parent | ddd11d46bd92e34cc286e25b1194048c81289a0d (diff) | |
Support of UTF8 input/output
Diffstat (limited to 'transex3/source/merge.cxx')
| -rw-r--r-- | transex3/source/merge.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/transex3/source/merge.cxx b/transex3/source/merge.cxx index 8c7def77c14e..8e4bcd354367 100644 --- a/transex3/source/merge.cxx +++ b/transex3/source/merge.cxx @@ -2,9 +2,9 @@ * * $RCSfile: merge.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: nf $ $Date: 2001-04-05 09:22:28 $ + * last change: $Author: nf $ $Date: 2001-04-25 10:17:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,6 +61,7 @@ #include <stdio.h> #include <tools/fsys.hxx> #include "export.hxx" +#include "utf8conv.hxx" // // class PFormEntrys @@ -154,7 +155,7 @@ BOOL MergeData::operator==( ResData *pData ) /*****************************************************************************/ MergeDataFile::MergeDataFile( const ByteString &rFileName, BOOL bErrLog, - CharSet aCharSet ) + CharSet aCharSet, BOOL bUTF8 ) /*****************************************************************************/ : bErrorLog( bErrLog ) { @@ -211,6 +212,10 @@ MergeDataFile::MergeDataFile( const ByteString &rFileName, BOOL bErrLog, sPFO = sLine.GetToken( 4, '\t' ); sPFO = sPFO.Copy( 1 ); sPFO.Erase( sPFO.Len() - 1 ); nLANG = sLine.GetToken( 5, '\t' ).ToInt32(); + + if ( bUTF8 ) + sLine = UTF8Converter::ConvertFromUTF8( sLine, Export::GetCharSet( nLANG )); + sTEXT = sLine.GetToken( 6, '\t' ); sTEXT = sTEXT.Copy( 1 ); sTEXT.Erase( sTEXT.Len() - 1 ); sQHTEXT = sLine.GetToken( 8, '\t' ); |