diff options
| author | László Németh <nemeth@numbertext.org> | 2021-03-09 11:11:10 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-03-10 15:28:26 +0100 |
| commit | ff94f7779232088728bf724ec47608f35f5310b7 (patch) | |
| tree | 97b4d17daff91d24ba1c9e5505520b1ebc8928cd /writerfilter | |
| parent | fa90d6da27a56cd2002aabb5f026d39b852f1160 (diff) | |
tdf#140597 DOCX import: fix missing tblPrEx border
of first table cells, caused by the workaround for tdf#138612.
Now property set of a new cell is a copy of the table exception
property set of the table row, as needed for the import of the
table style inheritance.
Regression from commit f319d6b543c2367546bc80d138e56ed03731e265
(tdf#138612 DOCX import: fix lost part of split table cell).
Change-Id: Iaf6637e757fbfeef7651a4300a7f65a23615f5c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112247
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 53884e8fe92597e909e4fa5599192783c3d31a56)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112223
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/TableManager.hxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx index 2dcf679e135f..3bae3223d72a 100644 --- a/writerfilter/source/dmapper/TableManager.hxx +++ b/writerfilter/source/dmapper/TableManager.hxx @@ -112,7 +112,14 @@ class TableManager : public virtual SvRefBase void resetCellProps() { - mpCellProps = getTableExceptionProps(); + // copy tblPrEx table exception properties, if they exist + if (getTableExceptionProps().is()) + { + mpCellProps = new TablePropertyMap; + mpCellProps->InsertProps(getTableExceptionProps().get()); + } + else + mpCellProps.clear(); } void setCellProps(TablePropertyMapPtr pProps) @@ -147,6 +154,8 @@ class TableManager : public virtual SvRefBase void setTableExceptionProps(TablePropertyMapPtr pProps) { mpTableExceptionProps = pProps; + // set table exception properties of the first cell + resetCellProps(); } const TablePropertyMapPtr& getTableExceptionProps() const |