Kaydet (Commit) 2d64fcf4 authored tarafından Noel Grandin's avatar Noel Grandin

cppcheck:nullPointerRedundantCheck

Change-Id: I00a58a90f96e9eaf681239146213706e278ea5e1
Reviewed-on: https://gerrit.libreoffice.org/19421Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 2b5a48da
......@@ -358,14 +358,12 @@ bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" );
const SvxFieldData* pOtherFld = static_cast<const SvxFieldItem&>(rItem).GetField();
if ( !pField && !pOtherFld )
if( pField == pOtherFld )
return true;
if ( ( !pField && pOtherFld ) || ( pField && !pOtherFld ) )
if( pOtherFld == nullptr )
return false;
return ( ( pField->Type() == pOtherFld->Type() )
&& ( *pField == *pOtherFld ) );
return ( pField->Type() == pOtherFld->Type() )
&& ( *pField == *pOtherFld );
}
......
......@@ -1664,15 +1664,11 @@ SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& rBox )
inline bool CmpBrdLn( const SvxBorderLine* pBrd1, const SvxBorderLine* pBrd2 )
{
bool bRet;
if( 0 != pBrd1 ? 0 == pBrd2 : 0 != pBrd2 )
bRet = false;
else
if( !pBrd1 )
bRet = true;
else
bRet = (*pBrd1 == *pBrd2);
return bRet;
if( pBrd1 == pBrd2 )
return true;
if( pBrd1 == nullptr )
return false;
return *pBrd1 == *pBrd2;
}
......
......@@ -526,8 +526,6 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
if ( pFrmItem )
xTargetFrame = pFrmItem->GetFrame();
SfxViewFrame* pViewFrame = NULL;
SdOptions* pOpt = GetSdOptions(DOCUMENT_TYPE_IMPRESS);
bool bStartWithTemplate = pOpt->IsStartWithTemplate();
......@@ -636,7 +634,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
SfxObjectShell* pShell = xShell;
if( pShell )
{
pViewFrame = SfxViewFrame::LoadDocumentIntoFrame( *pShell, xTargetFrame );
SfxViewFrame* pViewFrame = SfxViewFrame::LoadDocumentIntoFrame( *pShell, xTargetFrame );
DBG_ASSERT( pViewFrame, "no ViewFrame!!" );
pFrame = pViewFrame ? &pViewFrame->GetFrame() : NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment