diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 15:21:10 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 15:21:10 +0000 |
| commit | efd7afb02082eb0ec3df0bf4a6493850d0c866bb (patch) | |
| tree | 4e518c0a9c3548ed0f6384ba32ff7964dc54c1e0 /xml2cmp | |
| parent | 0f92531c516d010f2116a614a0c0c4ec8dceea7b (diff) | |
INTEGRATION: CWS ooo20031110 (1.7.22); FILE MERGED
2003/11/10 10:13:09 waratah 1.7.22.2: #i22301# resolve for scope issues
2003/10/30 13:12:02 waratah 1.7.22.1: #i21906# work on getting rid of risky permissive option in gcc compiler
Diffstat (limited to 'xml2cmp')
| -rw-r--r-- | xml2cmp/source/xcd/parse.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/xml2cmp/source/xcd/parse.cxx b/xml2cmp/source/xcd/parse.cxx index e95b880cefd2..6d54c3840a48 100644 --- a/xml2cmp/source/xcd/parse.cxx +++ b/xml2cmp/source/xcd/parse.cxx @@ -2,9 +2,9 @@ * * $RCSfile: parse.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $Date$ + * last change: $Author: rt $Date$ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -268,13 +268,14 @@ X2CParser::Parse_MultipleAttr( List<Simstr> & o_rAttrValues, Simstr sAttrName; Simstr sAttrValue; unsigned nSize = i_rAttrNames.size(); + unsigned i; for ( Pass_White(); *text != '/'; Pass_White() ) { Get_Attribute(sAttrValue, sAttrName); - for ( unsigned i = 0; i < nSize; ++i ) + for ( i = 0; i < nSize; ++i ) { if ( i_rAttrNames[i] == sAttrName ) { @@ -365,8 +366,9 @@ X2CParser::GetTextTill( Simstr & o_rText, bool i_bReverseName ) { char * pResult = &sWord[0]; + char * pSet; - for ( char * pSet = pResult; + for ( pSet = pResult; *text != i_cEnd; ++text ) { @@ -383,7 +385,7 @@ X2CParser::GetTextTill( Simstr & o_rText, if (i_bReverseName) { - const nMaxLen = 1000; + const int nMaxLen = 1000; if (strlen(pResult) < nMaxLen) { char * sBreak = strrchr(pResult,'.'); |