diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-01-24 14:22:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-24 14:22:32 +0000 |
| commit | 47b18f57f8c45f0dbb9244be4574f6b4e19f13d8 (patch) | |
| tree | dd765e130a22d39b98fa18c2d12d986d2713447a /sd | |
| parent | 3768b305c062086aed1719d8ce1022f8af63f6d5 (diff) | |
coverity#1265795 Dereference null return value
Change-Id: I3ad219b1729a7a4b2f3e52cd6ac0243a419bc632
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviews6.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index bf3e3d888506..9660b441e5f3 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -343,10 +343,10 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) if ( GetViewFrame()->HasChildWindow( nId ) ) { - SvxBmpMask* pDlg = static_cast<SvxBmpMask*>( GetViewFrame()->GetChildWindow( nId )->GetWindow() ); - - if ( pDlg->NeedsColorList() ) - pDlg->SetColorList( GetDoc()->GetColorList() ); + SfxChildWindow* pWnd = GetViewFrame()->GetChildWindow(nId); + SvxBmpMask* pDlg = pWnd ? static_cast<SvxBmpMask*>(pWnd->GetWindow()) : NULL; + if (pDlg && pDlg->NeedsColorList()) + pDlg->SetColorList(GetDoc()->GetColorList()); } if ( rMarkList.GetMarkCount() == 1 ) |