sw/qa/extras/layout/data/fly_hidden_paragraph.fodt | 127 +++++++++++++++++++++
sw/qa/extras/layout/layout.cxx | 60 +++++++++
sw/source/core/layout/trvlfrm.cxx | 5
3 files changed, 188 insertions(+), 4 deletions(-)
New commits:
commit 2dce213ce9f399c6ce1a3e928f34fa27988fa833
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Jul 10 14:19:56 2024 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Jul 11 13:24:50 2024 +0200
sw: layout: invalidate upper when hiding frame
If a text frame is in a fly frame, and View->Field Names is turned off,
the text frame is hidden but the fly frame is still the same size as
before. Call ShrinkFrame() to do some invalidations.
(regression from commit fc1e6a64bd0517a7e67f08860c29b44d030220eb)
Change-Id: I154551ebaa2370d088b12e178954f92d33056711
(cherry picked from commit b77ebc93844f1b54c74ae5db9253a1d3ff618968)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170323
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/sw/qa/extras/layout/data/fly_hidden_paragraph.fodt
b/sw/qa/extras/layout/data/fly_hidden_paragraph.fodt
new file mode 100644
index 000000000000..51731a6b368a
--- /dev/null
+++ b/sw/qa/extras/layout/data/fly_hidden_paragraph.fodt
@@ -0,0 +1,127 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<office:document xmlns:officeooo="http://openoffice.org/2009/office";
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:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:dc="http://purl.org/dc/eleme
nts/1.1/" xmlns:ooo="http://openoffice.org/2004/office";
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0
" xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:xforms="http://www.w3.org/2002/xforms"; office:version="1.2"
office:mimetype="application/vnd.oasis.opendocument.text">
+ <office:font-face-decls>
+ <style:font-face style:name="Times New Roman" svg:font-family="'Times New
Roman'" style:font-family-generic="roman"/>
+ <style:font-face style:name="Lucida Sans" svg:font-family="'Lucida Sans'"
style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="NSimSun" svg:font-family="NSimSun"
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.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" style:font-independent-line-spacing="false">
+ <style:tab-stops/>
+ </style:paragraph-properties>
+ <style:text-properties style:use-window-font-color="true"
style:font-name="Times New Roman" fo:font-size="12pt" fo:language="de"
fo:country="DE" style:letter-kerning="true" style:font-name-asian="NSimSun"
style:font-size-asian="10.5pt" style:language-asian="zh"
style:country-asian="CN" style:font-name-complex="Lucida Sans"
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" 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"
style:font-name="Times New Roman" fo:font-size="12pt" fo:language="de"
fo:country="DE" style:letter-kerning="true" style:font-name-asian="NSimSun"
style:font-size-asian="10.5pt" style:language-asian="zh"
style:country-asian="CN" style:font-name-complex="Lucida Sans"
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"/>
+ </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:style style:name="Frame_20_contents" style:display-name="Frame
contents" style:family="paragraph" style:parent-style-name="Standard"
style:class="extra"/>
+ <style:style style:name="Frame" style:family="graphic">
+ <style:graphic-properties text:anchor-type="paragraph" svg:x="0cm"
svg:y="0cm" fo:margin-left="0.201cm" fo:margin-right="0.201cm"
fo:margin-top="0.201cm" fo:margin-bottom="0.201cm" style:wrap="parallel"
style:number-wrapped-paragraphs="no-limit" style:wrap-contour="false"
style:vertical-pos="top" style:vertical-rel="paragraph-content"
style:horizontal-pos="center" style:horizontal-rel="paragraph-content"
fo:padding="0.15cm" fo:border="0.06pt solid #000000"/>
+ </style:style>
+ <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.499cm" 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="Frame_20_contents">
+ <style:text-properties/>
+ </style:style>
+ <style:style style:name="T1" style:family="text">
+ <style:text-properties/>
+ </style:style>
+ <style:style style:name="fr1" style:family="graphic"
style:parent-style-name="Frame">
+ <style:graphic-properties style:vertical-pos="top"
style:vertical-rel="paragraph-content" style:horizontal-pos="center"
style:horizontal-rel="paragraph"/>
+ </style:style>
+ <style:page-layout style:name="pm1">
+ <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">
+ <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: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: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:user-field-decls>
+ <text:user-field-decl office:value-type="string" office:string-value=""
text:name="Test"/>
+ </text:user-field-decls>
+ <text:p text:style-name="Standard"><draw:frame draw:style-name="fr1"
draw:name="Rahmen1" text:anchor-type="paragraph" svg:width="5.893cm"
draw:z-index="0">
+ <draw:text-box fo:min-height="0.79cm">
+ <text:p text:style-name="P1"><text:span
text:style-name="T1">invisible<text:line-break/><text:line-break/></text:span><text:hidden-paragraph
text:condition="ooow:Test EQ """ text:is-hidden="true"/></text:p>
+ </draw:text-box>
+ </draw:frame></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 10d8717e5f4a..6c01a32bcaaf 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -747,6 +747,66 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInBody)
}
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testFlyHiddenParagraph)
+{
+ createSwDoc("fly_hidden_paragraph.fodt");
+
+ // first, disable both so para gets hidden
+ uno::Sequence<beans::PropertyValue> argsSH(
+ comphelper::InitPropertySequence({ { "ShowHiddenParagraphs",
uno::Any(false) } }));
+ dispatchCommand(mxComponent, ".uno:ShowHiddenParagraphs", argsSH);
+
+ uno::Sequence<beans::PropertyValue> args(
+ comphelper::InitPropertySequence({ { "Fieldnames", uno::Any(false) }
}));
+
+ dispatchCommand(mxComponent, ".uno:Fieldnames", args);
+ Scheduler::ProcessEventsToIdle();
+
+ xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+ assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly/txt/infos/bounds"_ostr,
+ "height"_ostr, "0");
+ assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly/infos/bounds"_ostr, "height"_ostr,
+ "448");
+ discardDumpedLayout();
+
+ // the problem was that now the fly was the same height as before hiding
+ dispatchCommand(mxComponent, ".uno:Fieldnames", {});
+ Scheduler::ProcessEventsToIdle();
+
+ pXmlDoc = parseLayoutDump();
+ assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly/txt/infos/bounds"_ostr,
+ "height"_ostr, "828");
+ assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly/infos/bounds"_ostr, "height"_ostr,
+ "1000");
+ discardDumpedLayout();
+
+ dispatchCommand(mxComponent, ".uno:Fieldnames", {});
+ Scheduler::ProcessEventsToIdle();
+
+ pXmlDoc = parseLayoutDump();
+ assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly/txt/infos/bounds"_ostr,
+ "height"_ostr, "0");
+ assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly/infos/bounds"_ostr, "height"_ostr,
+ "448");
+ discardDumpedLayout();
+
+ dispatchCommand(mxComponent, ".uno:Fieldnames", {});
+ Scheduler::ProcessEventsToIdle();
+
+ pXmlDoc = parseLayoutDump();
+ assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly/txt/infos/bounds"_ostr,
+ "height"_ostr, "828");
+ assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/anchored/fly/infos/bounds"_ostr, "height"_ostr,
+ "1000");
+ discardDumpedLayout();
+
+ // other test like testTdf143239 and testTdf159101 depend on this;
+ // seems getting the previous value is only possible with a listener
+ // so just hardcode it...
+ dispatchCommand(mxComponent, ".uno:Fieldnames", args);
+ Scheduler::ProcessEventsToIdle();
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf134272)
{
createSwDoc("tdf134472.odt");
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index 00144c36e6d5..4537c6c0a9f0 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1733,14 +1733,11 @@ bool SwFrame::IsHiddenNow() const
void SwFrame::MakeValidZeroHeight()
{
SwRectFnSet aRectFnSet(this);
- {
- SwFrameAreaDefinition::FrameAreaWriteAccess area(*this);
- aRectFnSet.SetHeight(area, 0);
- }
{
SwFrameAreaDefinition::FramePrintAreaWriteAccess area(*this);
aRectFnSet.SetHeight(area, 0);
}
+ ShrinkFrame(aRectFnSet.GetHeight(getFrameArea()));
setFrameAreaSizeValid(true);
setFramePrintAreaValid(true);
setFrameAreaPositionValid(false);
