coverity#705867 Dereference before null check

Change-Id: Ia541e6d8f0f0b30dcb67a8693b4dd5d53e929717

coverity#705867 Dereference before null check
Change-Id: Ia541e6d8f0f0b30dcb67a8693b4dd5d53e929717
f53169c7 · Caolán McNamara · 051d45a5 · f53169c7
Kaydet (Commit) f53169c7 authored Haz 04, 2014 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

slideshow.cxx sd/source/ui/slideshow/slideshow.cxx +3 -6

No files found.
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -1260,12 +1260,9 @@ void SlideShow::StartFullscreenPresentation( )
        // changes made by the presentation have an effect on the other
        // view shells.
        FrameView* pOriginalFrameView = 0;
-        if (mpCurrentViewShellBase)
-        {
-            ::boost::shared_ptr<ViewShell> xShell(mpCurrentViewShellBase->GetMainViewShell());
-            if (xShell.get())
-                pOriginalFrameView = xShell->GetFrameView();
-        }
+        ::boost::shared_ptr<ViewShell> xShell(mpCurrentViewShellBase->GetMainViewShell());
+        if (xShell.get())
+            pOriginalFrameView = xShell->GetFrameView();

        delete mpFullScreenFrameView;
        mpFullScreenFrameView = new FrameView(mpDoc, pOriginalFrameView);