summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper/DomainMapperTableManager.cxx
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2020-07-13 11:50:58 +0300
committerMiklos Vajna <vmiklos@collabora.com>2020-07-21 09:16:50 +0200
commitc3ca7e85ea27cb19475086e64b14e780c93910ca (patch)
treef3b1fe1c4172237d5a80012f658cab6931c308d0 /writerfilter/source/dmapper/DomainMapperTableManager.cxx
parent5a083be34456e91427d0f2e2fea172f49f4502db (diff)
tdf#134709 writerfilter: consider gridAfter for table borders
When the table itself defines borders, those borders should apply to the last cell in each row - even if some grids are skipped with gridAfter. (i.e. it won't be a straight line on the right side). This commit depends on an earlier commit doing this for gridBefore. Prior to this, gridAfter was never actually sent to DomainMapper, so it was always at its initialized value of zero, and it was only handled in the ooxml handlers. So the bulk of this patch is setting up the foundational parts of gridAfter - duplicating what was recently changed in LO 7.1 for gridBefore. Change-Id: Ieaf965fecf618eeaf41c7e8403b536c396138804 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98692 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapperTableManager.cxx')
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index a17a736504e4..cefe801145c5 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -40,7 +40,6 @@ DomainMapperTableManager::DomainMapperTableManager() :
m_nRow(0),
m_nCell(),
m_nGridSpan(1),
- m_nGridAfter(0),
m_nHeaderRepeat(0),
m_nTableWidth(0),
m_bIsInShape(false),
@@ -356,7 +355,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
setCurrentGridBefore( nIntValue );
break;
case NS_ooxml::LN_CT_TrPrBase_gridAfter:
- m_nGridAfter = nIntValue;
+ setCurrentGridAfter( nIntValue );
break;
case NS_ooxml::LN_CT_TblPrBase_tblCaption:
// To-Do: Not yet preserved
@@ -811,7 +810,6 @@ void DomainMapperTableManager::endOfRowAction()
getCurrentGrid()->clear();
pCellWidths->clear();
- m_nGridAfter = 0;
m_bTableSizeTypeInserted = false;
#ifdef DBG_UTIL