[openoffice.org/f12/master] Resolves: rhbz#568277 workaround to avoid the crash

[David Tardon]

commit c76571872ee024386ec95015f44f30ea29b02d46
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Aug 14 12:58:00 2010 +0200

    Resolves: rhbz#568277 workaround to avoid the crash

 ...1.1.rhbz568277.avoid-crash-in-docx-import.patch |   20 ++++++++++++++++++++
 openoffice.org.spec                                |    7 ++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org-3.1.1.rhbz568277.avoid-crash-in-docx-import.patch b/openoffice.org-3.1.1.rhbz568277.avoid-crash-in-docx-import.patch
new file mode 100644
index 0000000..47c9dc6
--- /dev/null
+++ b/openoffice.org-3.1.1.rhbz568277.avoid-crash-in-docx-import.patch
@@ -0,0 +1,20 @@
+diff -r 8613d0b4fa3e writerfilter/source/dmapper/ListTable.cxx
+--- a/writerfilter/source/dmapper/ListTable.cxx	Sun Aug 08 08:27:44 2010 +0200
++++ b/writerfilter/source/dmapper/ListTable.cxx	Sat Aug 14 12:40:41 2010 +0200
+@@ -817,12 +817,14 @@
+         break;
+         case NS_ooxml::LN_CT_Ind_left:
+             /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
+-            m_pImpl->m_pCurrentEntry->pCurrentProperties->Insert(
++            if(m_pImpl->m_pCurrentEntry->pCurrentProperties.get())
++                m_pImpl->m_pCurrentEntry->pCurrentProperties->Insert(
+                 PROP_LEFT_MARGIN, true, uno::makeAny( ConversionHelper::convertTwipToMM100(nIntValue ) ));
+             break;
+         case NS_ooxml::LN_CT_Ind_hanging:
+             /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
+-            m_pImpl->m_pCurrentEntry->pCurrentProperties->Insert(
++            if(m_pImpl->m_pCurrentEntry->pCurrentProperties.get())
++                m_pImpl->m_pCurrentEntry->pCurrentProperties->Insert(
+                 PROP_FIRST_LINE_OFFSET, true, uno::makeAny( - ConversionHelper::convertTwipToMM100(nIntValue ) ));
+         break;
+ //        case NS_ooxml::LN_CT_Ind_firstLine:
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 9cd996c..c17f1fe 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 35
+%define rh_rpm_release 36
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -214,6 +214,7 @@ Patch135: openoffice.org-3.2.1.pyuno.patch
 Patch136: workspace.gtkfpicker9.patch
 Patch137: openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch
 Patch138: workspace.impress197.patch
+Patch139: openoffice.org-3.1.1.rhbz568277.avoid-crash-in-docx-import.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1821,6 +1822,7 @@ cat %{PATCH11} >> svtools/source/dialogs/localize.sdf
 %patch136 -p0 -b .workspace.gtkfpicker9.patch
 %patch137 -p1 -b .ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch
 %patch138 -p1 -b .workspace.impress197.patch
+%patch139 -p1 -b .rhbz568277.avoid-crash-in-docx-import.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4366,6 +4368,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Sat Aug 14 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.36-UNBUILT
+- Resolves: rhbz#568277 workaround to avoid the crash (dtardon)
+
 * Thu Aug 12 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.35
 - Resolves: rhbz#623609 CVE-2010-2935 CVE-2010-2936