diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-11-15 15:32:26 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-15 15:32:26 +0000 |
commit | 4a2b2d29b5bb4db076b4281f5c5e7b627f572d06 (patch) | |
tree | 0443c9f4061ebf0150bd8759b3f90f9988b1125d | |
parent | c1a4ff22d0a54b349b79f9a233b27ecb734aa40a (diff) |
INTEGRATION: CWS texteng03 (1.36.86); FILE MERGED
2004/11/08 15:19:24 mt 1.36.86.1: #i30810# MaxTextWidth...
-rw-r--r-- | svtools/source/edit/texteng.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx index 2c10d035aa63..86b2421c878b 100644 --- a/svtools/source/edit/texteng.cxx +++ b/svtools/source/edit/texteng.cxx @@ -2,9 +2,9 @@ * * $RCSfile: texteng.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: rt $ $Date: 2004-09-27 12:11:19 $ + * last change: $Author: rt $ $Date: 2004-11-15 16:32:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1635,12 +1635,12 @@ void TextEngine::FormatDoc() maInvalidRec.Bottom() = nY + CalcParaHeight( nPara ); } - if ( ( mnCurTextWidth != 0xFFFFFFFF ) && ( nOldParaWidth == nOldCurTextWidth ) ) + if ( mnCurTextWidth != 0xFFFFFFFF ) { ULONG nNewParaWidth = CalcTextWidth( nPara ); if ( nNewParaWidth >= mnCurTextWidth ) mnCurTextWidth = nNewParaWidth; - else + else if ( ( nOldParaWidth != 0xFFFFFFFF ) && ( nOldParaWidth >= mnCurTextWidth ) ) mnCurTextWidth = 0xFFFFFFFF; } } |