summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-06-04 11:07:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-06-04 12:34:13 +0100
commitf53169c74a3feae6f376e6f48859eebf07fc2187 (patch)
tree6e6a8fe02805e858306a9740ded8d453c7a9da46 /sd
parent051d45a59d9e43634e152b8f4f0bf0193561db12 (diff)
coverity#705867 Dereference before null check
Change-Id: Ia541e6d8f0f0b30dcb67a8693b4dd5d53e929717
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx9
1 files changed, 3 insertions, 6 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 89c35efea6f2..36453062f051 100644
--- 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);