Skip to content

C
core
Kaydet (Commit) bed58e39 authored tarafından Matteo Casalin's avatar Matteo Casalin
Dosyalara gözat
Seçenekler

Clarify flow by avoiding assignment in if condition 

Change-Id: Ifed65f41ab2375d702bf0c4299c65d1e3d78a7f0
üst 240ca5fe
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
sw/source/core/layout/frmtool.cxx
Dosyayı görüntüle @ bed58e39
...@@ -1175,8 +1175,10 @@ void AppendAllObjs( const SwFrmFmts *pTbl, const SwFrm* pSib ) ...@@ -1175,8 +1175,10 @@ void AppendAllObjs( const SwFrmFmts *pTbl, const SwFrm* pSib )
//I don't want here. //I don't want here.
bRemove = true; bRemove = true;
} }
else if ( false == (bRemove = ::lcl_ObjConnected( pFmt, pSib )) || else
::lcl_InHeaderOrFooter( *pFmt ) ) {
bRemove = ::lcl_ObjConnected( pFmt, pSib );
if ( !bRemove || ::lcl_InHeaderOrFooter( *pFmt ) )
{ {
// OD 23.06.2003 #108784# - correction: for objects in header // OD 23.06.2003 #108784# - correction: for objects in header
// or footer create frames, in spite of the fact that an connected // or footer create frames, in spite of the fact that an connected
...@@ -1187,6 +1189,7 @@ void AppendAllObjs( const SwFrmFmts *pTbl, const SwFrm* pSib ) ...@@ -1187,6 +1189,7 @@ void AppendAllObjs( const SwFrmFmts *pTbl, const SwFrm* pSib )
pFmt->MakeFrms(); pFmt->MakeFrms();
bRemove = ::lcl_ObjConnected( pFmt, pSib ); bRemove = ::lcl_ObjConnected( pFmt, pSib );
} }
}
if ( bRemove ) if ( bRemove )
{ {
handled[ i ] = true; 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