diff options
| author | László Németh <nemeth@numbertext.org> | 2020-04-06 12:02:10 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-04-07 14:24:45 +0200 |
| commit | f1c7aa5267a8045892890954df3c269a3abaab99 (patch) | |
| tree | 8f393ae4a94be0103f7c45faa3d5fa5825c88622 /writerfilter/source/dmapper | |
| parent | 6a6c6b9242b699b993acb2eeead609cb4faa862d (diff) | |
tdf#131819 DOCX import: fix fixed size nested table
Auto width nested table with fixed width cells
is imported as fixed width table to keep the
original cell widths, which define the width of
the table, too.
Partial revert of commit bed818c5d5e92a0b189f25e18495fc205d949128
(tdf#104876 writerfilter: m_bTableSizeTypeInserted = false here).
Change-Id: If58c58a792853e1084ff1d8f9bf6ef74a593b1bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91764
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'writerfilter/source/dmapper')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 891a00d4a63c..a1bb10e74850 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -180,6 +180,12 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) pPropMap->setValue( TablePropertyMap::TABLE_WIDTH, 0 ); m_bTableSizeTypeInserted = true; } + else if (getTableDepth() > 1) + { + // tdf#131819 limiting the fix for nested tables temporarily + // TODO revert the fix for tdf#104876 and reopen it + m_bTableSizeTypeInserted = true; + } } } #ifdef DBG_UTIL |