diff options
| author | Frank Meies <fme@openoffice.org> | 2001-08-07 06:22:46 +0000 |
|---|---|---|
| committer | Frank Meies <fme@openoffice.org> | 2001-08-07 06:22:46 +0000 |
| commit | 1f2b1d308ba3da9d0431f9ea278e1d347124be07 (patch) | |
| tree | 443edf849c78ee42eafc13b6ab18018e49813dfa /sw/source/core/text/frmform.cxx | |
| parent | 8c4821d1a754ce53b5156b2940fb86797b8a28b0 (diff) | |
Fix #90587#: Assertion Missing Ftn Flag should not consider invalid follow frames
Diffstat (limited to 'sw/source/core/text/frmform.cxx')
| -rw-r--r-- | sw/source/core/text/frmform.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index af0c5de9e755..583e5c314ed2 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmform.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: fme $ $Date: 2001-06-27 06:16:44 $ + * last change: $Author: fme $ $Date: 2001-08-07 07:22:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -659,7 +659,8 @@ SwCntntFrm *SwTxtFrm::JoinFrm() } #ifndef PRODUCT - else + else if ( pFoll->GetValidPrtAreaFlag() || + pFoll->GetValidSizeFlag() ) { pFoll->CalcFtnFlag(); ASSERT( !pFoll->HasFtn(), "Missing FtnFlag." ); |