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?= +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 + diff --git a/libreoffice.spec b/libreoffice.spec index 562ab51..29526fa 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -46,7 +46,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.0 -Release: 1%{?libo_prerelease}%{?dist} +Release: 2%{?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/ @@ -261,6 +261,7 @@ Patch9: libreoffice-rhel6langs.patch Patch10: libreoffice-rhel6limits.patch Patch11: libreoffice-rhel6glib.patch %endif +Patch12: 0001-Related-rhbz-1032774-bodge-around-reported-NULL-valu.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -995,6 +996,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch10 -p1 -b .rhel6limits.patch %patch11 -p1 -b .rhel6glib.patch %endif +%patch12 -p1 -b .rhbz-1032774-bodge-around-reported-NULL-valu.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2082,6 +2084,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Mon Nov 25 2013 Caolán McNamara - 1:4.2.0.0-2.beta1-UNBUILT +- Related: rhbz#1032774 bodge around reported NULL + * Thu Nov 21 2013 David Tardon - 1:4.2.0.0-1.beta1 - switch to 4.2.0