diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-06-13 10:40:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-06-13 10:40:45 +0000 |
| commit | 3fc1bc6439283aa00d81c1230474bbb78d563b07 (patch) | |
| tree | 36125b1d1f8fc61456a9b803f2b6c146ba7fdb49 /transex3 | |
| parent | 66fe60bd276ee99721ad1756c12bfea356d7f57b (diff) | |
INTEGRATION: CWS rcmerge (1.32.6); FILE MERGED
2003/06/11 09:57:38 nf 1.32.6.1: #i13369# removed warnings
Diffstat (limited to 'transex3')
| -rw-r--r-- | transex3/source/export.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/transex3/source/export.cxx b/transex3/source/export.cxx index 485e76b0cbdc..9b4d35e154ac 100644 --- a/transex3/source/export.cxx +++ b/transex3/source/export.cxx @@ -2,9 +2,9 @@ * * $RCSfile: export.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: hr $ $Date: 2003-04-29 16:48:05 $ + * last change: $Author: hr $ $Date: 2003-06-13 11:40:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,8 +67,8 @@ #include "tokens.h" #include "utf8conv.hxx" -extern "C" { yyerror( char * ); } -extern "C" { YYWarning( char * ); } +extern "C" { int yyerror( char * ); } +extern "C" { int YYWarning( char * ); } Export *pExport = 0L; @@ -1044,10 +1044,10 @@ int Export::Execute( int nToken, char * pToken ) sMapping.EraseAllChars( ' ' ); sMapping.EraseAllChars( '\t' ); if ( sKey.ToUpperAscii() == "SIZE" ) { - pResData->nWidth = sMapping.GetToken( 0, ',' ).ToInt64(); + pResData->nWidth = ( USHORT ) sMapping.GetToken( 0, ',' ).ToInt64(); } else if ( sKey == "POSSIZE" ) { - pResData->nWidth = sMapping.GetToken( 2, ',' ).ToInt64(); + pResData->nWidth = ( USHORT ) sMapping.GetToken( 2, ',' ).ToInt64(); } } break; @@ -1126,7 +1126,7 @@ int Export::Execute( int nToken, char * pToken ) case TEXTREFID : { bDontWriteOutput = TRUE; ByteString sKey = sToken.GetToken( 0, '=' ).EraseAllChars( '\t' ).EraseAllChars( ' ' ); - USHORT nRefId = sToken.GetToken( 1, '=' ).GetToken( 0, ';' ).EraseAllChars( '\t' ).EraseAllChars( ' ' ).ToInt32(); + USHORT nRefId = ( USHORT ) sToken.GetToken( 1, '=' ).GetToken( 0, ';' ).EraseAllChars( '\t' ).EraseAllChars( ' ' ).ToInt32(); if (( sKey.ToUpperAscii() == "TEXT" ) || ( sKey == "MESSAGE" ) || ( sKey == "CUSTOMUNITTEXT" ) || |