diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-11-29 17:18:20 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-11-29 17:18:20 +0100 |
| commit | 2eb991561c3ca6751bfe3bd674de28d7677e993d (patch) | |
| tree | 6552f51b9c607b55ab11195d776c842390629742 /sw/source/core/attr/format.cxx | |
| parent | 1c717c06c486155bf48aef3ed5e5c140f4205e6e (diff) | |
Rewrite some (trivial) assignments inside if/while conditions: sw
Change-Id: I288c5125a1316828df74f73aeaac85392638ffd8
Diffstat (limited to 'sw/source/core/attr/format.cxx')
| -rw-r--r-- | sw/source/core/attr/format.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index a71e0ff29131..f9bd0a6c37c4 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -495,7 +495,8 @@ bool SwFormat::SetFormatAttr( const SfxPoolItem& rAttr ) if(IsModifyLocked()) { - if( ( bRet = m_aSet.Put( aTempSet ) ) ) + bRet = m_aSet.Put( aTempSet ); + if( bRet ) { m_aSet.SetModifyAtAttr( this ); } @@ -528,7 +529,8 @@ bool SwFormat::SetFormatAttr( const SfxPoolItem& rAttr ) (RES_GRFFMTCOLL == nFormatWhich || RES_TXTFMTCOLL == nFormatWhich ) ) ) { - if( ( bRet = (nullptr != m_aSet.Put( rAttr ))) ) + bRet = nullptr != m_aSet.Put( rAttr ); + if( bRet ) m_aSet.SetModifyAtAttr( this ); // #i71574# if ( nFormatWhich == RES_TXTFMTCOLL && rAttr.Which() == RES_PARATR_NUMRULE ) @@ -599,7 +601,8 @@ bool SwFormat::SetFormatAttr( const SfxItemSet& rSet ) if(IsModifyLocked()) { - if( ( bRet = m_aSet.Put( aTempSet ) ) ) + bRet = m_aSet.Put( aTempSet ); + if( bRet ) { m_aSet.SetModifyAtAttr( this ); } @@ -633,7 +636,8 @@ bool SwFormat::SetFormatAttr( const SfxItemSet& rSet ) ( RES_GRFFMTCOLL == nFormatWhich || RES_TXTFMTCOLL == nFormatWhich ) ) ) { - if( ( bRet = m_aSet.Put( aTempSet )) ) + bRet = m_aSet.Put( aTempSet ); + if( bRet ) m_aSet.SetModifyAtAttr( this ); // #i71574# if ( nFormatWhich == RES_TXTFMTCOLL ) |