coverity#1266469 Dereference null return value

Change-Id: I87318ba286ad2d8ded5d3e467b7a1e371318bef8

coverity#1266469 Dereference null return value
Change-Id: I87318ba286ad2d8ded5d3e467b7a1e371318bef8
f9c3d4e8 · Caolán McNamara · dbf60189 · f9c3d4e8
Kaydet (Commit) f9c3d4e8 authored Şub 04, 2015 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

basesh.cxx sw/source/uibase/shells/basesh.cxx +4 -3

No files found.
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -1263,9 +1263,10 @@ IMPL_LINK_NOARG(SwBaseShell, GraphicArrivedHdl)
                if( !bProtect )
                {
                    sal_uInt16 nId = SvxContourDlgChildWindow::GetChildWindowId();
-                    SvxIMapDlg *pDlg = pVFrame->HasChildWindow( nId ) ?
+                    SfxChildWindow *pChildWindow = pVFrame->HasChildWindow(nId) ?
-                        static_cast<SvxIMapDlg*>( pVFrame->GetChildWindow( nId )
+                        pVFrame->GetChildWindow(nId) : 0;
-                                            ->GetWindow()) : 0;
+                    SvxIMapDlg *pDlg = pChildWindow ?
+                        static_cast<SvxIMapDlg*>(pChildWindow->GetWindow()) : 0;
                    if( pDlg && pDlg->GetEditingObject() !=
                                rSh.GetIMapInventor() )
                        lcl_UpdateContourDlg( rSh, nsSelectionType::SEL_GRF );