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