[libreoffice] Related: rhbz#902884 check for NULL GetSelectedMasterPage

[Caolán McNamara]

commit dfc7bf504ea3b47be6120a0a58568c7ab127153a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 7 14:43:44 2013 +0000

    Related: rhbz#902884 check for NULL GetSelectedMasterPage

 ...z-902884-check-for-GetSelectedMasterPage-.patch |   35 ++++++++++++++++++++
 libreoffice.spec                                   |    7 +++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/0001-Related-rhbz-902884-check-for-GetSelectedMasterPage-.patch b/0001-Related-rhbz-902884-check-for-GetSelectedMasterPage-.patch
new file mode 100644
index 0000000..a1d7dfd
--- /dev/null
+++ b/0001-Related-rhbz-902884-check-for-GetSelectedMasterPage-.patch
@@ -0,0 +1,35 @@
+From 8159a10df959638004bae19cd108f855180d00f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Thu, 7 Mar 2013 14:30:54 +0000
+Subject: [PATCH] Related: rhbz#902884 check for GetSelectedMasterPage failure
+ anyway
+
+backtrace doesn't indicate that its NULL however, but the rest of
+our GetSelectedMasterPage check for NULL so fix that anyway
+
+Change-Id: I9e0b15f4a18523ff1e787ef230de1ca227aa2980
+---
+ sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
+index 512fd1d..58fa05f 100644
+--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
++++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
+@@ -553,8 +553,11 @@ void MasterPagesSelector::Execute (SfxRequest& rRequest)
+         case SID_TP_EDIT_MASTER:
+         {
+             using namespace ::com::sun::star;
+-            uno::Reference<drawing::XDrawPage> xSelectedMaster (
+-                GetSelectedMasterPage()->getUnoPage(), uno::UNO_QUERY);
++            uno::Reference<drawing::XDrawPage> xSelectedMaster;
++            SdPage* pMasterPage = GetSelectedMasterPage();
++            assert(pMasterPage); //rhbz#902884
++            if (pMasterPage)
++                xSelectedMaster = uno::Reference<drawing::XDrawPage>(pMasterPage->getUnoPage(), uno::UNO_QUERY);
+             SfxViewFrame* pViewFrame = mrBase.GetViewFrame();
+             if (pViewFrame != NULL && xSelectedMaster.is())
+             {
+-- 
+1.8.1.2
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 2340c2a..d1c232c 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -47,7 +47,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-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.documentfoundation.org/develop
@@ -253,6 +253,7 @@ Patch19: 0001-fix-compile-for-change-to-boost-1.53.0-declaring-sma.patch
 Patch20: 0001-Resolves-rhbz-895196-sc-filter-float-a11y-parent-of-.patch
 Patch21: 0001-do-not-access-vector-elements-beyond-size-rhbz-84751.patch
 Patch22: 0001-rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch
+Patch23: 0001-Related-rhbz-902884-check-for-GetSelectedMasterPage-.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -998,6 +999,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch20 -p1 -b .rhbz-895196-sc-filter-float-a11y-parent-of-.patch
 %patch21 -p1 -b .do-not-access-vector-elements-beyond-size-rhbz-84751.patch
 %patch22 -p1 -b .rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch
+%patch23 -p1 -b .rhbz-902884-check-for-GetSelectedMasterPage-.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2065,6 +2067,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Thu Mar 07 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.0.1.2-2
+- Related: rhbz#902884 check for NULL GetSelectedMasterPage
+
 * Thu Feb 28 2013 David Tardon <dtardon at redhat.com> - 1:4.0.1.2-1
 - 4.0.1 rc2