From 029951e6d3636d99b370568313b8b5c2da8b452d Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Fri, 17 Aug 2018 18:38:57 +0300 Subject: tdf#116436 doc export: add missing table background fill MS formats only have support for Table and Cell fill. Interestingly, MS Word doesn't let the cells inherit from the Table fill setting, so that value also needs to be written out into every cell. Since Word apparently ignores the table color, I didn't bother trying to search out how to export that in DOC format. (I did add it to DOCX since it was so easy to find.) Change-Id: I8946f07b45f72fed5959369182882a7bf013b1d0 Reviewed-on: https://gerrit.libreoffice.org/59281 Tested-by: Jenkins Reviewed-by: Justin Luth (cherry picked from commit b576ab5073a8cdf5ca2db04838d255e142f5a896) Reviewed-on: https://gerrit.libreoffice.org/59287 Reviewed-by: Miklos Vajna --- sw/source/filter/ww8/wrtww8.cxx | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'sw/source') diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 745907044b52..833de9c7b452 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2582,6 +2582,7 @@ void WW8AttributeOutput::TableCellBorders( void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { + const SwTable * pTab = pTableTextNodeInfoInner->getTable(); const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox(); const SwTableLine * pTabLine = pTabBox->GetUpper(); const SwTableBoxes & rTabBoxes = pTabLine->GetTabBoxes(); @@ -2590,19 +2591,24 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t m_rWW8Export.InsUInt16( NS_sprm::sprmTDefTableShd80 ); m_rWW8Export.pO->push_back( static_cast(nBoxes * 2) ); // Len + Color aRowColor = COL_AUTO; + const SvxBrushItem *pTableColorProp = pTab->GetFrameFormat()->GetAttrSet().GetItem(RES_BACKGROUND); + if ( pTableColorProp ) + aRowColor = pTableColorProp->GetColor(); + + const SvxBrushItem *pRowColorProp = pTabLine->GetFrameFormat()->GetAttrSet().GetItem(RES_BACKGROUND); + if ( pRowColorProp && pRowColorProp->GetColor() != COL_AUTO ) + aRowColor = pRowColorProp->GetColor(); + for ( sal_uInt8 n = 0; n < nBoxes; n++ ) { const SwTableBox * pBox1 = rTabBoxes[n]; const SwFrameFormat * pFrameFormat = pBox1->GetFrameFormat(); - const SfxPoolItem * pI = nullptr; - Color aColor; + Color aColor = aRowColor; - if ( SfxItemState::SET == pFrameFormat->GetAttrSet().GetItemState( RES_BACKGROUND, false, &pI ) ) - { - aColor = dynamic_cast(pI)->GetColor(); - } - else - aColor = COL_AUTO; + const SvxBrushItem *pCellColorProp = pFrameFormat->GetAttrSet().GetItem(RES_BACKGROUND); + if ( pCellColorProp && pCellColorProp->GetColor() != COL_AUTO ) + aColor = pCellColorProp->GetColor(); WW8_SHD aShd; WW8Export::TransBrush( aColor, aShd ); @@ -2624,17 +2630,11 @@ void WW8AttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t { const SwTableBox * pBox1 = rTabBoxes[n]; const SwFrameFormat * pFrameFormat = pBox1->GetFrameFormat(); - const SfxPoolItem * pI = nullptr; - Color aColor; + Color aColor = aRowColor; - if ( SfxItemState::SET == - pFrameFormat->GetAttrSet(). - GetItemState( RES_BACKGROUND, false, &pI ) ) - { - aColor = dynamic_cast(pI)->GetColor(); - } - else - aColor = COL_AUTO; + const SvxBrushItem *pCellColorProp = pFrameFormat->GetAttrSet().GetItem(RES_BACKGROUND); + if ( pCellColorProp && pCellColorProp->GetColor() != COL_AUTO ) + aColor = pCellColorProp->GetColor(); WW8SHDLong aSHD; aSHD.setCvFore( 0xFF000000 ); -- cgit v1.2.3