[libreoffice/f17] Resolves: rhbz#842552 crash in pptx import

[David Tardon]

commit 56d3a5611d3141a558a7757e5a1abfeb083f68bb
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Jul 26 14:33:27 2012 +0200

    Resolves: rhbz#842552 crash in pptx import

 0001-rhbz-842552-always-create-text-content.patch |   34 +++++++++++++++++++++
 libreoffice.spec                                  |    7 ++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/0001-rhbz-842552-always-create-text-content.patch b/0001-rhbz-842552-always-create-text-content.patch
new file mode 100644
index 0000000..f10cdd5
--- /dev/null
+++ b/0001-rhbz-842552-always-create-text-content.patch
@@ -0,0 +1,34 @@
+From 73e3accda680cc2edee0425ec54def5d26e8648b Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at 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
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 1ad91f5..d60100e 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -35,7 +35,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.3
-Release:        4%{?dist}
+Release:        5%{?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
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -147,6 +147,7 @@ Patch32: 0001-use-ure-instead-of-ure-link.patch
 Patch33: 0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch
 Patch34: 0001-resolved-rhbz-838248-init-filter-criteria-string.patch
 Patch35: 0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch
+Patch36: 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))")}
 %define instdir %{_libdir}
@@ -1012,6 +1013,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch33 -p1 -b .rhbz-838368-view-ignored-while-view-accepte.patch
 %patch34 -p1 -b .rhbz-838248-init-filter-criteria-string.patch
 %patch35 -p1 -b .rhbz-836937-insanely-slow-with-Zemberek-ins.patch
+%patch36 -p1 -b .rhbz-842552-always-create-text-content.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2294,6 +2296,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Thu Jul 26 2012 David Tardon <dtardon at redhat.com> - 1:3.5.5.3-5-UNBUILT
+- Resolves: rhbz#842552 crash in pptx import
+
 * Mon Jul 16 2012 Caolán McNamara <caolanm at redhat.com> - 3.5.5.3-4
 - Resolves: rhbz#836937 insanely slow with Zemberek