[openoffice.org] Resolves: rhbz#632326 [abrt] [docx] _Construct<long, long> crash

[David Tardon]

commit d2a44a42f2b64e9c2b8dddea29e0c3202cd20ffc
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Sep 30 08:07:51 2010 +0200

    Resolves: rhbz#632326 [abrt] [docx] _Construct<long, long> crash

 ....rh632236.writerfilter.cleanup-cell-props.patch |   37 ++++++++++++++++++++
 openoffice.org.spec                                |    8 ++++-
 2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch b/openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch
new file mode 100644
index 0000000..0c237dd
--- /dev/null
+++ b/openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch
@@ -0,0 +1,37 @@
+# HG changeset patch
+# Parent 95fe59fa4df8614a0bf6b0f5b7c7114e98a28f8d
+rhbz#632236: [abrt] [docx] _Construct<long, long> crash
+
+diff -r 95fe59fa4df8 writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx	Wed Sep 29 09:32:54 2010 +0200
++++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx	Wed Sep 29 09:59:15 2010 +0200
+@@ -492,13 +492,6 @@
+         if( aRepeatIter == m_aTableProperties->end() )
+             m_aTableProperties->Insert( PROP_HEADER_ROW_COUNT, false, uno::makeAny( (sal_Int32)0 ));
+         
+-        // Remove the PROP_HEADER_ROW_COUNT from the table default to avoid
+-        // propagating it to the cells
+-        PropertyMap::iterator aDefaultRepeatIt =
+-        rInfo.pTableDefaults->find( PropertyDefinition( PROP_HEADER_ROW_COUNT, false ) );
+-        if ( aDefaultRepeatIt != rInfo.pTableDefaults->end( ) )
+-            rInfo.pTableDefaults->erase( aDefaultRepeatIt );
+-        
+         rInfo.aTableProperties = m_aTableProperties->GetPropertyValues();
+         
+ #ifdef DEBUG_DOMAINMAPPER
+@@ -588,7 +581,14 @@
+                     PropertyMapPtr pStyleProps = rInfo.pTableStyle->GetProperties( nCellStyleMask + nRowStyleMask );
+                     pAllCellProps->insert( pStyleProps );
+                 }
+-                
++
++                // Remove properties from style/row that aren't allowed in cells
++                const PropertyMap::iterator aDefaultRepeatIt =
++                    pAllCellProps->find(
++                        PropertyDefinition( PROP_HEADER_ROW_COUNT, false ) );
++                if ( aDefaultRepeatIt != pAllCellProps->end( ) )
++                    pAllCellProps->erase( aDefaultRepeatIt );
++
+                 // Then add the cell properties
+                 pAllCellProps->insert( *aCellIterator );
+                 aCellIterator->get( )->swap( *pAllCellProps.get( ) );
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 3747eb0..63bd59a 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 9
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -120,6 +120,7 @@ Patch41: workspace.cmcfixes79.patch
 Patch42: openoffice.org-3.3.0.ooo114703.vcl.betterlocalize.font.patch
 Patch43: openoffice.org-3.3.0.rh637738.libgcrypt.addmutex.patch
 Patch44: openoffice.org-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch
+Patch45: openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1652,6 +1653,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch42 -p1 -b .ooo114703.vcl.betterlocalize.font.patch
 %patch43 -p0 -b .rh637738.libgcrypt.addmutex.patch
 %patch44 -p1 -b .rh638185.editeng.cjkctlhtmlsizes.patch
+%patch45 -p1 -b .rh632236.writerfilter.cleanup-cell-props.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3850,6 +3852,10 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Thu Sep 30 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-9.2
+- Resolves: rhbz#632326 [abrt] [docx] _Construct<long, long> crash
+  (dtardon)
+
 * Tue Sep 28 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-9.1
 - Resolves: rhbz#638185 cjk/ctl font sizes wrong in impress