From 5620f5ba2fa123f029ac449f69a89ffc5703c71e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 21 Nov 2013 15:27:59 +0000 Subject: [PATCH] Related: rhbz#1032774 bodge-around reported NULL value here Change-Id: I9c4791b8f82cdd6e4823f88f592ad9ce233b6966 --- sd/source/ui/slideshow/slideshow.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 2bab38d..b71cad6 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -1235,10 +1235,15 @@ void SlideShow::StartFullscreenPresentation( ) // frame view of the current view shell. This avoids that // changes made by the presentation have an effect on the other // view shells. - FrameView* pOriginalFrameView = mpCurrentViewShellBase ? mpCurrentViewShellBase->GetMainViewShell()->GetFrameView() : 0; + FrameView* pOriginalFrameView = 0; + if (mpCurrentViewShellBase) + { + ::boost::shared_ptr xShell(mpCurrentViewShellBase->GetMainViewShell()); + if (xShell.get()) + pOriginalFrameView = xShell->GetFrameView(); + } - if( mpFullScreenFrameView ) - delete mpFullScreenFrameView; + delete mpFullScreenFrameView; mpFullScreenFrameView = new FrameView(mpDoc, pOriginalFrameView); // The new frame is created hidden. To make it visible and activate the -- 1.8.3.1