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

[David Tardon]

commit 638deb8a76df013e52f4735ce445287ce10e5637
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Sep 30 08:12:40 2010 +0200

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

 ....rh632236.writerfilter.cleanup-cell-props.patch |   35 ++++++++++++++++++++
 openoffice.org.spec                                |    6 +++-
 2 files changed, 40 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..b645bd1
--- /dev/null
+++ b/openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch
@@ -0,0 +1,35 @@
+# HG changeset patch
+# Parent 4e057fac02101713672bd97b945c2a2b57b98417
+rhbz#632236: [abrt] [docx] _Construct<long, long> crash
+
+diff -r 4e057fac0210 writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx	Wed Sep 29 09:49:31 2010 +0200
++++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx	Wed Sep 29 10:04:52 2010 +0200
+@@ -495,13 +495,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
+@@ -592,6 +585,13 @@
+                     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 af3aba3..40c81a7 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -175,6 +175,7 @@ Patch104: openoffice.org-3.3.0.ooo113856.vcl.mutter.patch
 Patch105: openoffice.org-3.1.1.rhbz568277.avoid-crash-in-docx-import.patch
 Patch106: openoffice.org-3.2.0.ooo114409.sw.prevent-dangling-ptr-deref.patch
 Patch107: openoffice.org-3.3.0.rh637738.libgcrypt.addmutex.patch
+Patch108: 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}
@@ -1780,6 +1781,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch105 -p1 -b .rhbz568277.avoid-crash-in-docx-import.patch
 %patch106 -p1 -b .ooo114409.sw.prevent-dangling-ptr-deref.patch
 %patch107 -p1 -b .rh637738.libgcrypt.addmutex.patch
+%patch108 -p1 -b .rh632236.writerfilter.cleanup-cell-props.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4265,7 +4267,7 @@ fi
 %endif
 
 %changelog
-* Mon Sep 27 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.32-UNBUILT
+* Thu Sep 30 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.32-UNBUILT
 - Resolves: rhbz#568277 workaround to avoid the crash (dtardon)
 - Resolves: rhbz#631543 [abrt] crash on dereferencing dangling
   pointer passed down from SwCalc::Str2Double (dtardon)
@@ -4273,6 +4275,8 @@ fi
   change (caolanm)
 - Resolves: rhbz#637738 threading problems with using libgcrypt via neon when
   libgcrypt which was initialized by cups to be non-thread safe (caolanm)
+- Resolves: rhbz#632326 [abrt] [docx] _Construct<long, long> 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