diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-12-23 13:49:19 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2017-01-05 04:29:15 +0000 |
| commit | 3d5ccc1577ff89bd13c26a8cde787a39482a8b81 (patch) | |
| tree | 72051827301047d84aeb1c6464a445d262469881 /writerfilter | |
| parent | c63fe08c485baba133ebbeaef28fe97113dded35 (diff) | |
tdf#99616 writerfilter: hideMark shouldn't force min size
hideMark in Word does not force the minimum possible row size,
but simply ignores any cell marker styles/sizings. So an empty row
then takes on the "at least" size defined for the row.
Change-Id: Id24a52f2a360a5040c2eed5c17757c0d32d03520
Reviewed-on: https://gerrit.libreoffice.org/32380
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 1a58cdf8af1aba52ce0a376666dd7d742234d7cf)
Reviewed-on: https://gerrit.libreoffice.org/32721
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 3af9e3b17b4c..81220bdfec2d 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -928,7 +928,6 @@ css::uno::Sequence<css::beans::PropertyValues> DomainMapperTableHandler::endTabl TagLogger::getInstance().startElement("getRowProperties"); #endif - static const int MINLAY = 23; // sw/inc/swtypes.hxx, minimal possible size of frames. css::uno::Sequence<css::beans::PropertyValues> aRowProperties( m_aRowProperties.size() ); PropertyMapVector1::const_iterator aRowIter = m_aRowProperties.begin(); PropertyMapVector1::const_iterator aRowIterEnd = m_aRowProperties.end(); @@ -948,9 +947,8 @@ css::uno::Sequence<css::beans::PropertyValues> DomainMapperTableHandler::endTabl if (lcl_hideMarks(m_aCellProperties[nRow]) && lcl_emptyRow(m_aTableRanges, nRow)) { // We have CellHideMark on all cells, and also all cells are empty: - // Set the row height to minimal as Word does. + // Force the row height to be exactly as specified, and not just as the minimum suggestion. (*aRowIter)->Insert(PROP_SIZE_TYPE, uno::makeAny(text::SizeType::FIX)); - (*aRowIter)->Insert(PROP_HEIGHT, uno::makeAny(static_cast<sal_Int32>(ConversionHelper::convertTwipToMM100(MINLAY)))); } aRowProperties[nRow] = (*aRowIter)->GetPropertyValues(); |