diff options
| author | Noel <noel.grandin@collabora.co.uk> | 2021-03-26 13:35:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-03-26 18:02:19 +0100 |
| commit | b624b13b3d5a8e573c7de8158cadc66b1982d157 (patch) | |
| tree | 56948e6a5e8d7f5a7cbde6328a27f13ecd8a72bc /sw/source/core/layout/wsfrm.cxx | |
| parent | 8136620ff432bf17815bef1f88c7531edb839d23 (diff) | |
loplugin:flatten
Change-Id: Ib7a895fba66f8dc9b6501e61631c02694053b7fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113157
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/layout/wsfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 10434529b67e..fccf94925187 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -2538,20 +2538,20 @@ void SwContentFrame::UpdateAttr_( const SfxPoolItem* pOld, const SfxPoolItem* pN default: bClear = false; } - if ( bClear ) + if ( !bClear ) + return; + + if ( pOldSet || pNewSet ) { - if ( pOldSet || pNewSet ) - { - if ( pOldSet ) - pOldSet->ClearItem( nWhich ); - if ( pNewSet ) - pNewSet->ClearItem( nWhich ); - } - else - { - SwModify aMod; - SwFrame::SwClientNotify(aMod, sw::LegacyModifyHint(pOld, pNew)); - } + if ( pOldSet ) + pOldSet->ClearItem( nWhich ); + if ( pNewSet ) + pNewSet->ClearItem( nWhich ); + } + else + { + SwModify aMod; + SwFrame::SwClientNotify(aMod, sw::LegacyModifyHint(pOld, pNew)); } } |