coverity#1251173 Dereference before null check

Change-Id: I3e5a70289785f905350c895b6c869eaebe360bf8
2014-11-14 09:18:05 +00:00
parent a05da74d0b
commit cb19a99ba8
1 changed files with 3 additions and 3 deletions
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -667,17 +667,17 @@ void DrawViewShell::FuDeleteSelectedObjects()
        bConsumed = true;
    }

-    if (!bConsumed)
+    if (!bConsumed && mpDrawView)
    {
        ::vcl::KeyCode aKCode(KEY_DELETE);
        KeyEvent aKEvt( 0, aKCode);

        bConsumed = mpDrawView->getSmartTags().KeyInput( aKEvt );

-        if( !bConsumed && HasCurrentFunction() )
+        if (!bConsumed && HasCurrentFunction())
            bConsumed = GetCurrentFunction()->KeyInput(aKEvt);

-        if( !bConsumed && mpDrawView )
+        if (!bConsumed)
            mpDrawView->DeleteMarked();
    }
 }