Kaydet (Commit) bed58e39 authored tarafından Matteo Casalin's avatar Matteo Casalin

Clarify flow by avoiding assignment in if condition

Change-Id: Ifed65f41ab2375d702bf0c4299c65d1e3d78a7f0
üst 240ca5fe
......@@ -1175,8 +1175,10 @@ 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 ) )
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
......@@ -1187,6 +1189,7 @@ void AppendAllObjs( const SwFrmFmts *pTbl, const SwFrm* pSib )
pFmt->MakeFrms();
bRemove = ::lcl_ObjConnected( pFmt, pSib );
}
}
if ( bRemove )
{
handled[ i ] = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment