diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-06-13 10:40:34 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-06-13 10:40:34 +0000 |
| commit | 66fe60bd276ee99721ad1756c12bfea356d7f57b (patch) | |
| tree | d25e5c44e0cae5d03df72cf31ebffb1d377099a6 /transex3 | |
| parent | 0c526de3d298f7b43c20768e89c692700d9657d3 (diff) | |
INTEGRATION: CWS rcmerge (1.25.6); FILE MERGED
2003/06/11 09:57:37 nf 1.25.6.1: #i13369# removed warnings
Diffstat (limited to 'transex3')
| -rw-r--r-- | transex3/source/cfgmerge.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/transex3/source/cfgmerge.cxx b/transex3/source/cfgmerge.cxx index e0efea8a2dfc..26f465e7b2a2 100644 --- a/transex3/source/cfgmerge.cxx +++ b/transex3/source/cfgmerge.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cfgmerge.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: hr $ $Date: 2003-04-29 16:47:57 $ + * last change: $Author: hr $ $Date: 2003-06-13 11:40:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,8 +68,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 * ); } // defines to parse command line #define STATE_NON 0x0001 @@ -844,7 +844,7 @@ void CfgMerge::WorkOnRessourceEnd() ( nIndex != ENGLISH_INDEX ) && ( LANGUAGE_ALLOWED( nIndex )) && ( pEntrys->GetText( - sContent, STRING_TYP_TEXT, nIndex, TRUE )) && + sContent, STRING_TYP_TEXT, ( USHORT ) nIndex, TRUE )) && ( sContent != "-" ) && ( sContent.Len())) { ByteString sText = UTF8Converter::ConvertToUTF8( @@ -864,7 +864,7 @@ void CfgMerge::WorkOnRessourceEnd() ByteString sReplace = sTemp.GetToken( 0, '\"' ); sReplace += "\""; - sReplace += Export::GetIsoLangByIndex( nIndex ); + sReplace += Export::GetIsoLangByIndex(( USHORT ) nIndex ); sReplace += "\""; sTextTag.SearchAndReplace( sSearch, sReplace ); |