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?= +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::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 a05d3b8..c6b58bf 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -19,7 +19,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: 3.4.1.1 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -95,6 +95,7 @@ Patch16: 0001-handle-NULL-display-gracefully.patch Patch17: 0001-Related-rhbz-652604-better-survive-exceptions-thrown.patch Patch18: 0001-Resolves-rhbz-713154-pdf-export-dialog-too-tall-to-f.patch Patch19: 0001-Related-rhbz-702833-addEventListener-without-removeE.patch +Patch20: 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} @@ -715,6 +716,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch17 -p1 -b .rhbz652604-better-survive-exceptions-thrown.patch %patch18 -p1 -b .rhbz713154-pdf-export-dialog-too-tall-to-f.patch %patch19 -p1 -b .rhbz702833-addEventListener-without-removeE.patch +%patch20 -p1 -b .rhbz711087-band-aid.patch # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings @@ -1995,6 +1997,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{basisinstdir}/program/kde-open-url %changelog +* Fri Jun 17 2011 Caolán McNamara - 3.4.1.1-4-UNBUILT +- Related: rhbz#711087 band aid for crash in sc undo + * Fri Jun 17 2011 Caolán McNamara - 3.4.1.1-3 - Related: rhbz#702833 addEventListener without removeEventListener