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

[David Tardon]

commit 574ec3c0c9180f011c0e79f68999f8e4f66810b7
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Aug 14 15:54:18 2010 +0200

    Resolves: rhbz#568277 workaround to avoid the crash

 ...1.1.rhbz568277.avoid-crash-in-docx-import.patch |   53 ++++++++++++++++++++
 openoffice.org.spec                                |    7 ++-
 2 files changed, 59 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..abf7475
--- /dev/null
+++ b/openoffice.org-3.1.1.rhbz568277.avoid-crash-in-docx-import.patch
@@ -0,0 +1,53 @@
+import openoffice.org-3.1.1.rhbz568277.avoid-crash-in-docx-import.patch
+
+diff -r a5415084a883 writerfilter/source/dmapper/ListTable.cxx
+--- a/writerfilter/source/dmapper/ListTable.cxx	Sat Aug 14 13:10:18 2010 +0200
++++ b/writerfilter/source/dmapper/ListTable.cxx	Sat Aug 14 15:50:36 2010 +0200
+@@ -421,17 +421,20 @@
+         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_INDENT_AT, 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_INDENT, true, uno::makeAny( - ConversionHelper::convertTwipToMM100( nIntValue ) ));
+         break;
+         case NS_ooxml::LN_CT_Ind_firstLine:
+             /* 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_INDENT, true, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) ));
+         break;
+         case NS_ooxml::LN_CT_Lvl_ilvl: //overrides previous level - unsupported
+@@ -440,8 +443,9 @@
+         break;
+         case NS_ooxml::LN_CT_TabStop_pos:
+         {
+-            //no paragraph attributes in ListTable char style sheets
+-            m_pImpl->m_pCurrentEntry->pCurrentProperties->nTabstop = ConversionHelper::convertTwipToMM100( nIntValue );
++            if(m_pImpl->m_pCurrentEntry->pCurrentProperties.get())
++                //no paragraph attributes in ListTable char style sheets
++                m_pImpl->m_pCurrentEntry->pCurrentProperties->nTabstop = ConversionHelper::convertTwipToMM100( nIntValue );
+         }
+         break;
+         default:
+@@ -566,8 +570,9 @@
+                     text::HoriOrientation::CENTER,
+                     text::HoriOrientation::RIGHT
+                 };
+-                m_pImpl->m_pCurrentEntry->pCurrentProperties->Insert( 
+-                    PROP_ADJUST, true, uno::makeAny( aWWAlignments[ nIntValue ] ) );
++                if(m_pImpl->m_pCurrentEntry->pCurrentProperties.get())
++                    m_pImpl->m_pCurrentEntry->pCurrentProperties->Insert( 
++                        PROP_ADJUST, true, uno::makeAny( aWWAlignments[ nIntValue ] ) );
+                     writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
+             }
+             break;
diff --git a/openoffice.org.spec b/openoffice.org.spec
index bd53edb..9841a5e 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 12
-%define rh_rpm_release 31
+%define rh_rpm_release 32
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -172,6 +172,7 @@ Patch101: openoffice.org-3.2.0.ooo113400.canvas.fix-scaling.patch
 Patch102: openoffice.org-3.3.0.ooo106591.sal.tradcopy.patch
 Patch103: workspace.impress197.patch
 Patch104: openoffice.org-3.3.0.ooo113856.vcl.mutter.patch
+Patch105: openoffice.org-3.1.1.rhbz568277.avoid-crash-in-docx-import.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1774,6 +1775,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch102 -p0 -b .ooo106591.sal.tradcopy.patch
 %patch103 -p1 -b .workspace.impress197.patch
 %patch104 -p1 -b .ooo113856.vcl.mutter.patch
+%patch105 -p1 -b .rhbz568277.avoid-crash-in-docx-import.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4259,6 +4261,9 @@ fi
 %endif
 
 %changelog
+* Sat Aug 14 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.32-UNBUILT
+- Resolves: rhbz#568277 workaround to avoid the crash (dtardon)
+
 * Fri Aug 13 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.31
 - Resolves: rhbz#623800 gnome-shell/mutter focus problems