diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-21 14:40:48 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-21 14:40:48 +0000 |
| commit | cb0cff2b20d3a032ac6b63e34357bac772c8f4f7 (patch) | |
| tree | 6d0d706855f7190f43474f814c911fb40b664678 /sw/source/core/text/portxt.cxx | |
| parent | 80438a17df8d6588b4b0a5455727ab7c9b019182 (diff) | |
INTEGRATION: CWS swqbf57 (1.41.134); FILE MERGED
2006/02/27 15:52:44 fme 1.41.134.1: #i58522# Do not trigger an underflow behind the tabulator character, if it is directly followed by a blank
Diffstat (limited to 'sw/source/core/text/portxt.cxx')
| -rw-r--r-- | sw/source/core/text/portxt.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index c1bda32088ca..6e57f2a37422 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -4,9 +4,9 @@ * * $RCSfile: portxt.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: hr $ $Date: 2005-12-06 18:20:25 $ + * last change: $Author: obo $ $Date: 2006-03-21 15:40:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -432,12 +432,16 @@ sal_Bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf ) // - Footnote portions with fake line start (i.e., not at beginning of line) // should keep together with the text portion. // - TabPortions not at beginning of line should keep together with the - // text portion. + // text portion, if they are not followed by a blank + // (work around different definition of tab stop character - breaking or + // non breaking character - in compatibility mode) else if ( ( IsFtnPortion() && rInf.IsFakeLineStart() ) || ( rInf.GetVsh()->IsTabCompat() && rInf.GetLast() && rInf.GetLast()->InTabGrp() && rInf.GetLineStart() + rInf.GetLast()->GetLen() < rInf.GetIdx() && - aGuess.BreakPos() == rInf.GetIdx() ) ) + aGuess.BreakPos() == rInf.GetIdx() && + CH_BLANK != rInf.GetChar( rInf.GetIdx() ) && + 0x3000 != rInf.GetChar( rInf.GetIdx() ) ) ) BreakUnderflow( rInf ); // case B2 else if( rInf.GetIdx() > rInf.GetLineStart() || |