summaryrefslogtreecommitdiff
path: root/sw/source/core/text/widorp.cxx
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2003-09-25 09:49:59 +0000
committerHans-Joachim Lankenau <hjs@openoffice.org>2003-09-25 09:49:59 +0000
commit95ab3c0d324ae87be69cea884048037d516b812f (patch)
tree7b4dc3d290151385769392c7118c89f5d5f68d83 /sw/source/core/text/widorp.cxx
parent1a5d2bd7f36c50e6f1ca20efe29dfcb0de380452 (diff)
INTEGRATION: CWS os20 (1.10.206); FILE MERGED
2003/09/12 12:27:40 fme 1.10.206.1: #111937# Keep attribute, widows and orphans in balanced sections
Diffstat (limited to 'sw/source/core/text/widorp.cxx')
-rw-r--r--sw/source/core/text/widorp.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index 84b9d6760c0b..2b34ec2b8f61 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: widorp.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: vg $ $Date: 2003-04-17 14:31:56 $
+ * last change: $Author: hjs $ $Date: 2003-09-25 10:49:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -528,7 +528,7 @@ sal_Bool WidowsAndOrphans::FindWidows( SwTxtFrm *pFrm, SwTxtMargin &rLine )
* WidowsAndOrphans::WouldFit()
*************************************************************************/
-sal_Bool WidowsAndOrphans::WouldFit( SwTxtMargin &rLine, SwTwips &rMaxHeight )
+sal_Bool WidowsAndOrphans::WouldFit( SwTxtMargin &rLine, SwTwips &rMaxHeight, sal_Bool bTst )
{
// Here it does not matter, if pFrm is swapped or not.
// IsInside() takes care for itself
@@ -574,7 +574,7 @@ sal_Bool WidowsAndOrphans::WouldFit( SwTxtMargin &rLine, SwTwips &rMaxHeight )
}
// Sind nach Orphans/Initialen noch genug Zeilen fuer die Widows uebrig?
- if( nLineCnt - nMinLines >= GetWidowsLines() )
+ if( bTst || nLineCnt - nMinLines >= GetWidowsLines() )
{
if( rMaxHeight >= nLineSum )
{