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