diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-17 15:25:00 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-17 15:25:00 +0000 |
| commit | 1c1e93fabc5b840877d118220f0d65363747ffbd (patch) | |
| tree | c7613d433948f5ccb68cbaa9d964b0f48516ac7a | |
| parent | 56fa1cbca89fef5aa7115243f06cff1f046ac2ce (diff) | |
INTEGRATION: CWS hbqea101 (1.76.76); FILE MERGED
2004/05/05 15:05:38 hbrinkm 1.76.76.2: RESYNC: (1.76-1.77); FILE MERGED
2004/05/05 09:30:40 hbrinkm 1.76.76.1: #i21237# TOX patterns are vectors of tokens now
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index b9683c45ceb0..4da7635f7369 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8atr.cxx,v $ * - * $Revision: 1.77 $ + * $Revision: 1.78 $ * - * last change: $Author: obo $ $Date: 2004-04-27 14:13:06 $ + * last change: $Author: rt $ $Date: 2004-05-17 16:25:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1854,10 +1854,13 @@ int lcl_CheckForm( const SwForm& rForm, BYTE nLvl, String& rText ) int nRet = 4; rText.Erase(); - SwFormTokenEnumerator aIter( rForm.CreateTokenEnumerator( nLvl )); + // #i21237# + SwFormTokens aPattern = rForm.GetPattern(nLvl); + SwFormTokens::iterator aIt = aPattern.begin(); bool bPgNumFnd = false; FormTokenType eTType; - while( TOKEN_END != ( eTType = aIter.GetNextTokenType() ) && !bPgNumFnd ) + // #i21237# + while( TOKEN_END != ( eTType = (++aIt)->eTokenType ) && !bPgNumFnd ) { switch( eTType ) { @@ -1870,7 +1873,7 @@ int lcl_CheckForm( const SwForm& rForm, BYTE nLvl, String& rText ) break; case TOKEN_TEXT: nRet = 3; - rText = aIter.GetCurToken().sText.Copy( 0, 5 ); + rText = aIt->sText.Copy( 0, 5 ); // #i21237# break; case TOKEN_LINK_START: @@ -1893,9 +1896,13 @@ bool lcl_IsHyperlinked(const SwForm& rForm, USHORT nTOXLvl) { for (USHORT nI = 1; nI < nTOXLvl; ++nI) { - SwFormTokenEnumerator aIter( rForm.CreateTokenEnumerator(nI)); + // #i21237# + SwFormTokens aPattern = rForm.GetPattern(nI); + SwFormTokens::iterator aIt = aPattern.begin(); + FormTokenType eTType; - while (TOKEN_END != (eTType = aIter.GetNextTokenType())) + // #i21237# + while (TOKEN_END != (eTType = (++aIt)->eTokenType)) { switch (eTType) { @@ -2031,16 +2038,18 @@ void SwWW8Writer::StartTOX( const SwSection& rSect ) if( nLvl != nMinLvl ) { // collect this templates into the \t otion - for( n = rColls.Count(); n; ) - if( MAXLEVEL > (nLvl = ( pColl = - rColls[ --n ] )->GetOutlineLevel() ) && - nMinLvl <= nLvl ) + for( n = rColls.Count(); n;) + { + pColl = rColls[--n]; + nLvl = pColl->GetOutlineLevel(); + if (MAXLEVEL > nLvl && nMinLvl <= nLvl) { if( sTOption.Len() ) sTOption += ';'; (( sTOption += pColl->GetName() ) += ';' ) += String::CreateFromInt32( nLvl + 1 ); } + } } } |