diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-01-05 08:46:42 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-01-05 08:46:42 +0000 |
| commit | 646f4f18eb4504c35a5772f8249b837dc06cf672 (patch) | |
| tree | 8ad80acdaa1e3a5a1dc0bf0e9720f4a46607f5c6 /transex3 | |
| parent | 84533948bee3735e9d5edd5e861db5a4816d3c9f (diff) | |
INTEGRATION: CWS ivo04 (1.30.34); FILE MERGED
2003/12/23 12:51:35 ihi 1.30.34.1: #110250# #i15636# #110908# Write Unix lineends && additional \n removed
Diffstat (limited to 'transex3')
| -rw-r--r-- | transex3/source/localize.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/transex3/source/localize.cxx b/transex3/source/localize.cxx index e487ac706c8a..f30eb3634c4f 100644 --- a/transex3/source/localize.cxx +++ b/transex3/source/localize.cxx @@ -2,9 +2,9 @@ * * $RCSfile: localize.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: hr $ $Date: 2003-07-16 17:44:02 $ + * last change: $Author: rt $ $Date: 2004-01-05 09:46:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -571,7 +571,6 @@ BOOL SourceTreeLocalizer::MergeSingleFile( aPath.SetCWD(); system( sCommand.GetBuffer()); - SvFileStream aInStream( aOut.GetFull(), STREAM_READ ); if ( !aInStream.IsOpen()) { fprintf( stderr, @@ -586,7 +585,6 @@ BOOL SourceTreeLocalizer::MergeSingleFile( ByteString test(myStr2,RTL_TEXTENCODING_ASCII_US); SvFileStream aOutStream( myStr2, STREAM_STD_WRITE | STREAM_TRUNC ); - if ( !aOutStream.IsOpen()) { ByteString test2(myStr2,RTL_TEXTENCODING_ASCII_US); fprintf( stderr,"ERROR: Unable to open file %s for modification!\n", test2.GetBuffer()); @@ -595,11 +593,12 @@ BOOL SourceTreeLocalizer::MergeSingleFile( else { ByteString sLine; - aOutStream.SetLineDelimiter( LINEEND_CRLF ); - while ( !aInStream.IsEof()) { - aInStream.ReadLine( sLine ); - sLine.EraseAllChars( '\r' ); + aOutStream.SetLineDelimiter( LINEEND_LF ); + + aInStream.ReadLine( sLine ); + while ( !aInStream.IsEof()) { aOutStream.WriteLine( sLine ); + aInStream.ReadLine( sLine ); } aInStream.Close(); aOutStream.Close(); |