diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-11-21 15:27:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-21 15:36:39 +0000 |
| commit | 5620f5ba2fa123f029ac449f69a89ffc5703c71e (patch) | |
| tree | b44a854c52f3c26649b795b145dc5cd0cf1300b7 | |
| parent | 5d34cd53e4cb63364cc3a369f7f97fa25d9741cf (diff) | |
Related: rhbz#1032774 bodge-around reported NULL value here
Change-Id: I9c4791b8f82cdd6e4823f88f592ad9ce233b6966
| -rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 2bab38d95fcd..b71cad6ab113 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<ViewShell> 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 |