diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-06-13 10:41:07 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-06-13 10:41:07 +0000 |
| commit | f5241a67a5d06c0297a4de36b5ff9f79cb9430ac (patch) | |
| tree | bf86af36d3ec9b9a60762b706d50906870a286ef /transex3 | |
| parent | c5f5378466c24c8ca78dce1d06f1276a0921fc74 (diff) | |
INTEGRATION: CWS rcmerge (1.5.34); FILE MERGED
2003/06/11 09:57:38 nf 1.5.34.1: #i13369# removed warnings
Diffstat (limited to 'transex3')
| -rw-r--r-- | transex3/source/xrmmerge.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/transex3/source/xrmmerge.cxx b/transex3/source/xrmmerge.cxx index 5143d2e101aa..4dcbc2c11825 100644 --- a/transex3/source/xrmmerge.cxx +++ b/transex3/source/xrmmerge.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xrmmerge.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: er $ $Date: 2002-12-12 17:00:09 $ + * last change: $Author: hr $ $Date: 2003-06-13 11:41:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,8 +68,8 @@ #include "utf8conv.hxx" #include "tokens.h" -extern "C" { yyerror( char * ); } -extern "C" { YYWarning( char * ); } +extern "C" { int yyerror( char * ); } +extern "C" { int YYWarning( char * ); } // defines to parse command line #define STATE_NON 0x0001 @@ -438,7 +438,7 @@ ByteString XRMResParser::GetAttribute( const ByteString &rToken, const ByteStrin ByteString sSearch( " " ); sSearch += rAttribute; sSearch += "="; - short nPos = sTmp.Search( sSearch ); + int nPos = sTmp.Search( sSearch ); if ( nPos != STRING_NOTFOUND ) { sTmp = sTmp.Copy( nPos ); |