diff options
| -rw-r--r-- | sw/source/core/layout/frmtool.cxx | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 1c6fba9b178e..e1be7def03a3 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -1175,17 +1175,20 @@ void AppendAllObjs( const SwFrmFmts *pTbl, const SwFrm* pSib ) //I don't want here. bRemove = true; } - else if ( false == (bRemove = ::lcl_ObjConnected( pFmt, pSib )) || - ::lcl_InHeaderOrFooter( *pFmt ) ) - { - // OD 23.06.2003 #108784# - correction: for objects in header - // or footer create frames, in spite of the fact that an connected - // objects already exists. - //Call for Flys and DrawObjs only a MakeFrms if nor - //no dependent exists, otherwise, or if the MakeDrms creates no - //dependents, remove. - pFmt->MakeFrms(); + else + { bRemove = ::lcl_ObjConnected( pFmt, pSib ); + if ( !bRemove || ::lcl_InHeaderOrFooter( *pFmt ) ) + { + // OD 23.06.2003 #108784# - correction: for objects in header + // or footer create frames, in spite of the fact that an connected + // objects already exists. + //Call for Flys and DrawObjs only a MakeFrms if nor + //no dependent exists, otherwise, or if the MakeDrms creates no + //dependents, remove. + pFmt->MakeFrms(); + bRemove = ::lcl_ObjConnected( pFmt, pSib ); + } } if ( bRemove ) { |