diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-02-15 01:00:24 +0100 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-02-16 22:52:29 +0100 |
| commit | ace255680ed541e55a855c223be84774389786ac (patch) | |
| tree | 871156fe09fdb9dc92a310b75fbf018fa06b07ee /sw | |
| parent | d66a5cd08d45a02030189452c01849b1d6ffb4ce (diff) | |
Use Relax return value (==IsOn) and make code cleaner
Change-Id: Ie76672d8ee354b00358d0f441ab141c9de244bd4
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/text/txtfrm.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 62dc4e22ae03..81a0f370f7b2 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -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(); } } } |