From 1c339c753e5a6486a5e2c8061368102448d3526f Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 22 Mar 2011 14:20:15 +0100 Subject: [PATCH] avoid crash in calc on changing size of rows --- 0001-beware-of-invalidated-iterator.patch | 31 +++++++++++++++++++++++ libreoffice.spec | 3 +++ 2 files changed, 34 insertions(+) create mode 100644 0001-beware-of-invalidated-iterator.patch diff --git a/0001-beware-of-invalidated-iterator.patch b/0001-beware-of-invalidated-iterator.patch new file mode 100644 index 0000000..328b7af --- /dev/null +++ b/0001-beware-of-invalidated-iterator.patch @@ -0,0 +1,31 @@ +From 6fbf4caf7385d988559701d14ceed7925b76997d Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Tue, 22 Mar 2011 14:11:12 +0100 +Subject: [PATCH] beware of invalidated iterator + +--- + sc/source/core/data/segmenttree.cxx | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx +index d7d1153..08c3e3c 100644 +--- a/sc/source/core/data/segmenttree.cxx ++++ b/sc/source/core/data/segmenttree.cxx +@@ -204,12 +204,14 @@ template + void ScFlatSegmentsImpl<_ValueType, _ExtValueType>::removeSegment(SCCOLROW nPos1, SCCOLROW nPos2) + { + maSegments.shift_left(nPos1, nPos2); ++ maItr = maSegments.begin(); + } + + template + void ScFlatSegmentsImpl<_ValueType, _ExtValueType>::insertSegment(SCCOLROW nPos, SCCOLROW nSize, bool bSkipStartBoundary) + { + maSegments.shift_right(nPos, nSize, bSkipStartBoundary); ++ maItr = maSegments.begin(); + } + + template +-- +1.7.4.1 + diff --git a/libreoffice.spec b/libreoffice.spec index 2abb460..bc5fc08 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -130,6 +130,7 @@ Patch41: 0001-Related-rhbz-680460-reorganize-this-to-make-it-inher.patch Patch42: 0001-Related-rhbz-680460-don-t-bother-with-an-interim-Fon.patch Patch43: 0001-Resolves-rhbz-680460-honour-lcdfilter-subpixeling-et.patch Patch44: 0001-Cut-Gordian-Knot-of-who-owns-the-font-options.patch +Patch45: 0001-beware-of-invalidated-iterator.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -776,6 +777,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch41 -p1 -b .rhbz680460-reorganize-this-to-make-it-inher.patch %patch42 -p1 -b .rhbz680460-don-t-bother-with-an-interim-Fon.patch %patch43 -p1 -b .rhbz680460-honour-lcdfilter-subpixeling-et.patch +%patch45 -p1 -b .beware-of-invalidated-iterator.patch touch scripting/source/pyprov/delzip touch scripting/util/provider/beanshell/delzip @@ -2124,6 +2126,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %changelog * Tue Mar 22 2011 Caolán McNamara 3.3.1.2-12 - Fix fontoptions cache +- avoid crash in calc on changing size of rows (dtardon) * Mon Mar 21 2011 Caolán McNamara 3.3.1.2-11 - Resolves: rhbz#689268 autocorrs from OOo F14 not upgraded