Skip to content

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

Use Relax return value (==IsOn) and make code cleaner 

Change-Id: Ie76672d8ee354b00358d0f441ab141c9de244bd4
üst d66a5cd0
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
sw/source/core/text/txtfrm.cxx
Dosyayı görüntüle @ ace25568
......@@ -1484,8 +1484,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
if( aTxtFly.IsOn() )
{
// does any free-flying frame overlap?
aTxtFly.Relax();
if ( aTxtFly.IsOn() || IsUndersized() )
if ( aTxtFly.Relax() || IsUndersized() )
break;
}
if( GetTxtNode()->GetSwAttrSet().GetRegister().GetValue())
......@@ -1694,8 +1693,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
if( aTxtFly.IsOn() )
{
// does any free-flying frame overlap?
aTxtFly.Relax();
bFormat = aTxtFly.IsOn() || IsUndersized();
bFormat = aTxtFly.Relax() || IsUndersized();
}
}
}
......
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