diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-09-23 15:14:08 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-09-24 20:56:27 +0200 |
| commit | 38aa699f265c17548769aaa4f20e1ae35d18f202 (patch) | |
| tree | d95e038a17ed9ec261824d4db098be3bb1e749e9 /sw/qa | |
| parent | 5d67dcc922f831d91424cae8d8758f067a6781b0 (diff) | |
tdf#134782 sw: split AddParaSpacingToTableCells flag in 2
commit 3cccdabf19a99fd3f657985c1822436d7679df2b "extend
AddParaSpacingToTableCells with line spacing" changed how the
ADD_PARA_SPACING_TO_TABLE_CELLS compat flag works, to improve interop
with Word.
This commit splits out the change as a separate new compat flag
ADD_PARA_LINE_SPACING_TO_TABLE_CELLS ("AddParaLineSpacingToTableCells"),
to preserve compatibility with ODT documents that were produced
by LO < 6.4 (via SwXMLImport::SetConfigurationSettings()).
New documents and WW8/RTF/DOCX import have both flags enabled.
The combination false/true is invalid, and treated as equivalent
to false/false.
Change-Id: Ida20df8fe4a8192a714f91da95345f9726fd7d98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103317
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index ce0a43f8c213..194fea99d3b1 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -1196,10 +1196,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTableOverlapFooterFly) assertXPath(pLayout, "/root/page[2]/body/tab[1]/row[5]/cell[5]/txt[1]/Text", "Portion", "Abc def ghi jkl mno pqr stu vwx yz."); // height was: 1517 - assertXPath( - pLayout, "/root/page[2]/body/tab[1]/row[5]/cell[5]/txt[1]/infos/bounds", "height", - // "253"); // FIXME: this is correct but 3cccdabf19a99fd3f657985c1822436d7679df2b breaks it - "379"); + // tdf#134782 height was: 379 + assertXPath(pLayout, "/root/page[2]/body/tab[1]/row[5]/cell[5]/txt[1]/infos/bounds", "height", + "253"); } CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf134277) |