From f49065018fc3e367783fecd57eaf268941dda36d Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Dec 15 2011 10:53:26 +0000 Subject: Resolves rhbz#754051 Libreoffice calc crashes when re-opening a xlxs file --- diff --git a/0001-Resolves-rhbz-754051-Libreoffice-calc-crashes-when-r.patch b/0001-Resolves-rhbz-754051-Libreoffice-calc-crashes-when-r.patch new file mode 100644 index 0000000..d4f10ad --- /dev/null +++ b/0001-Resolves-rhbz-754051-Libreoffice-calc-crashes-when-r.patch @@ -0,0 +1,44 @@ +From fbdddb784108b9f4e5e3d76c50b9aac81c73a019 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Eike Rathke +Date: Mon, 12 Dec 2011 19:01:42 +0100 +Subject: [PATCH] fixed rhbz#754051 Libreoffice calc crashes when re-opening a + xlxs file +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="------------erAck-patch-parts" + +This is a multi-part message in MIME format. +--------------erAck-patch-parts +Content-Type: text/plain; charset=UTF-8; format=fixed +Content-Transfer-Encoding: 8bit + + +ScMatrixImpl lacked initialization of pErrorInterpreter=NULL. + +Signed-off-by: Kohei Yoshida +--- + sc/source/core/tool/scmatrix.cxx | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + + +--------------erAck-patch-parts +Content-Type: text/x-patch; name="0001-fixed-rhbz-754051-Libreoffice-calc-crashes-when-re-o.patch" +Content-Transfer-Encoding: 8bit +Content-Disposition: attachment; filename="0001-fixed-rhbz-754051-Libreoffice-calc-crashes-when-re-o.patch" + +diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx +index 912eef1..e53ca6b 100644 +--- a/sc/source/core/tool/scmatrix.cxx ++++ b/sc/source/core/tool/scmatrix.cxx +@@ -244,6 +244,7 @@ private: + ScMatrixImpl::ScMatrixImpl(SCSIZE nC, SCSIZE nR, ScMatrix::DensityType eType) : + maMat(nR, nC, toMddsDensityType(eType)), + meType(eType), ++ pErrorInterpreter(NULL), + mbCloneIfConst(true) + { + } + +--------------erAck-patch-parts-- + + diff --git a/libreoffice.spec b/libreoffice.spec index 4fd5c72..c16cca7 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -130,6 +130,7 @@ Patch31: 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch Patch32: 0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch Patch33: 0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch Patch34: 0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch +Patch35: 0001-Resolves-rhbz-754051-Libreoffice-calc-crashes-when-r.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -808,6 +809,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch32 -p1 -b .rhbz759647-dispose-clears-mpPresTimer-befo.patch %patch33 -p1 -b .fdo43308-Set-the-logic-straight-for-center-across-s.patch %patch34 -p1 -b .rhbz761009-IFSD_Equal-is-asymmetrical.patch +%patch35 -p1 -b .rhbz754051-Libreoffice-calc-crashes-when-r.patch # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings @@ -2121,6 +2123,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %changelog * Tue Dec 13 2011 Caolán McNamara - 3.4.4.2-6-UNBUILT - Resolves: rhbz#761009 IFSD_Equal is asymmetrical +- Resolves: rhbz#754051 Libreoffice calc crashes when re-opening a xlxs file * Fri Dec 09 2011 Caolán McNamara - 3.4.4.2-5 - Resolves: rhbz#759647 dispose clears mpPresTimer