Resolves: rhbz#842552 crash in pptx import

f41
David Tardon 13 years ago
parent d18fd8ca85
commit c86a3caae9

@ -0,0 +1,34 @@
From 73e3accda680cc2edee0425ec54def5d26e8648b Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 26 Jul 2012 14:17:09 +0200
Subject: [PATCH] rhbz#842552 always create text content
The following line in oox::drawingml::table::TableCell::pushToXCell
suggests that it is assumed that the cell always contains text:
Reference< text::XText > xText( rxCell, UNO_QUERY_THROW );
So TableCell should always hold a valid TextBody too.
Change-Id: Ic2db7b535c98dd5f2b18941846709a781df4585c
---
oox/source/drawingml/table/tablecell.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index 96fa5b7..c89a4f9 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -44,7 +44,8 @@ using ::com::sun::star::drawing::LineStyle;
namespace oox { namespace drawingml { namespace table {
TableCell::TableCell()
-: mnRowSpan ( 1 )
+: mpTextBody( new TextBody() )
+, mnRowSpan ( 1 )
, mnGridSpan( 1 )
, mbhMerge( sal_False )
, mbvMerge( sal_False )
--
1.7.10.4

@ -34,7 +34,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.3 Version: %{libo_version}.3
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 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
Group: Applications/Productivity Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop URL: http://www.documentfoundation.org/develop
@ -168,6 +168,7 @@ Patch8: 0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch
# TODO: look what the problem is # TODO: look what the problem is
Patch9: 0001-disable-failing-check.patch Patch9: 0001-disable-failing-check.patch
Patch10: 0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch Patch10: 0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch
Patch11: 0001-rhbz-842552-always-create-text-content.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir} %define instdir %{_libdir}
@ -775,6 +776,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch8 -p1 -b .rhbz838368-view-ignored-while-view-accepte.patch %patch8 -p1 -b .rhbz838368-view-ignored-while-view-accepte.patch
%patch9 -p1 -b .disable-failing-check.patch %patch9 -p1 -b .disable-failing-check.patch
%patch10 -p1 -b .rhbz-836937-insanely-slow-with-Zemberek-ins.patch %patch10 -p1 -b .rhbz-836937-insanely-slow-with-Zemberek-ins.patch
%patch11 -p1 -b .rhbz-842552-always-create-text-content.patch
# TODO: check this # TODO: check this
# these are horribly incomplete--empty translations and copied english # these are horribly incomplete--empty translations and copied english
@ -2009,6 +2011,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif %endif
%changelog %changelog
* Thu Jul 26 2012 David Tardon <dtardon@redhat.com> - 1:3.6.0.3-2
- Resolves: rhbz#842552 crash in pptx import
* Wed Jul 25 2012 David Tardon <dtardon@redhat.com> - 1:3.6.0.3-1 * Wed Jul 25 2012 David Tardon <dtardon@redhat.com> - 1:3.6.0.3-1
- 3.6.0 rc3 - 3.6.0 rc3

Loading…
Cancel
Save