diff options
| author | Justin Luth <justin_luth@sil.org> | 2017-10-17 12:45:48 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-10-26 12:21:13 +0200 |
| commit | 018687837648dfe1832ddabbd4cda183708d7fdc (patch) | |
| tree | a74e7e680c4dbd67835e0892a8f714f88f959387 /writerfilter | |
| parent | f2fa3440330c8bdc352c0633a133e773b0ac0fcf (diff) | |
related tdf#78508 and n#793262: import w:tcMar_start/end
Although 2013 commit 60ec497e0e91354a616978be531d15d3efa3f559
added support for the other tcMar items, it omitted _start and
_end (perhaps because they caused unit test failures).
The document in bug 78508 proves that these are needed.
Testing whether the cell spacing matches the default table
spacing should occur before adjusting for MSO compatibility.
This fixes the three unit tests that mysteriously failed
when adding _start/_end support.
Unfortunately, these two fixes could not be committed
separately - the unit test fails unless both parts
are included. I couldn't figure out why.
Change-Id: I9507da48b629b9618c5ee790bf0088ce82fc5692
Reviewed-on: https://gerrit.libreoffice.org/43432
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/CellMarginHandler.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx index d1e20d2ee3a8..194e9e2722ec 100644 --- a/writerfilter/source/dmapper/CellMarginHandler.cxx +++ b/writerfilter/source/dmapper/CellMarginHandler.cxx @@ -108,6 +108,7 @@ void CellMarginHandler::lcl_sprm(Sprm & rSprm) createGrabBag("top"); break; case NS_ooxml::LN_CT_TblCellMar_start: + case NS_ooxml::LN_CT_TcMar_start: if( rtl ) { m_nRightMargin = m_nValue; @@ -133,6 +134,7 @@ void CellMarginHandler::lcl_sprm(Sprm & rSprm) createGrabBag("bottom"); break; case NS_ooxml::LN_CT_TblCellMar_end: + case NS_ooxml::LN_CT_TcMar_end: if( rtl ) { m_nLeftMargin = m_nValue; |