diff options
| author | Rajashri <rajashri.udhoji@synerzip.com> | 2014-04-04 09:00:27 +0530 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-04-11 12:30:45 +0000 |
| commit | 07f90c89ef78484a422ca4536ba587217147e80a (patch) | |
| tree | 7a6255a5c961858641130687f2e1e799b991b206 /writerfilter | |
| parent | Revert "make it possible to do 'make -C sw/' even with builddir!=srcdir" (diff) | |
| download | core-07f90c89ef78484a422ca4536ba587217147e80a.tar.gz core-07f90c89ef78484a422ca4536ba587217147e80a.zip | |
fdo#76635 : Table borders not preserved after RT
The document containing a custom table is getting crashed.
In the document the user has created his own costume table styles and
in the created custom table style the user has set repeat first row as header property.
The corresponding tag for this property is 'tblHeader'
LO was adding this property as a part of cellProperties in DomainMapperTableHandler.cxx.
But it is a part of a Row Property. That is why there was a crash @ open.
In DomainMapperTableHandler.cxx : 'endTableGetCellProperties' tblHeader property is removed from
style as it is not allowed for a cell.
Change-Id: I83cd369aa4497ec3f4b567174f23ddee9be2864e
Reviewed-on: https://gerrit.libreoffice.org/8848
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 08d1919dd345..336514b78438 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -545,7 +545,6 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo sal_Int32 nHoriOrient = text::HoriOrientation::LEFT_AND_WIDTH; m_aTableProperties->getValue( TablePropertyMap::HORI_ORIENT, nHoriOrient ) ; m_aTableProperties->Insert( PROP_HORI_ORIENT, uno::makeAny( sal_Int16(nHoriOrient) ) ); - //fill default value - if not available const PropertyMap::const_iterator aRepeatIter = m_aTableProperties->find(PROP_HEADER_ROW_COUNT); @@ -695,12 +694,17 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl } // Remove properties from style/row that aren't allowed in cells - const PropertyMap::iterator aDefaultRepeatIt = pAllCellProps->find(PROP_HEADER_ROW_COUNT); + PropertyMap::iterator aDefaultRepeatIt = pAllCellProps->find(PROP_HEADER_ROW_COUNT); + if ( aDefaultRepeatIt != pAllCellProps->end( ) ) + pAllCellProps->erase( aDefaultRepeatIt ); + + aDefaultRepeatIt = pAllCellProps->find(PROP_PARA_LINE_SPACING); if ( aDefaultRepeatIt != pAllCellProps->end( ) ) pAllCellProps->erase( aDefaultRepeatIt ); - const PropertyMap::iterator aDefaultRepeatIt2 = pAllCellProps->find(PROP_PARA_LINE_SPACING); - if ( aDefaultRepeatIt2 != pAllCellProps->end( ) ) - pAllCellProps->erase( aDefaultRepeatIt2 ); + + aDefaultRepeatIt = pAllCellProps->find(PROP_TBL_HEADER); + if ( aDefaultRepeatIt != pAllCellProps->end( ) ) + pAllCellProps->erase( aDefaultRepeatIt ); // Then add the cell properties pAllCellProps->InsertProps(*aCellIterator); |