dev/null |binary
sw/qa/extras/layout/data/tdf144450.fodt | 168 ++++++++++++++++++++++++++++++++
sw/qa/extras/layout/layout5.cxx | 61 +++++++++++
sw/qa/extras/ww8export/ww8export4.cxx | 6 -
sw/source/core/text/itrform2.cxx | 34 ++++++
5 files changed, 262 insertions(+), 7 deletions(-)
New commits:
commit d48e3e1df55120fc0102ff07f1b637933fc91c87
Author: Jonathan Clark <jonat...@libreoffice.org>
AuthorDate: Wed Feb 12 08:18:40 2025 -0700
Commit: Jonathan Clark <jonat...@libreoffice.org>
CommitDate: Wed Feb 12 20:46:57 2025 +0100
tdf#164871 sw: Implemented exact and at-least line spacing for grid
Previously, paragraphs snapped to CJK grid allowed proportional line
spacing, but did not allow either exact or at-least line spacing. These
other line spacing types had not been implemented.
Change-Id: I4c07876ab4f9881899bcc2ebb8b64019141bf988
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181508
Tested-by: Jenkins
Reviewed-by: Jonathan Clark <jonat...@libreoffice.org>
diff --git a/sw/qa/extras/layout/data/tdf144450.fodt
b/sw/qa/extras/layout/data/tdf144450.fodt
new file mode 100644
index 000000000000..598d179363bb
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf144450.fodt
@@ -0,0 +1,168 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<office:document xmlns:css3t="http://www.w3.org/TR/css3-text/";
xmlns:grddl="http://www.w3.org/2003/g/data-view#";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c
alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:officeooo="http://openoffice.org/2009/office";
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
meta:1.0"
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
office:version="1.4" office:mimetype="application/vnd.oasis.opendocument.text">
+
<office:meta><meta:creation-date>2025-02-12T10:58:58.191028084</meta:creation-date><dc:date>2025-02-12T11:06:48.424292523</dc:date><meta:editing-duration>PT7M50S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:generator>LibreOfficeDev/25.8.0.0.alpha0$Linux_X86_64
LibreOffice_project/2e93642a5f37f03ddd9530c0fd4d4b29243a0585</meta:generator><meta:document-statistic
meta:table-count="0" meta:image-count="0" meta:object-count="0"
meta:page-count="12" meta:paragraph-count="11" meta:word-count="77"
meta:character-count="374"
meta:non-whitespace-character-count="308"/></office:meta>
+ <office:font-face-decls>
+ <style:font-face style:name="Liberation Serif" svg:font-family="'Liberation
Serif'" style:font-family-generic="roman" style:font-pitch="variable"/>
+ <style:font-face style:name="Noto Sans1" svg:font-family="'Noto Sans'"
style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Noto Sans2" svg:font-family="'Noto Sans'"
style:font-adornments="Regular" style:font-family-generic="swiss"
style:font-pitch="variable"/>
+ <style:font-face style:name="Noto Serif CJK SC" svg:font-family="'Noto Serif
CJK SC'" style:font-family-generic="system" style:font-pitch="variable"/>
+ </office:font-face-decls>
+ <office:styles>
+ <style:default-style style:family="graphic">
+ <style:graphic-properties svg:stroke-color="#3465a4"
draw:fill-color="#729fcf" fo:wrap-option="no-wrap"
draw:shadow-offset-x="0.1181in" draw:shadow-offset-y="0.1181in"
draw:start-line-spacing-horizontal="0.1114in"
draw:start-line-spacing-vertical="0.1114in"
draw:end-line-spacing-horizontal="0.1114in"
draw:end-line-spacing-vertical="0.1114in" style:flow-with-text="false"/>
+ <style:paragraph-properties style:text-autospace="ideograph-alpha"
style:line-break="strict" loext:tab-stop-distance="0in"
style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
+ <style:tab-stops/>
+ </style:paragraph-properties>
+ <style:text-properties style:use-window-font-color="true"
loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="12pt"
fo:language="en" fo:country="US" style:letter-kerning="true"
style:font-name-asian="Noto Serif CJK SC" style:font-size-asian="10.5pt"
style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="Noto Sans1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN"/>
+ </style:default-style>
+ <style:default-style style:family="paragraph">
+ <style:paragraph-properties fo:orphans="2" fo:widows="2"
fo:hyphenation-ladder-count="no-limit" fo:hyphenation-keep="auto"
loext:hyphenation-keep-type="column" style:text-autospace="ideograph-alpha"
style:punctuation-wrap="hanging" style:line-break="strict"
style:tab-stop-distance="0.4925in" style:writing-mode="page"/>
+ <style:text-properties style:use-window-font-color="true"
loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="12pt"
fo:language="en" fo:country="US" style:letter-kerning="true"
style:font-name-asian="Noto Serif CJK SC" style:font-size-asian="10.5pt"
style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="Noto Sans1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN" fo:hyphenate="false"
fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"
loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false"
loext:hyphenation-word-char-count="5" loext:hyphenation-zone="no-limit"/>
+ </style:default-style>
+ <style:default-style style:family="table">
+ <style:table-properties table:border-model="collapsing"/>
+ </style:default-style>
+ <style:default-style style:family="table-row">
+ <style:table-row-properties fo:keep-together="auto"/>
+ </style:default-style>
+ <style:style style:name="Standard" style:family="paragraph"
style:class="text"/>
+ <text:outline-style style:name="Outline">
+ <text:outline-level-style text:level="1" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="2" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="3" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="4" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="5" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="6" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="7" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="8" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="9" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="10" style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ </text:outline-style>
+ <text:notes-configuration text:note-class="footnote" style:num-format="1"
text:start-value="0" text:footnotes-position="page"
text:start-numbering-at="document"/>
+ <text:notes-configuration text:note-class="endnote" style:num-format="i"
text:start-value="0"/>
+ <text:linenumbering-configuration text:number-lines="false"
text:offset="0.1965in" style:num-format="1" text:number-position="left"
text:increment="5"/>
+ </office:styles>
+ <office:automatic-styles>
+ <style:style style:name="P1" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:text-properties style:font-name="Noto Sans2" fo:font-size="40pt"
style:font-name-asian="Noto Sans2" style:font-size-asian="40pt"
style:font-size-complex="40pt"/>
+ </style:style>
+ <style:style style:name="P2" style:family="paragraph"
style:parent-style-name="Standard" style:master-page-name="">
+ <style:paragraph-properties style:page-number="auto" fo:break-before="page"
style:snap-to-layout-grid="false"/>
+ <style:text-properties style:font-name="Noto Sans2" fo:font-size="40pt"
style:font-name-asian="Noto Sans2" style:font-size-asian="40pt"
style:font-size-complex="40pt"/>
+ </style:style>
+ <style:style style:name="P3" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:paragraph-properties fo:line-height="115%" fo:break-before="page"/>
+ <style:text-properties style:font-name="Noto Sans2" fo:font-size="40pt"
style:font-name-asian="Noto Sans2" style:font-size-asian="40pt"
style:font-size-complex="40pt"/>
+ </style:style>
+ <style:style style:name="P4" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:paragraph-properties fo:line-height="150%" fo:break-before="page"/>
+ <style:text-properties style:font-name="Noto Sans2" fo:font-size="40pt"
style:font-name-asian="Noto Sans2" style:font-size-asian="40pt"
style:font-size-complex="40pt"/>
+ </style:style>
+ <style:style style:name="P5" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:paragraph-properties fo:line-height="200%" fo:break-before="page"/>
+ <style:text-properties style:font-name="Noto Sans2" fo:font-size="40pt"
style:font-name-asian="Noto Sans2" style:font-size-asian="40pt"
style:font-size-complex="40pt"/>
+ </style:style>
+ <style:style style:name="P6" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:paragraph-properties fo:line-height="250%" fo:break-before="page"/>
+ <style:text-properties style:font-name="Noto Sans2" fo:font-size="40pt"
style:font-name-asian="Noto Sans2" style:font-size-asian="40pt"
style:font-size-complex="40pt"/>
+ </style:style>
+ <style:style style:name="P7" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:paragraph-properties style:line-height-at-least="0in"
fo:break-before="page"/>
+ <style:text-properties style:font-name="Noto Sans2" fo:font-size="40pt"
style:font-name-asian="Noto Sans2" style:font-size-asian="40pt"
style:font-size-complex="40pt"/>
+ </style:style>
+ <style:style style:name="P8" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:paragraph-properties style:line-height-at-least="0.0098in"
fo:break-before="page"/>
+ <style:text-properties style:font-name="Noto Sans2" fo:font-size="40pt"
style:font-name-asian="Noto Sans2" style:font-size-asian="40pt"
style:font-size-complex="40pt"/>
+ </style:style>
+ <style:style style:name="P9" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:paragraph-properties style:line-height-at-least="4in"
fo:break-before="page"/>
+ <style:text-properties style:font-name="Noto Sans2" fo:font-size="40pt"
style:font-name-asian="Noto Sans2" style:font-size-asian="40pt"
style:font-size-complex="40pt"/>
+ </style:style>
+ <style:style style:name="P10" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:paragraph-properties fo:line-height="1in" fo:break-before="page"/>
+ <style:text-properties style:font-name="Noto Sans2" fo:font-size="40pt"
style:font-name-asian="Noto Sans2" style:font-size-asian="40pt"
style:font-size-complex="40pt"/>
+ </style:style>
+ <style:style style:name="P11" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:paragraph-properties fo:line-height="2in" fo:break-before="page"/>
+ <style:text-properties style:font-name="Noto Sans2" fo:font-size="40pt"
style:font-name-asian="Noto Sans2" style:font-size-asian="40pt"
style:font-size-complex="40pt"/>
+ </style:style>
+ <style:style style:name="P12" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:paragraph-properties fo:break-before="page"/>
+ <style:text-properties style:font-name="Noto Sans2" fo:font-size="40pt"
style:font-name-asian="Noto Sans2" style:font-size-asian="40pt"
style:font-size-complex="40pt"/>
+ </style:style>
+ <style:page-layout style:name="pm1">
+ <style:page-layout-properties fo:page-width="8.2701in"
fo:page-height="11.6902in" style:num-format="1"
style:print-orientation="portrait" fo:margin-top="0.7874in"
fo:margin-bottom="0.7874in" fo:margin-left="0.7874in"
fo:margin-right="0.7874in" style:writing-mode="lr-tb"
style:layout-grid-color="#c0c0c0" style:layout-grid-lines="12"
style:layout-grid-base-height="0.5555in"
style:layout-grid-ruby-height="0.139in" style:layout-grid-mode="line"
style:layout-grid-ruby-below="false" style:layout-grid-print="false"
style:layout-grid-display="false" style:footnote-max-height="0in"
loext:margin-gutter="0in">
+ <style:columns fo:column-count="1" fo:column-gap="0in"/>
+ <style:footnote-sep style:width="0.0071in"
style:distance-before-sep="0.0398in" style:distance-after-sep="0.0398in"
style:line-style="solid" style:adjustment="left" style:rel-width="25%"
style:color="#000000"/>
+ </style:page-layout-properties>
+ <style:header-style/>
+ <style:footer-style/>
+ </style:page-layout>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page style:name="Standard" style:page-layout-name="pm1"/>
+ </office:master-styles>
+ <office:body>
+ <office:text text:use-soft-page-breaks="true">
+ <text:sequence-decls>
+ <text:sequence-decl text:display-outline-level="0"
text:name="Illustration"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
+ </text:sequence-decls>
+ <text:p text:style-name="P1">AAAA AAAA AAAA AAAA AAAA AAAA AAAA</text:p>
+ <text:p text:style-name="P2">AAAA AAAA AAAA AAAA AAAA AAAA AAAA</text:p>
+ <text:p text:style-name="P3">AAAA AAAA AAAA AAAA AAAA AAAA AAAA</text:p>
+ <text:p text:style-name="P4">AAAA AAAA AAAA AAAA AAAA AAAA AAAA</text:p>
+ <text:p text:style-name="P5">AAAA AAAA AAAA AAAA AAAA AAAA AAAA</text:p>
+ <text:p text:style-name="P6">AAAA AAAA AAAA AAAA AAAA AAAA AAAA</text:p>
+ <text:p text:style-name="P7">AAAA AAAA AAAA AAAA AAAA AAAA AAAA</text:p>
+ <text:p text:style-name="P8">AAAA AAAA AAAA AAAA AAAA AAAA AAAA</text:p>
+ <text:p text:style-name="P9">AAAA AAAA AAAA AAAA AAAA AAAA AAAA</text:p>
+ <text:p text:style-name="P10">AAAA AAAA AAAA AAAA AAAA AAAA AAAA</text:p>
+ <text:p text:style-name="P11">AAAA AAAA AAAA AAAA AAAA AAAA AAAA</text:p>
+ <text:p text:style-name="P12"/>
+ </office:text>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/sw/qa/extras/layout/layout5.cxx b/sw/qa/extras/layout/layout5.cxx
index 3ce936c17f4e..7218b719d445 100644
--- a/sw/qa/extras/layout/layout5.cxx
+++ b/sw/qa/extras/layout/layout5.cxx
@@ -1468,6 +1468,67 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testFoMargin)
CPPUNIT_ASSERT_LESS(sal_Int32(13400), nPage2Height);
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf144450)
+{
+ createSwDoc("tdf144450.fodt");
+ auto pXmlDoc = parseLayoutDump();
+
+ // Basic case: default, single-line spacing
+ auto nCase1 = getXPath(pXmlDoc, "/root/page[1]/body/txt[1]/infos/bounds",
"height").toInt32();
+ CPPUNIT_ASSERT_GREATER(sal_Int32(3995), nCase1);
+ CPPUNIT_ASSERT_LESS(sal_Int32(4005), nCase1);
+
+ // Default spacing with snap-to-grid disabled
+ auto nCase2 = getXPath(pXmlDoc, "/root/page[2]/body/txt[1]/infos/bounds",
"height").toInt32();
+ CPPUNIT_ASSERT_GREATER(sal_Int32(2175), nCase2);
+ CPPUNIT_ASSERT_LESS(sal_Int32(2185), nCase2);
+
+ // 1.15-line spacing
+ auto nCase3 = getXPath(pXmlDoc, "/root/page[3]/body/txt[1]/infos/bounds",
"height").toInt32();
+ CPPUNIT_ASSERT_GREATER(sal_Int32(4295), nCase3);
+ CPPUNIT_ASSERT_LESS(sal_Int32(4305), nCase3);
+
+ // 1.5-line spacing
+ auto nCase4 = getXPath(pXmlDoc, "/root/page[4]/body/txt[1]/infos/bounds",
"height").toInt32();
+ CPPUNIT_ASSERT_GREATER(sal_Int32(4995), nCase4);
+ CPPUNIT_ASSERT_LESS(sal_Int32(5005), nCase4);
+
+ // 2.0-line spacing
+ auto nCase5 = getXPath(pXmlDoc, "/root/page[5]/body/txt[1]/infos/bounds",
"height").toInt32();
+ CPPUNIT_ASSERT_GREATER(sal_Int32(5995), nCase5);
+ CPPUNIT_ASSERT_LESS(sal_Int32(6005), nCase5);
+
+ // Prop spacing, 2.5x
+ auto nCase6 = getXPath(pXmlDoc, "/root/page[6]/body/txt[1]/infos/bounds",
"height").toInt32();
+ CPPUNIT_ASSERT_GREATER(sal_Int32(6995), nCase6);
+ CPPUNIT_ASSERT_LESS(sal_Int32(7005), nCase6);
+
+ // At-least 0 spacing: this is a special case that disables extra grid
spacing
+ auto nCase7 = getXPath(pXmlDoc, "/root/page[7]/body/txt[1]/infos/bounds",
"height").toInt32();
+ CPPUNIT_ASSERT_GREATER(sal_Int32(2575), nCase7);
+ CPPUNIT_ASSERT_LESS(sal_Int32(2585), nCase7);
+
+ // At-least 0.01": should match the basic case
+ auto nCase8 = getXPath(pXmlDoc, "/root/page[8]/body/txt[1]/infos/bounds",
"height").toInt32();
+ CPPUNIT_ASSERT_GREATER(sal_Int32(3995), nCase8);
+ CPPUNIT_ASSERT_LESS(sal_Int32(4005), nCase8);
+
+ // At-least 4"
+ auto nCase9 = getXPath(pXmlDoc, "/root/page[9]/body/txt[1]/infos/bounds",
"height").toInt32();
+ CPPUNIT_ASSERT_GREATER(sal_Int32(11515), nCase9);
+ CPPUNIT_ASSERT_LESS(sal_Int32(11525), nCase9);
+
+ // Fixed 1"
+ auto nCase10 = getXPath(pXmlDoc,
"/root/page[10]/body/txt[1]/infos/bounds", "height").toInt32();
+ CPPUNIT_ASSERT_GREATER(sal_Int32(2875), nCase10);
+ CPPUNIT_ASSERT_LESS(sal_Int32(2885), nCase10);
+
+ // Fixed 2"
+ auto nCase11 = getXPath(pXmlDoc,
"/root/page[11]/body/txt[1]/infos/bounds", "height").toInt32();
+ CPPUNIT_ASSERT_GREATER(sal_Int32(5755), nCase11);
+ CPPUNIT_ASSERT_LESS(sal_Int32(5765), nCase11);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ww8export/data/tdf85435.doc
b/sw/qa/extras/ww8export/data/tdf85435.doc
deleted file mode 100644
index 0571e7ffb148..000000000000
Binary files a/sw/qa/extras/ww8export/data/tdf85435.doc and /dev/null differ
diff --git a/sw/qa/extras/ww8export/ww8export4.cxx
b/sw/qa/extras/ww8export/ww8export4.cxx
index 2a8f5d939b36..29338986e6d0 100644
--- a/sw/qa/extras/ww8export/ww8export4.cxx
+++ b/sw/qa/extras/ww8export/ww8export4.cxx
@@ -634,12 +634,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf54862)
verify();
}
-DECLARE_WW8EXPORT_TEST(testTdf85435, "tdf85435.doc")
-{
- // Without the fix, this document only has one page.
- CPPUNIT_ASSERT_EQUAL(2, getPages());
-}
-
} // end of anonymous namespace
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 8427ceec8757..34952c36ce17 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -2243,6 +2243,39 @@ void SwTextFormatter::CalcRealHeight( bool bNewLine )
const auto nAmpRatio = (m_pCurr->Height() + nLineHeight - 1) /
nLineHeight;
nLineHeight *= nAmpRatio;
+ // tdf#164871: Handle all types of line spacing in grid layout.
+ // The prop/auto rule was originally implemented with #99106#, but
other spacing
+ // types were not implemented (perhaps unintentionally). These
implementations
+ // differ from the below non-grid implementations, so cannot be reused.
+ const SvxLineSpacingItem* pSpace = m_aLineInf.GetLineSpacing();
+ if (pSpace)
+ {
+ switch (pSpace->GetLineSpaceRule())
+ {
+ case SvxLineSpaceRule::Min:
+ // tdf#164871: MSO idiosyncratically disables the grid
extra space
+ // when the minimum height is 0. While strange, certain
documents
+ // require this and it seems harmless to emulate.
+ if (pSpace->GetLineHeight() == 0)
+ {
+ nLineHeight = m_pCurr->Height() + nRubyHeight;
+ }
+
+ if (nLineHeight < pSpace->GetLineHeight())
+ {
+ nLineHeight = pSpace->GetLineHeight();
+ }
+ break;
+
+ case SvxLineSpaceRule::Fix:
+ nLineHeight = pSpace->GetLineHeight();
+ break;
+
+ default:
+ break;
+ }
+ }
+
const SwTwips nAsc = m_pCurr->GetAscent() +
( bRubyTop ?
( nLineHeight - m_pCurr->Height() + nRubyHeight ) / 2 :
@@ -2253,7 +2286,6 @@ void SwTextFormatter::CalcRealHeight( bool bNewLine )
m_pInf->GetParaPortion()->SetFixLineHeight();
// we ignore any line spacing options except from ...
- const SvxLineSpacingItem* pSpace = m_aLineInf.GetLineSpacing();
if ( ! IsParaLine() && pSpace &&
SvxInterLineSpaceRule::Prop == pSpace->GetInterLineSpaceRule() )
{
