diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2023-08-21 19:21:34 +0200 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-08-22 11:26:45 +0200 |
commit | 027f8328eef1e149b6c99b478ed5df870291dc2d (patch) | |
tree | 543289b29e2c0e590fbb0d9586bf144b9c993705 | |
parent | 77dab2ac3a4dfdc6f51fdfc31078fb828e8164fa (diff) |
tdf#137523 sw: layout: fix text below tables in footer
In the footer, the text frames below a table have a very small height
and are effectively invisible.
This is because the JoinLock in SwLayAction::FormatLayoutTab() causes
SwTabFrame::MakeAll() to return early, which is called for every cell
frame in the table, and which would move the table up the page in
MakePos(), by calling SwHeadFootFrame::Format().
(regression from commit cc5916cd314a27b0cc99560ab887480026630a95)
Change-Id: I4add9fdd73ad3756000969af20ebf758025a0ada
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155902
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-rw-r--r-- | sw/qa/extras/layout/data/tdf137523-1-min.fodt | 319 | ||||
-rw-r--r-- | sw/qa/extras/layout/layout3.cxx | 12 | ||||
-rw-r--r-- | sw/source/core/layout/layact.cxx | 6 |
3 files changed, 336 insertions, 1 deletions
diff --git a/sw/qa/extras/layout/data/tdf137523-1-min.fodt b/sw/qa/extras/layout/data/tdf137523-1-min.fodt new file mode 100644 index 000000000000..cbe85c9fbb82 --- /dev/null +++ b/sw/qa/extras/layout/data/tdf137523-1-min.fodt @@ -0,0 +1,319 @@ +<?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:calcext="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.3" office:mimetype="application/vnd.oasis.opendocument.text"> + <office:meta><meta:creation-date>2020-10-16T11:14:14.930082474</meta:creation-date><meta:generator>LibreOfficeDev/24.2.0.0.alpha0$Linux_X86_64 LibreOffice_project/53ef297ff9342db2a32da0dd0e8e2f858a3624ee</meta:generator><dc:title>user_manual</dc:title><meta:editing-duration>P0D</meta:editing-duration><meta:editing-cycles>1</meta:editing-cycles><meta:document-statistic meta:table-count="2" meta:image-count="2" meta:object-count="0" meta:page-count="1" meta:paragraph-count="26" meta:word-count="125" meta:character-count="790" meta:non-whitespace-character-count="682"/><meta:user-defined meta:name="Argomento">Release 3.0.3</meta:user-defined><meta:user-defined meta:name="Data di completamento" meta:value-type="date">2020-10-18</meta:user-defined><meta:user-defined meta:name="Document version" meta:value-type="float">1</meta:user-defined><meta:user-defined meta:name="Product">Train Backbone Node</meta:user-defined><meta:user-defined meta:name="Tipo Documento" meta:value-type="string">Test Report</meta:user-defined><meta:template xlink:type="simple" xlink:actuate="onRequest" xlink:title="user_manual" xlink:href="../.config/libreoffice/4/user/template/user_manual.ott" meta:date="2020-10-16T11:14:13.996988241"/></office:meta> + <office:font-face-decls> + <style:font-face style:name="DejaVu Sans" svg:font-family="'DejaVu Sans'"/> + <style:font-face style:name="DejaVu Sans2" svg:font-family="'DejaVu Sans'" style:font-family-generic="system" style:font-pitch="variable"/> + <style:font-face style:name="Helvetica1" svg:font-family="Helvetica, Arial" style:font-family-generic="system" style:font-pitch="variable"/> + <style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/> + <style:font-face style:name="Liberation Sans1" svg:font-family="'Liberation Sans'" style:font-adornments="Normale" style:font-family-generic="swiss" style:font-pitch="variable"/> + <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="Lohit Hindi1" svg:font-family="'Lohit Hindi'" style:font-family-generic="system" style:font-pitch="variable"/> + <style:font-face style:name="Noto Sans" svg:font-family="'Noto Sans'" style:font-adornments="Bold" style:font-pitch="variable"/> + <style:font-face style:name="Noto Sans3" svg:font-family="'Noto Sans'" style:font-adornments="Light Condensed" style:font-pitch="variable"/> + <style:font-face style:name="Times New Roman" svg:font-family="'Times New Roman'" 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="#000000" draw:fill-color="#99ccff" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:flow-with-text="false"/> + <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" loext:tab-stop-distance="0cm" 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="DejaVu Sans" fo:font-size="12pt" fo:language="en" fo:country="US" style:letter-kerning="true" style:font-name-asian="DejaVu Sans2" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Lohit Hindi1" 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:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page"/> + <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="DejaVu Sans" fo:font-size="12pt" fo:language="en" fo:country="US" style:letter-kerning="true" style:font-name-asian="DejaVu Sans2" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Lohit Hindi1" 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="no-limit" 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"> + <style:text-properties style:font-name="Noto Sans3" fo:font-family="'Noto Sans'" style:font-style-name="Light Condensed" style:font-pitch="variable" fo:font-size="11pt" fo:font-weight="normal" style:font-size-asian="10.5pt"/> + </style:style> + <style:style style:name="Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra"> + <style:paragraph-properties fo:padding-left="0.049cm" fo:padding-right="0.049cm" fo:padding-top="0.15cm" fo:padding-bottom="0.049cm" fo:border-left="none" fo:border-right="none" fo:border-top="0.06pt solid #000000" fo:border-bottom="none" style:shadow="none" text:number-lines="false" text:line-number="0"> + <style:tab-stops> + <style:tab-stop style:position="15cm" style:type="right"/> + </style:tab-stops> + </style:paragraph-properties> + <style:text-properties style:font-size-asian="10.5pt"/> + </style:style> + <style:style style:name="Table_20_Contents" style:display-name="Table Contents" style:family="paragraph" style:parent-style-name="Standard" style:class="extra" style:master-page-name=""> + <style:paragraph-properties fo:keep-together="always" style:page-number="auto" fo:keep-with-next="always" text:number-lines="false" text:line-number="0"/> + <style:text-properties style:font-size-asian="10.5pt"/> + </style:style> + <style:style style:name="Numbering_20_Symbols" style:display-name="Numbering Symbols" style:family="text"/> + <style:style style:name="Chapter_20_index" style:display-name="Chapter index" style:family="text"> + <style:text-properties style:font-name="Noto Sans" fo:font-family="'Noto Sans'" style:font-style-name="Bold" style:font-pitch="variable" fo:font-size="160%" fo:font-weight="normal" style:font-size-asian="10.5pt"/> + </style:style> + <text:outline-style style:name="Outline"> + <text:outline-level-style text:level="1" text:style-name="Chapter_20_index" loext:num-list-format="Chapter %1% -" style:num-prefix="Chapter " style:num-suffix=" -" style:num-format="1"> + <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> + <style:list-level-label-alignment text:label-followed-by="space" fo:text-indent="-0.762cm" fo:margin-left="0.762cm"/> + </style:list-level-properties> + </text:outline-level-style> + <text:outline-level-style text:level="2" text:style-name="Numbering_20_Symbols" loext:num-list-format="%1%.%2% " style:num-suffix=" " style:num-format="1" text:display-levels="2"> + <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> + <style:list-level-label-alignment text:label-followed-by="space" fo:text-indent="-1.016cm" fo:margin-left="1.016cm"/> + </style:list-level-properties> + </text:outline-level-style> + <text:outline-level-style text:level="3" text:style-name="Numbering_20_Symbols" loext:num-list-format="%1%.%2%.%3% " style:num-suffix=" " style:num-format="1" text:display-levels="3"> + <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> + <style:list-level-label-alignment text:label-followed-by="space" fo:text-indent="-1.27cm" fo:margin-left="1.27cm"/> + </style:list-level-properties> + </text:outline-level-style> + <text:outline-level-style text:level="4" text:style-name="Numbering_20_Symbols" loext:num-list-format="%1%.%2%.%3%.%4% " style:num-suffix=" " style:num-format="1" text:display-levels="4"> + <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> + <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.524cm" fo:text-indent="-1.524cm" fo:margin-left="1.524cm"/> + </style:list-level-properties> + </text:outline-level-style> + <text:outline-level-style text:level="5" text:style-name="Numbering_20_Symbols" loext:num-list-format=" %1%.%2%.%3%.%4%.%5% " style:num-prefix=" " style:num-suffix=" " style:num-format="1" text:display-levels="5"> + <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> + <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="1.778cm" fo:text-indent="-1.778cm" fo:margin-left="1.778cm"/> + </style:list-level-properties> + </text:outline-level-style> + <text:outline-level-style text:level="6" text:style-name="Numbering_20_Symbols" loext:num-list-format=" %1%.%2%.%3%.%4%.%5%.%6% " style:num-prefix=" " style:num-suffix=" " style:num-format="1" text:display-levels="6"> + <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> + <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.032cm" fo:text-indent="-2.032cm" fo:margin-left="2.032cm"/> + </style:list-level-properties> + </text:outline-level-style> + <text:outline-level-style text:level="7" text:style-name="Numbering_20_Symbols" loext:num-list-format=" %1%.%2%.%3%.%4%.%5%.%6%.%7% " style:num-prefix=" " style:num-suffix=" " style:num-format="1" text:display-levels="7"> + <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> + <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.286cm" fo:text-indent="-2.286cm" fo:margin-left="2.286cm"/> + </style:list-level-properties> + </text:outline-level-style> + <text:outline-level-style text:level="8" text:style-name="Numbering_20_Symbols" loext:num-list-format=" %1%.%2%.%3%.%4%.%5%.%6%.%7%.%8% " style:num-prefix=" " style:num-suffix=" " style:num-format="1" text:display-levels="8"> + <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> + <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.54cm" fo:text-indent="-2.54cm" fo:margin-left="2.54cm"/> + </style:list-level-properties> + </text:outline-level-style> + <text:outline-level-style text:level="9" text:style-name="Numbering_20_Symbols" loext:num-list-format=" %1%.%2%.%3%.%4%.%5%.%6%.%7%.%8%.%9% " style:num-prefix=" " style:num-suffix=" " style:num-format="1" text:display-levels="9"> + <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> + <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="2.794cm" fo:text-indent="-2.794cm" fo:margin-left="2.794cm"/> + </style:list-level-properties> + </text:outline-level-style> + <text:outline-level-style text:level="10" text:style-name="Numbering_20_Symbols" loext:num-list-format=" %1%.%2%.%3%.%4%.%5%.%6%.%7%.%8%.%9%.%10% " style:num-prefix=" " style:num-suffix=" " style:num-format="1" text:display-levels="10"> + <style:list-level-properties text:list-level-position-and-space-mode="label-alignment"> + <style:list-level-label-alignment text:label-followed-by="listtab" text:list-tab-stop-position="3.048cm" fo:text-indent="-3.048cm" fo:margin-left="3.048cm"/> + </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.499cm" style:num-format="1" text:number-position="left" text:increment="5"/> + <number:date-style style:name="N10129" number:language="en" number:country="US"> + <number:day number:style="long"/> + <number:text>/</number:text> + <number:month number:style="long"/> + <number:text>/</number:text> + <number:year number:style="long"/> + </number:date-style> + <loext:theme loext:name="Office Theme"> + <loext:theme-colors loext:name="LibreOffice"> + <loext:color loext:name="dark1" loext:color="#000000"/> + <loext:color loext:name="light1" loext:color="#ffffff"/> + <loext:color loext:name="dark2" loext:color="#000000"/> + <loext:color loext:name="light2" loext:color="#ffffff"/> + <loext:color loext:name="accent1" loext:color="#18a303"/> + <loext:color loext:name="accent2" loext:color="#0369a3"/> + <loext:color loext:name="accent3" loext:color="#a33e03"/> + <loext:color loext:name="accent4" loext:color="#8e03a3"/> + <loext:color loext:name="accent5" loext:color="#c99c00"/> + <loext:color loext:name="accent6" loext:color="#c9211e"/> + <loext:color loext:name="hyperlink" loext:color="#0000ee"/> + <loext:color loext:name="followed-hyperlink" loext:color="#551a8b"/> + </loext:theme-colors> + </loext:theme> + </office:styles> + <office:automatic-styles> + <style:style style:name="Table1" style:family="table"> + <style:table-properties style:width="17cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="center" fo:background-color="transparent"> + <style:background-image/> + </style:table-properties> + </style:style> + <style:style style:name="Table1.A" style:family="table-column"> + <style:table-column-properties style:column-width="3.129cm"/> + </style:style> + <style:style style:name="Table1.B" style:family="table-column"> + <style:table-column-properties style:column-width="8.2cm"/> + </style:style> + <style:style style:name="Table1.C" style:family="table-column"> + <style:table-column-properties style:column-width="5.671cm"/> + </style:style> + <style:style style:name="Table1.1" style:family="table-row"> + <style:table-row-properties fo:background-color="transparent"> + <style:background-image/> + </style:table-row-properties> + </style:style> + <style:style style:name="Table1.A1" style:family="table-cell"> + <style:table-cell-properties style:vertical-align="middle" fo:background-color="transparent" fo:padding="0.049cm" fo:border-left="0.5pt solid #000000" fo:border-right="none" fo:border-top="0.5pt solid #000000" fo:border-bottom="0.5pt solid #000000" style:writing-mode="page"> + </style:table-cell-properties> + </style:style> + <style:style style:name="Table1.B1" style:family="table-cell"> + <style:table-cell-properties fo:background-color="transparent" fo:padding-left="0.3cm" fo:padding-right="0.3cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border-left="0.5pt solid #000000" fo:border-right="none" fo:border-top="0.5pt solid #000000" fo:border-bottom="0.5pt solid #000000" style:writing-mode="page"> + <style:background-image/> + </style:table-cell-properties> + </style:style> + <style:style style:name="Table1.C1" style:family="table-cell"> + <style:table-cell-properties fo:background-color="transparent" fo:padding-left="0.3cm" fo:padding-right="0.3cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border="0.5pt solid #000000" style:writing-mode="page"> + <style:background-image/> + </style:table-cell-properties> + </style:style> + <style:style style:name="Table1.B2" style:family="table-cell"> + <style:table-cell-properties fo:background-color="transparent" fo:padding-left="0.3cm" fo:padding-right="0.3cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border-left="0.5pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.5pt solid #000000" style:writing-mode="page"> + <style:background-image/> + </style:table-cell-properties> + </style:style> + <style:style style:name="Table1.C2" style:family="table-cell"> + <style:table-cell-properties fo:background-color="transparent" fo:padding-left="0.3cm" fo:padding-right="0.3cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border-left="0.5pt solid #000000" fo:border-right="0.5pt solid #000000" fo:border-top="none" fo:border-bottom="0.5pt solid #000000" style:writing-mode="page"> + <style:background-image/> + </style:table-cell-properties> + </style:style> + <style:style style:name="Table1.B3" style:family="table-cell"> + <style:table-cell-properties fo:background-color="transparent" fo:padding-left="0.3cm" fo:padding-right="0.3cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border-left="0.5pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.5pt solid #000000" style:writing-mode="page"> + <style:background-image/> + </style:table-cell-properties> + </style:style> + <style:style style:name="Table1.C3" style:family="table-cell"> + <style:table-cell-properties fo:background-color="transparent" fo:padding-left="0.3cm" fo:padding-right="0.3cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border-left="0.5pt solid #000000" fo:border-right="0.5pt solid #000000" fo:border-top="none" fo:border-bottom="0.5pt solid #000000" style:writing-mode="page"> + <style:background-image/> + </style:table-cell-properties> + </style:style> + <style:style style:name="Table1.B4" style:family="table-cell"> + <style:table-cell-properties fo:background-color="transparent" fo:padding-left="0.3cm" fo:padding-right="0.3cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border-left="0.5pt solid #000000" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.5pt solid #000000" style:writing-mode="page"> + <style:background-image/> + </style:table-cell-properties> + </style:style> + <style:style style:name="Table1.C4" style:family="table-cell"> + <style:table-cell-properties fo:background-color="transparent" fo:padding-left="0.3cm" fo:padding-right="0.3cm" fo:padding-top="0.101cm" fo:padding-bottom="0.101cm" fo:border-left="0.5pt solid #000000" fo:border-right="0.5pt solid #000000" fo:border-top="none" fo:border-bottom="0.5pt solid #000000" style:writing-mode="page"> + <style:background-image/> + </style:table-cell-properties> + </style:style> + <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:paragraph-properties fo:text-align="start" style:justify-single-word="false"/> + <style:text-properties fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Serif" fo:font-size="12pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-size-asian="12pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="12pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-overline-style="none" style:text-overline-color="font-color"/> + </style:style> + <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"/> + <style:text-properties fo:color="#00000a" loext:opacity="100%" style:font-name="Liberation Sans1" fo:font-size="8pt" fo:language="en" fo:country="US" style:font-name-asian="Times New Roman" style:font-size-asian="8pt" style:font-name-complex="Helvetica1" style:font-size-complex="8pt" style:language-complex="ar" style:country-complex="SA"/> + </style:style> + <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"/> + <style:text-properties fo:font-size="8pt" fo:language="en" fo:country="US" style:font-size-asian="8pt" style:font-size-complex="8pt"/> + </style:style> + <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Table_20_Contents"> + <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0cm" style:auto-text-indent="false"/> + <style:text-properties fo:font-size="8pt" fo:language="en" fo:country="US" style:font-size-asian="8pt" style:font-size-complex="8pt"/> + </style:style> + <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Footer"> + <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/> + <style:text-properties fo:font-size="8pt" fo:language="en" fo:country="US" fo:font-weight="bold" style:font-size-asian="7pt" style:font-weight-asian="bold" style:font-size-complex="8pt" style:font-weight-complex="bold"/> + </style:style> + <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Footer"> + <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" style:contextual-spacing="false"/> + <style:text-properties fo:font-size="7pt" fo:language="en" fo:country="US" style:font-size-asian="7pt" style:font-size-complex="7pt"/> + </style:style> + <style:style style:name="P33" style:family="paragraph" style:parent-style-name="Standard" style:master-page-name="Standard"> + <style:paragraph-properties style:page-number="auto"/> + <style:text-properties style:font-name="Liberation Sans" fo:font-size="10pt" fo:language="en" fo:country="US" fo:font-style="italic" style:font-size-asian="10pt" style:font-style-asian="italic" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="T1" style:family="text"> + <style:text-properties/> + </style:style> + <style:style style:name="T2" style:family="text"> + <style:text-properties/> + </style:style> + <style:page-layout style:name="pm1" style:page-usage="mirrored"> + <style:page-layout-properties fo:page-width="21.001cm" fo:page-height="29.7cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20" style:layout-grid-base-height="0.706cm" style:layout-grid-ruby-height="0.353cm" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="false" style:layout-grid-display="false" style:footnote-max-height="0cm" loext:margin-gutter="0cm"> + <style:columns fo:column-count="1" fo:column-gap="0cm"/> + <style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" 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:header-footer-properties fo:min-height="0.6cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.499cm" fo:background-color="transparent" style:dynamic-spacing="false" draw:fill="none" draw:fill-color="#99ccff"/> + </style:footer-style> + </style:page-layout> + <style:style style:name="dp1" style:family="drawing-page"> + <style:drawing-page-properties draw:background-size="full"/> + </style:style> + <number:number-style style:name="N0"> + <number:number number:min-integer-digits="1"/> + </number:number-style> + <number:date-style style:name="N36" number:automatic-order="true"> + <number:day number:style="long"/> + <number:text>.</number:text> + <number:month number:style="long"/> + <number:text>.</number:text> + <number:year number:style="long"/> + </number:date-style> + </office:automatic-styles> + <office:master-styles> + <style:master-page style:name="Standard" style:page-layout-name="pm1" draw:style-name="dp1"> + <style:footer> + <table:table table:name="Table1" table:style-name="Table1"> + <table:table-column table:style-name="Table1.A"/> + <table:table-column table:style-name="Table1.B"/> + <table:table-column table:style-name="Table1.C"/> + <table:table-row table:style-name="Table1.1"> + <table:table-cell table:style-name="Table1.A1" table:number-rows-spanned="4" office:value-type="string"> + <text:p text:style-name="P1"/> + </table:table-cell> + <table:table-cell table:style-name="Table1.B1" office:value-type="string"> + <text:p text:style-name="P2">Document type: <text:user-defined style:data-style-name="N0" text:name="Tipo Documento">Test Report</text:user-defined></text:p> + </table:table-cell> + <table:table-cell table:style-name="Table1.C1" office:value-type="string"> + <text:p text:style-name="P3">Author: <text:span text:style-name="T1">Buzzi Lorenzo</text:span></text:p> + </table:table-cell> + </table:table-row> + <table:table-row> + <table:covered-table-cell table:style-name="Table1.A1"/> + <table:table-cell table:style-name="Table1.B2" office:value-type="string"> + <text:p text:style-name="P2">Product: <text:user-defined style:data-style-name="N0" text:name="Product">Train Backbone Node</text:user-defined></text:p> + </table:table-cell> + <table:table-cell table:style-name="Table1.C2" office:value-type="string"> + <text:p text:style-name="P3">Approved by: <text:span text:style-name="T1">Da Frè Giorgio</text:span></text:p> + </table:table-cell> + </table:table-row> + <table:table-row> + <table:covered-table-cell table:style-name="Table1.A1"/> + <table:table-cell table:style-name="Table1.B3" office:value-type="string"> + <text:p text:style-name="P3">Subject: <text:user-defined style:data-style-name="N0" text:name="Argomento">Release 3.0.3</text:user-defined></text:p> + </table:table-cell> + <table:table-cell table:style-name="Table1.C3" office:value-type="string"> + <text:p text:style-name="P3">Last change: <text:user-defined style:data-style-name="N36" text:name="Data di completamento">10/18/2020</text:user-defined></text:p> + </table:table-cell> + </table:table-row> + <table:table-row> + <table:covered-table-cell table:style-name="Table1.A1"/> + <table:table-cell table:style-name="Table1.B4" office:value-type="string"> + <text:p text:style-name="P4"/> + </table:table-cell> + <table:table-cell table:style-name="Table1.C4" office:value-type="string"> + <text:p text:style-name="P3">Page <text:page-number text:select-page="current">1</text:page-number><text:s/>of <text:page-count>1</text:page-count></text:p> + </table:table-cell> + </table:table-row> + </table:table> + <text:p text:style-name="P5">VDS Rail s.r.l.</text:p> + <text:p text:style-name="P6">Via Arno 23/25 - 50019 SESTO FIORENTINO (FI) - Italy<text:span text:style-name="T2"> – </text:span>Tel. +39-055-7350210-7350273<text:span text:style-name="T2"> – </text:span>Fax +39-055-754673<text:span text:style-name="T2"> – </text:span>Email: vds@vdsrail.com</text:p> + <text:p text:style-name="P6">Cap. soc. € 99.000 i.v. - P.IVA 01678370485</text:p> + </style:footer> + </style:master-page> + </office:master-styles> + <office:body> + <office:text> + <office:forms form:automatic-focus="false" form:apply-design-mode="false"/> + <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="P33"/> + </office:text> + </office:body> +</office:document> diff --git a/sw/qa/extras/layout/layout3.cxx b/sw/qa/extras/layout/layout3.cxx index 4ddb46b025b9..6322b3338f80 100644 --- a/sw/qa/extras/layout/layout3.cxx +++ b/sw/qa/extras/layout/layout3.cxx @@ -98,6 +98,18 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf119875) CPPUNIT_ASSERT_LESS(nSecondTop, nFirstTop); } +CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf137523) +{ + createSwDoc("tdf137523-1-min.fodt"); + xmlDocUniquePtr pXmlDoc = parseLayoutDump(); + // the problem was that in the footer, the text frames below the table + // had wrong height and were not visible + assertXPath(pXmlDoc, "/root/page/footer/txt[1]/infos/bounds", "height", "304"); + assertXPath(pXmlDoc, "/root/page/footer/txt[2]/infos/bounds", "height", "191"); + assertXPath(pXmlDoc, "/root/page/footer/txt[3]/infos/bounds", "height", "153"); + assertXPath(pXmlDoc, "/root/page/footer/tab/infos/bounds", "height", "1378"); +} + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf120287) { createSwDoc("tdf120287.fodt"); diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index c20fa4e3a1ea..49d7573dd547 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -1641,7 +1641,11 @@ bool SwLayAction::FormatLayoutTab( SwTabFrame *pTab, bool bAddRect ) // format lowers, only if table frame is valid if ( pTab->isFrameAreaDefinitionValid() ) { - FlowFrameJoinLockGuard tabG(pTab); // tdf#124675 prevent Join() if pTab becomes empty + ::std::optional<FlowFrameJoinLockGuard> oTabGuard; + if (pTab->IsMoveable()) // tdf#137523 not in footer + { // tdf#124675 prevent Join() if pTab becomes empty + oTabGuard.emplace(pTab); + } SwLayoutFrame *pLow = static_cast<SwLayoutFrame*>(pTab->Lower()); while ( pLow ) { |