diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 11:30:45 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 11:30:45 +0000 |
commit | dcf8f7e67116d579bb5d1d99cd8f35ff67884a9e (patch) | |
tree | 0a308561d522efa0fa6a9a7a15c2adda9c1e2b5a /transex3 | |
parent | c6e9d5a10494bbf89f6110ede508de3d5b8fb0f3 (diff) |
INTEGRATION: CWS gh7 (1.10.6); FILE MERGED
2004/09/13 11:34:39 gh 1.10.6.4: distinguish in gsi files between different linetypes e.g.:res and res-quickhelp
2004/09/09 14:56:57 gh 1.10.6.3: small fix in helptext
2004/09/07 09:52:09 gh 1.10.6.2: defined set of mandatory and optional XML tags
2004/08/27 14:51:11 gh 1.10.6.1: add detection of C-Style quoted XML-Tags e.g.: \<somestyle\>
Diffstat (limited to 'transex3')
-rw-r--r-- | transex3/source/gsicheck.cxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/transex3/source/gsicheck.cxx b/transex3/source/gsicheck.cxx index 267584a16020..da392941670c 100644 --- a/transex3/source/gsicheck.cxx +++ b/transex3/source/gsicheck.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gsicheck.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: hr $ $Date: 2004-08-02 15:51:01 $ + * last change: $Author: rt $ $Date: 2004-09-20 12:30:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,7 +129,7 @@ public: BOOL CheckSyntax( ULONG nLine, BOOL bRequireSourceLine ); BOOL WriteError( SvStream &aErrOut ); - void WriteCorrect( SvStream &aOkOut ); + void WriteCorrect( SvStream &aOkOut, BOOL bRequireSourceLine ); }; @@ -221,6 +221,8 @@ GSILine::GSILine( const ByteString &rLine, ULONG nLine ) aLineType = sTmp.Copy( nStart, nPos - nStart ); nStart = nPos + 4; // + length of the delemiter nPos = sTmp.Search( "($$)", nStart ); + aUniqId.Append( "/" ); + aUniqId.Append( aLineType ); } if ( nPos != STRING_NOTFOUND ) { @@ -438,9 +440,9 @@ BOOL GSIBlock::WriteError( SvStream &aErrOut ) return bHasError; } -void GSIBlock::WriteCorrect( SvStream &aOkOut ) +void GSIBlock::WriteCorrect( SvStream &aOkOut, BOOL bRequireSourceLine ) { - if ( !pSourceLine ) + if ( !pSourceLine && bRequireSourceLine ) return; BOOL bHasOK = FALSE; @@ -471,7 +473,7 @@ void Help() /*****************************************************************************/ { fprintf( stdout, "\n" ); - fprintf( stdout, "gsicheck Version 1.6.1 (c)1999 - 2001 by SUN Microsystems\n" ); + fprintf( stdout, "gsicheck Version 1.7.2 (c)1999 - 2001 by SUN Microsystems\n" ); fprintf( stdout, "=========================================================\n" ); fprintf( stdout, "\n" ); fprintf( stdout, "gsicheck checks the syntax of tags in GSI-Files and SDF-Files\n" ); @@ -485,7 +487,7 @@ void Help() fprintf( stdout, "-wc Write GSI-File containing all correct parts\n" ); fprintf( stdout, "-i Check records marked 'int' rather than marked 'ext' or similar\n" ); fprintf( stdout, "-l Numerical 2 digits Identifier of the source language. Default = 1\n" ); - fprintf( stdout, " Use "" (empty string) to disable source language dependent checks\n" ); + fprintf( stdout, " Use \"\" (empty string) to disable source language dependent checks\n" ); fprintf( stdout, "-r Reference filename to check that source language has not been changed\n" ); fprintf( stdout, "\n" ); } @@ -694,7 +696,7 @@ int _cdecl main( int argc, char *argv[] ) if ( bWriteError ) bFileHasError |= pBlock->WriteError( aErrOut ); if ( bWriteCorrect ) - pBlock->WriteCorrect( aOkOut ); + pBlock->WriteCorrect( aOkOut, aSourceLang.Len() ); delete pBlock; } @@ -762,7 +764,7 @@ int _cdecl main( int argc, char *argv[] ) if ( bWriteError ) bFileHasError |= pBlock->WriteError( aErrOut ); if ( bWriteCorrect ) - pBlock->WriteCorrect( aOkOut ); + pBlock->WriteCorrect( aOkOut, aSourceLang.Len() ); delete pBlock; } |