diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-03-25 11:52:47 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-03-25 11:52:47 +0000 |
| commit | e1e46a9d5fd54173e8f145aa87a07c2d599513e4 (patch) | |
| tree | d279f8869509097d209f6ebbc5675d97fc2c4ae0 /sw/source/core/text | |
| parent | e70a0222d4be3da885538305a0eeff8256284e8d (diff) | |
INTEGRATION: CWS tabstops (1.79.44); FILE MERGED
2004/02/16 08:17:24 fme 1.79.44.3: RESYNC: (1.80-1.81); FILE MERGED
2003/12/05 14:35:04 fme 1.79.44.2: RESYNC: (1.79-1.80); FILE MERGED
2003/11/28 12:32:23 fme 1.79.44.1: #114143# Tab stop compatibility
Diffstat (limited to 'sw/source/core/text')
| -rw-r--r-- | sw/source/core/text/itrform2.cxx | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index 05d9e6558f63..7e43a9090bcb 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: itrform2.cxx,v $ * - * $Revision: 1.82 $ + * $Revision: 1.83 $ * - * last change: $Author: kz $ $Date: 2004-02-26 15:32:14 $ + * last change: $Author: kz $ $Date: 2004-03-25 12:52:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1099,7 +1099,7 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf) } else { - // 1) Die Fussnotenzahlen + // 3) Die Fussnotenzahlen if( !rInf.IsFtnDone() ) { ASSERT( ( ! rInf.IsMulti() && ! pMulti ) || pMulti->HasRotation(), @@ -1112,7 +1112,7 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf) rInf.SetFtnDone( sal_True ); } - // 2) Die ErgoSumTexte gibt es natuerlich auch im TextMaster, + // 4) Die ErgoSumTexte gibt es natuerlich auch im TextMaster, // entscheidend ist, ob der SwFtnFrm ein Follow ist. if( !rInf.IsErgoDone() && !pPor && ! rInf.IsMulti() ) { @@ -1121,7 +1121,7 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf) rInf.SetErgoDone( sal_True ); } - // 3) Die Numerierungen + // 5) Die Numerierungen if( !rInf.IsNumDone() && !pPor ) { ASSERT( ( ! rInf.IsMulti() && ! pMulti ) || pMulti->HasRotation(), @@ -1133,16 +1133,23 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf) pPor = (SwLinePortion*)NewNumberPortion( rInf ); rInf.SetNumDone( sal_True ); } - // 4) Die DropCaps + // 6) Die DropCaps if( !pPor && GetDropFmt() && ! rInf.IsMulti() ) pPor = (SwLinePortion*)NewDropPortion( rInf ); - if ( ! pPor && ! pCurr->GetPortion() ) + // 7) Kerning portions at beginning of line in grid mode + if ( !pPor && !pCurr->GetPortion() ) { GETGRID( GetTxtFrm()->FindPageFrm() ) if ( pGrid ) pPor = new SwKernPortion( *pCurr ); } + + // 8) Decimal tab portion in table cell + if ( GetTxtFrm()->IsInTab() && rInf.GetVsh()->IsTabCompat() ) + { + pPor = NewTabPortion( rInf, true ); + } } return pPor; } @@ -1311,7 +1318,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf ) */ if( !rInf.GetRest() || !rInf.GetRest()->InFldGrp() ) cChar = rInf.GetChar( rInf.GetIdx() ); - rInf.SetHookChar(0); + rInf.ClearHookChar(); } else { @@ -1326,7 +1333,7 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf ) switch( cChar ) { - case CH_TAB : pPor = NewTabPortion( rInf ); break; + case CH_TAB : pPor = NewTabPortion( rInf, false ); break; case CH_BREAK : pPor = new SwBreakPortion( *rInf.GetLast() ); break; case CHAR_SOFTHYPHEN: // soft hyphen |