summaryrefslogtreecommitdiff
path: root/sw/source/core/layout/tabfrm.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-06-10 10:02:46 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-06-10 20:43:38 +0200
commit474a9171e7e996116037bb9ca6c985d0a3d6c0c3 (patch)
tree7ca10ffc1a6514817ff173e41d1ac04251b69c9a /sw/source/core/layout/tabfrm.cxx
parentb0ede91f5e64767bd3ba9f427687e1faf2297e0c (diff)
loplugin:buriedassign in sw
limited this only fixing assignments inside "if" statements, since other things are harder to change Change-Id: If3188a3e3d5fcd94123211c97fee097ece5e2797 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95990 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/layout/tabfrm.cxx')
-rw-r--r--sw/source/core/layout/tabfrm.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index f4aed1ed650d..0a3e5f997357 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -3236,8 +3236,8 @@ void SwTabFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
InvalidatePrt_();
if ( nInvFlags & 0x40 )
InvalidatePos_();
- SwFrame *pTmp;
- if ( nullptr != (pTmp = GetIndNext()) )
+ SwFrame *pTmp = GetIndNext();
+ if ( nullptr != pTmp )
{
if ( nInvFlags & 0x04 )
{
@@ -3599,8 +3599,10 @@ void SwTabFrame::Cut()
{
InvalidateNextPos();
//Someone has to do the retouch: predecessor or upper
- if ( nullptr != (pFrame = GetPrev()) )
- { pFrame->SetRetouche();
+ pFrame = GetPrev();
+ if ( nullptr != pFrame )
+ {
+ pFrame->SetRetouche();
pFrame->Prepare( PrepareHint::WidowsOrphans );
pFrame->InvalidatePos_();
if ( pFrame->IsContentFrame() )