diff options
author | László Németh <nemeth@numbertext.org> | 2020-06-16 08:13:19 +0200 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2020-06-16 18:31:56 +0200 |
commit | cec1d2cb8eb17a28bf418625ea6ea522d6c1c580 (patch) | |
tree | 530b1a8b6a8ffd78a63719a99c4692d3832f8ac7 /sw/qa | |
parent | 0747e8b98089803d6b66bc8ede3e961c2471f455 (diff) |
tdf#106234 sw: don't justify after centered tabs
(also after right-aligned and decimal-aligned tabs)
before the page break in a justified paragraph.
Justify only after left-aligned tabs, like MSO does.
Regression from commit 07dcbed5fb6d88f69d84313ddede81c222a5a7a6
(INTEGRATION: CWS fmebugs01 (1.15.104); FILE MERGED
2004/02/09 15:13:57 fme 1.15.104.1: #i13507# Justified
alignment for lines containing manual breaks).
See also commit 5d7b3475278f59a423c2139ae51f9b4849621890
(INTEGRATION: CWS swqbf34 (1.17.96); FILE MERGED
2005/06/29 12:12:25 fme 1.17.96.2: #i49277# New
compatibility option bDoNotJustifyLinesWithManualBreak).
Change-Id: Ib92e301aaf46eec283c0850d23549b1b54106068
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96438
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/qa')
-rw-r--r-- | sw/qa/extras/layout/data/tdf106234.fodt | 31 | ||||
-rw-r--r-- | sw/qa/extras/layout/layout.cxx | 21 |
2 files changed, 52 insertions, 0 deletions
diff --git a/sw/qa/extras/layout/data/tdf106234.fodt b/sw/qa/extras/layout/data/tdf106234.fodt new file mode 100644 index 000000000000..18667c4ab152 --- /dev/null +++ b/sw/qa/extras/layout/data/tdf106234.fodt @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> + <office:styles> + <style:style style:name="Standard" style:family="paragraph" style:class="text"/> + <style:default-style style:family="paragraph"> + <style:text-properties fo:language="rn" fo:country="US"/> + </style:default-style> + </office:styles> + <office:automatic-styles> + <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard"> + <style:paragraph-properties fo:text-align="justify" style:justify-single-word="false"> + <style:tab-stops> + <style:tab-stop style:position="2.554cm"/> + </style:tab-stops> + </style:paragraph-properties> + </style:style> + <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard"> + <style:paragraph-properties fo:text-align="justify" style:justify-single-word="false"> + <style:tab-stops> + <style:tab-stop style:position="2.554cm" style:type="center"/> + </style:tab-stops> + </style:paragraph-properties> + </style:style> + </office:automatic-styles> + <office:body> + <office:text> + <text:p text:style-name="P1"><text:tab/>Lorem ipsum<text:line-break/>dolor sit amet, consectetur adipiscing elit. (Justify after left-aligned tab)</text:p> + <text:p text:style-name="P2"><text:span text:style-name="T1"><text:tab/>Lorem ipsum<text:line-break/>dolor sit amet, consectetur adipiscing elit. (Don’t justify after centered tab!)</text:span></text:p> + </office:text> + </office:body> +</office:document> diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index ae7c0fffc1a3..4a09d62a1628 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -3069,6 +3069,27 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf120287) assertXPath(pXmlDoc, "/root/page/body/txt[1]/LineBreak", 1); } +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf106234) +{ + createDoc("tdf106234.fodt"); + // Ensure that all text portions are calculated before testing. + SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); + CPPUNIT_ASSERT(pTextDoc); + SwViewShell* pViewShell + = pTextDoc->GetDocShell()->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell(); + CPPUNIT_ASSERT(pViewShell); + pViewShell->Reformat(); + + xmlDocUniquePtr pXmlDoc = parseLayoutDump(); + // In justified paragraphs, there is justification between left tabulators and page breaks + assertXPath(pXmlDoc, "/root/page/body/txt[1]/Special", "nType", "PortionType::Margin"); + assertXPathNoAttribute(pXmlDoc, "/root/page/body/txt[1]/Special", "nWidth"); + // but not after centered, right and decimal tabulators + assertXPath(pXmlDoc, "/root/page/body/txt[2]/Special", "nType", "PortionType::Margin"); + // This was a justified line, without nWidth + assertXPath(pXmlDoc, "/root/page/body/txt[2]/Special", "nWidth", "7881"); +} + CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf120287b) { createDoc("tdf120287b.fodt"); |