# 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( ) );