Kaydet (Commit) 7eaa311c authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#704747 Dereference after null check

Change-Id: I1da494393c3a1a697bf31b00f57b33a03c674872
üst e59e1884
...@@ -72,13 +72,15 @@ void FuChar::DoExecute( SfxRequest& rReq ) ...@@ -72,13 +72,15 @@ void FuChar::DoExecute( SfxRequest& rReq )
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
SfxAbstractTabDialog* pDlg = pFact ? pFact->CreateSdTabCharDialog( NULL, &aNewAttr, mpDoc->GetDocSh() ) : 0; SfxAbstractTabDialog* pDlg = pFact ? pFact->CreateSdTabCharDialog( NULL, &aNewAttr, mpDoc->GetDocSh() ) : 0;
sal_uInt16 nResult = RET_CANCEL;
if( pDlg ) if( pDlg )
{ {
if (rReq.GetSlot() == SID_CHAR_DLG_EFFECT) if (rReq.GetSlot() == SID_CHAR_DLG_EFFECT)
{ {
pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS); pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
} }
sal_uInt16 nResult = pDlg->Execute();
nResult = pDlg->Execute();
if( nResult == RET_OK ) if( nResult == RET_OK )
{ {
...@@ -87,11 +89,10 @@ void FuChar::DoExecute( SfxRequest& rReq ) ...@@ -87,11 +89,10 @@ void FuChar::DoExecute( SfxRequest& rReq )
} }
delete pDlg; delete pDlg;
}
if( nResult != RET_OK ) if( nResult != RET_OK )
{ {
return; return;
}
} }
} }
mpView->SetAttributes(*pArgs); mpView->SetAttributes(*pArgs);
......
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