diff options
| -rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/crsr/viscrs.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/text/itrform2.cxx | 10 |
3 files changed, 7 insertions, 9 deletions
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 8c0a3730667c..d7f3dd284a37 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -1578,8 +1578,8 @@ IMPL_LINK( SvxScriptErrorDialog, ShowDialog, ::rtl::OUString*, pMessage ) pBox->SetText( CUI_RES( RID_SVXSTR_ERROR_TITLE ) ); pBox->Execute(); - if ( pBox ) delete pBox; - if ( pMessage ) delete pMessage; + delete pBox; + delete pMessage; return 0; } 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, |