diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2011-11-06 13:16:47 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2011-11-06 13:16:47 +0400 |
| commit | 0cf754f5ca356c2d93f7ebf8523b2dc2246e4763 (patch) | |
| tree | e3e7865a6d78f8a0a27684c3bfa4c083694a37c6 /sw | |
| parent | 59829f4fd20f4238941123412423caa76e8be1a6 (diff) | |
cppcheck: drop redundant checks
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/crsr/viscrs.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/itrform2.cxx | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 8940ed209d91..8c93ab5d7689 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -694,7 +694,7 @@ void SwShellTableCrsr::FillRects() while ( pFrm ) { - if( pFrm && aReg.GetOrigin().IsOver( pFrm->Frm() ) ) + if( aReg.GetOrigin().IsOver( pFrm->Frm() ) ) aReg -= pFrm->Frm(); pFrm = pFrm->GetNextCellLeaf( MAKEPAGE_NONE ); diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index a507526b4188..53a092c6fce9 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -1011,12 +1011,10 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf) else if( pPor->InNumberGrp() ) rInf.SetNumDone(sal_True); - if( pPor ) - { - rInf.SetRest(0); - pCurr->SetRest( sal_True ); - return pPor; - } + + rInf.SetRest(0); + pCurr->SetRest( sal_True ); + return pPor; } // ???? und ????: im Follow duerfen wir schon stehen, |