diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-03-06 17:02:38 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-07 10:22:17 +0000 |
| commit | 3ef2725a8d9a15b585066e43384788a79fb4aef6 (patch) | |
| tree | 7f27af716dc35df28f099c41f6500ad4579a275e /sw | |
| parent | 25d6c8d2fd5caa097f3edbd7531dbc14e8357574 (diff) | |
coverity#708852 help coverity out here
Change-Id: I26c54d715b6c90c3bab9445a91fff5593dfa96bf
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/ftnfrm.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index e1ac1b3b0fa7..e86e6047b447 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -2559,8 +2559,16 @@ sal_Bool SwLayoutFrm::MoveLowerFtns( SwCntntFrm *pStart, SwFtnBossFrm *pOldBoss, SwFtnFrms *pFtnArr; SwLayoutFrm* pNewChief = 0; SwLayoutFrm* pOldChief = 0; - if( pStart && pOldBoss->IsInSct() && ( pOldChief = pOldBoss->FindSctFrm() ) - != ( pNewChief = pNewBoss->FindSctFrm() ) ) + + bool bFoundCandidate = false; + if (pStart && pOldBoss->IsInSct()) + { + pOldChief = pOldBoss->FindSctFrm(); + pNewChief = pNewBoss->FindSctFrm(); + bFoundCandidate = pOldChief != pNewChief; + } + + if (bFoundCandidate) { pFtnArr = new SwFtnFrms; pOldChief = pOldBoss->FindFtnBossFrm( sal_True ); |