diff options
| author | Frank Meies <fme@openoffice.org> | 2002-08-27 12:40:01 +0000 |
|---|---|---|
| committer | Frank Meies <fme@openoffice.org> | 2002-08-27 12:40:01 +0000 |
| commit | b1862d5b9fefab5f0012d83879c8d3751e32c81d (patch) | |
| tree | a68165faa776d85c8248f06e696a1db4e2b6dab4 /sw/source/core/text/portxt.cxx | |
| parent | 4c79582b9d8181aaaa763a0c25d37fd626923e7e (diff) | |
#101246# QuoVadis and ErgoSum portions now support multiple scripts
Diffstat (limited to 'sw/source/core/text/portxt.cxx')
| -rw-r--r-- | sw/source/core/text/portxt.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index 6eaa41b011a8..d737de46de82 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: portxt.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: fme $ $Date: 2002-06-20 10:24:28 $ + * last change: $Author: fme $ $Date: 2002-08-27 13:40:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -421,7 +421,7 @@ sal_Bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf ) { // case B1 if( aGuess.HyphWord().is() && ( aGuess.BreakPos() > rInf.GetIdx() || - !rInf.GetLast()->IsFlyPortion() ) ) + ( rInf.GetLast() && ! rInf.GetLast()->IsFlyPortion() ) ) ) { CreateHyphen( rInf, aGuess ); if ( rInf.GetFly() ) @@ -438,11 +438,15 @@ sal_Bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf ) // this is weird: during formatting the follow of a field // the values rInf.GetIdx and rInf.GetLineStart are replaced // IsFakeLineStart indicates GetIdx > GetLineStart - rInf.IsFakeLineStart() || rInf.GetFly() || - rInf.GetLast()->IsFlyPortion() || rInf.IsFirstMulti() || - (rInf.GetLast()->InFldGrp() && !rInf.GetLast()->InNumberGrp() - && lcl_HasContent(*((SwFldPortion*)rInf.GetLast()),rInf) ) - ) + rInf.IsFakeLineStart() || + rInf.GetFly() || + rInf.IsFirstMulti() || + ( rInf.GetLast() && + ( rInf.GetLast()->IsFlyPortion() || + ( rInf.GetLast()->InFldGrp() && + ! rInf.GetLast()->InNumberGrp() && + ! rInf.GetLast()->IsErgoSumPortion() && + lcl_HasContent(*((SwFldPortion*)rInf.GetLast()),rInf ) ) ) ) ) { if ( rInf.X() + aGuess.BreakWidth() <= rInf.Width() ) Width( aGuess.BreakWidth() ); |