diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-09-25 09:49:50 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-09-25 09:49:50 +0000 |
| commit | 1a5d2bd7f36c50e6f1ca20efe29dfcb0de380452 (patch) | |
| tree | d8d9e713b47d79493901a7edd6eed6497226afb8 /sw/source/core | |
| parent | 40b5a92d646abaacbb93325a4db0ab6ec56fec03 (diff) | |
INTEGRATION: CWS os20 (1.63.128); FILE MERGED
2003/09/12 12:27:39 fme 1.63.128.1: #111937# Keep attribute, widows and orphans in balanced sections
Diffstat (limited to 'sw/source/core')
| -rw-r--r-- | sw/source/core/text/txtfrm.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 40491682b66b..ba7172ee538d 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtfrm.cxx,v $ * - * $Revision: 1.63 $ + * $Revision: 1.64 $ * - * last change: $Author: vg $ $Date: 2003-06-24 07:52:22 $ + * last change: $Author: hjs $ $Date: 2003-09-25 10:49:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -737,7 +737,7 @@ void SwTxtFrm::CalcLineSpace() else if ( ! GetTxtNode()->IsWrongDirty() ) \ { \ GetTxtNode()->SetWrong( new SwWrongList() ); \ - GetTxtNode()->GetWrong()->SetInvalid( nPos, nPos + ( nCnt > 0 ? nCnt : 1 ) ); \ + GetTxtNode()->GetWrong()->SetInvalid( nPos, nPos + (USHORT)( nCnt > 0 ? nCnt : 1 ) ); \ } \ GetNode()->SetWrongDirty( sal_True ); \ GetNode()->SetAutoCompleteWordDirty( sal_True ); \ @@ -1800,7 +1800,7 @@ sal_Bool SwTxtFrm::TestFormat( const SwFrm* pPrv, SwTwips &rMaxHeight, sal_Bool SwTestFormat aSave( this, pPrv, rMaxHeight ); - return SwTxtFrm::WouldFit( rMaxHeight, bSplit ); + return SwTxtFrm::WouldFit( rMaxHeight, bSplit, sal_True ); } @@ -1819,7 +1819,7 @@ sal_Bool SwTxtFrm::TestFormat( const SwFrm* pPrv, SwTwips &rMaxHeight, sal_Bool * Die benoetigte Hoehe wird von nMaxHeight abgezogen! */ -sal_Bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, sal_Bool &bSplit ) +sal_Bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, sal_Bool &bSplit, sal_Bool bTst ) { ASSERT( ! IsVertical() || ! IsSwapped(), "SwTxtFrm::WouldFit with swapped frame" ); @@ -1900,7 +1900,7 @@ sal_Bool SwTxtFrm::WouldFit( SwTwips &rMaxHeight, sal_Bool &bSplit ) aLine.Bottom(); // Ist Aufspalten ueberhaupt notwendig? if ( 0 != ( bSplit = !aFrmBreak.IsInside( aLine ) ) ) - bRet = !aFrmBreak.IsKeepAlways() && aFrmBreak.WouldFit( aLine, rMaxHeight ); + bRet = !aFrmBreak.IsKeepAlways() && aFrmBreak.WouldFit( aLine, rMaxHeight, bTst ); else { //Wir brauchen die Gesamthoehe inklusive der aktuellen Zeile |