[libreoffice/f20] Related: rhbz#1032774 bodge around reported NULL

[Caolán McNamara]

commit 656b553fd2a97f642202842d23bf3bf04ba17c3d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 25 14:10:26 2013 +0000

    Related: rhbz#1032774 bodge around reported NULL

 ...z-1032774-bodge-around-reported-NULL-valu.patch |   36 ++++++++++++++++++++
 libreoffice.spec                                   |    9 ++++-
 2 files changed, 43 insertions(+), 2 deletions(-)
---
diff --git a/0001-Related-rhbz-1032774-bodge-around-reported-NULL-valu.patch b/0001-Related-rhbz-1032774-bodge-around-reported-NULL-valu.patch
new file mode 100644
index 0000000..dc9299c
--- /dev/null
+++ b/0001-Related-rhbz-1032774-bodge-around-reported-NULL-valu.patch
@@ -0,0 +1,36 @@
+From 5620f5ba2fa123f029ac449f69a89ffc5703c71e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+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<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
+-- 
+1.8.3.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 5ceadf7..08c54d9 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -43,7 +43,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        7%{?libo_prerelease}%{?dist}
+Release:        8%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/default/
@@ -276,6 +276,7 @@ Patch35: 0001-Revert-transpose-data-in-rows-ranges-for-internal-da.patch
 Patch36: 0001-fdo-69971-formula-dialog-crash-when-Paint-restores-E.patch
 Patch37: 0001-Related-fdo-41169-fix-GTK-non-Latin-keyboard-layout-.patch
 Patch38: 0001-Rewrite-Qt4-based-nested-yield-mutex-locking.patch
+Patch39: 0001-Related-rhbz-1032774-bodge-around-reported-NULL-valu.pat
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -1048,7 +1049,8 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch35 -p1 -b .Revert-transpose-data-in-rows-ranges-for-internal-da.patch
 %patch36 -p1 -b .fdo-69971-formula-dialog-crash-when-Paint-restores-E.patch
 %patch37 -p1 -b .fdo-41169-fix-GTK-non-Latin-keyboard-layout-.patch
-%patch38 -p1 -b .0001-Rewrite-Qt4-based-nested-yield-mutex-locking.patch
+%patch38 -p1 -b .Rewrite-Qt4-based-nested-yield-mutex-locking.patch
+%patch39 -p1 -b .rhbz-1032774-bodge-around-reported-NULL-valu.pat
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2138,6 +2140,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Mon Nov 25 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.1.3.2-8-UNBUILT
+  Related: rhbz#1032774 bodge around reported NULL
+
 * Fri Nov 22 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.1.3.2-7
 - Resolves: rhbz#958300 fix GTK non Latin keyboard layout shortcuts
 - Resolves: rhbz#977068 fix qt/kde crash