[libreoffice/f15] Related: rhbz#711087 band aid for crash in undo

[Caolan McNamara]

commit f71e8404acf9e61bb2809ab695f4c034513d50c4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 17 16:15:52 2011 +0100

    Related: rhbz#711087 band aid for crash in undo

 0001-Related-rhbz-711087-band-aid.patch |   26 ++++++++++++++++++++++++++
 libreoffice.spec                        |    3 +++
 2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/0001-Related-rhbz-711087-band-aid.patch b/0001-Related-rhbz-711087-band-aid.patch
new file mode 100644
index 0000000..384115e
--- /dev/null
+++ b/0001-Related-rhbz-711087-band-aid.patch
@@ -0,0 +1,26 @@
+From fe44d66adbab17b804a27d91148490b23fce75da Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Fri, 17 Jun 2011 16:14:12 +0100
+Subject: [PATCH] Related: rhbz#711087 band-aid
+
+---
+ sc/source/ui/undo/undoblk.cxx |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
+index 8439801..d535c9c 100644
+--- a/sc/source/ui/undo/undoblk.cxx
++++ b/sc/source/ui/undo/undoblk.cxx
+@@ -2084,6 +2084,9 @@ void ScUndoRemoveMerge::Undo()
+     for (set<SCTAB>::const_iterator itr = maOption.maTabs.begin(), itrEnd = maOption.maTabs.end();
+           itr != itrEnd; ++itr)
+     {
++        OSL_ENSURE(pUndoDoc, "NULL pUndoDoc!");
++        if (!pUndoDoc)
++            continue;
+         // There is no need to extend merge area because it's already been extended.
+         ScRange aRange = maOption.getSingleRange(*itr);
+         pDoc->DeleteAreaTab(aRange, IDF_ATTRIB);
+-- 
+1.7.5.4
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 2276abb..81b2801 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -148,6 +148,7 @@ Patch59: 0001-Resolves-rhbz-699909-crash-in-export-of-.doc-in-lcl_.patch
 Patch60: 0001-Resolves-fdo-37668-bitwise-operations-on-signed-numb.patch
 Patch61: 0001-Resolves-rhbz-713154-pdf-export-dialog-too-tall-to-f.patch
 Patch62: 0001-Related-rhbz-702833-addEventListener-without-removeE.patch
+Patch63: 0001-Related-rhbz-711087-band-aid.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -811,6 +812,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch60 -p1 -b .fdo37668-bitwise-operations-on-signed-numb.patch
 %patch61 -p1 -b .rhbz713154-pdf-export-dialog-too-tall-to-f.patch
 %patch62 -p1 -b .rhbz702833-addEventListener-without-removeE.patch
+%patch63 -p1 -b .rhbz711087-band-aid.patch
 
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
@@ -2158,6 +2160,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 * Fri Jun 17 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-2-UNBUILT
 - Resolves: rhbz#713154 pdf export dialog too tall to fit
 - Related: rhbz#702833 addEventListener without removeEventListener
+- Related: rhbz#711087 band aid for crash in undo
 
 * Tue Jun 14 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-1
 - bugfixing 3.3.3.1 point release