sw/qa/extras/layout/data/hidden-sections-with-pagestyles.odt |binary
sw/qa/extras/layout/data/hiddensection.fodt | 128 +++++++++++
sw/qa/extras/layout/layout3.cxx | 127 ++++++++++
sw/source/core/layout/laycache.cxx | 66 +++--
sw/source/core/layout/layhelp.hxx | 3
sw/source/core/layout/sectfrm.cxx | 91 +++++++
6 files changed, 382 insertions(+), 33 deletions(-)
New commits:
commit 085138a807cdd223ced7acda039c968e56739e6b
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Mon Sep 2 18:24:53 2024 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Sep 5 13:11:01 2024 +0200
sw: fix problem with 0-height text frames after unhiding section
Not sure how this happens, apparently only in some specific
circumstance, but the problem is that the SwTextFrame::Format() does
nothing because !aAccess.GetPara()->GetReformat().Len().
Also adapt the loop in SwSectionFrame::SwClientNotify() to columns.
(regression from commit ff7f1b59e22092d8548459e75fe912db852f056f)
Change-Id: Iba0b1657f915530ab9841823ad5ad1e7faa15e8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172776
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit d25f3a9eac1690e1d05840a4f00796d6ddba669b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172761
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/qa/extras/layout/data/hiddensection.fodt
b/sw/qa/extras/layout/data/hiddensection.fodt
new file mode 100644
index 000000000000..b760e308e9b4
--- /dev/null
+++ b/sw/qa/extras/layout/data/hiddensection.fodt
@@ -0,0 +1,128 @@
+<?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.3" office:mimetype="application/vnd.oasis.opendocument.text">
+
<office:meta><meta:creation-date>2024-09-02T14:59:23.392522133</meta:creation-date><dc:date>2024-09-02T18:22:43.232050806</dc:date><meta:editing-duration>PT6M</meta:editing-duration><meta:editing-cycles>4</meta:editing-cycles><meta:generator>LibreOfficeDev/25.2.0.0.alpha0$Linux_X86_64
LibreOffice_project/b350c056394d1e55bbb56b2c5b8bd619ab96c75a</meta:generator><meta:document-statistic
meta:table-count="0" meta:image-count="0" meta:object-count="0"
meta:page-count="1" meta:paragraph-count="7" meta:word-count="8"
meta:character-count="47"
meta:non-whitespace-character-count="46"/></office:meta>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial Unicode MS1" svg:font-family="'Arial
Unicode MS'" style:font-family-generic="system" 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="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.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:writing-mode="lr-tb"
style:flow-with-text="false"/>
+ <style:paragraph-properties style:text-autospace="ideograph-alpha"
style:line-break="strict" loext:tab-stop-distance="0cm"
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="de" fo:country="DE" 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="Arial Unicode MS1" 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="1.251cm" 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="de" fo:country="DE" 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="Arial Unicode MS1" 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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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" loext:num-list-format="%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="Standard">
+ <style:text-properties/>
+ </style:style>
+ <style:style style:name="Sect1" style:family="section">
+ <style:section-properties style:editable="false">
+ <style:columns fo:column-count="1" fo:column-gap="0cm"/>
+ </style:section-properties>
+ </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" loext:margin-gutter="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>
+ <style:style style:name="dp1" style:family="drawing-page">
+ <style:drawing-page-properties draw:background-size="full"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page style:name="Standard" style:page-layout-name="pm1"
draw:style-name="dp1"/>
+ </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:p text:style-name="P1">Aaa</text:p>
+ <text:p text:style-name="P1">vcvacv</text:p>
+ <text:section text:style-name="Sect1" text:name="Section1">
+ <text:p text:style-name="P1">aav adf</text:p>
+ <text:p text:style-name="P1">acvcvdf</text:p>
+ <text:p text:style-name="P1">addfdff</text:p>
+ <text:p text:style-name="P1"/>
+ </text:section>
+ <text:p text:style-name="P1">asdcccf</text:p>
+ <text:p text:style-name="P1">asdbcvcvfc</text:p>
+ </office:text>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/sw/qa/extras/layout/layout3.cxx b/sw/qa/extras/layout/layout3.cxx
index d6580ac65ab2..4eb41c7478f8 100644
--- a/sw/qa/extras/layout/layout3.cxx
+++ b/sw/qa/extras/layout/layout3.cxx
@@ -1802,6 +1802,41 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf156724)
assertXPath(pXmlDoc, "/root/page"_ostr, 2);
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testSectionUnhide)
+{
+ createSwDoc("hiddensection.fodt");
+
+ {
+ xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+ assertXPath(pXmlDoc,
"/root/page/body/section/txt/infos/bounds[@height='0']"_ostr, 0);
+ discardDumpedLayout();
+ }
+
+ // Hide the section
+ auto xTextSectionsSupplier =
mxComponent.queryThrow<css::text::XTextSectionsSupplier>();
+ auto xSections = xTextSectionsSupplier->getTextSections();
+ CPPUNIT_ASSERT(xSections);
+ auto xSection =
xSections->getByName(u"Section1"_ustr).queryThrow<css::beans::XPropertySet>();
+ xSection->setPropertyValue(u"IsVisible"_ustr, css::uno::Any(false));
+ calcLayout();
+
+ {
+ xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+ assertXPath(pXmlDoc,
"/root/page/body/section/txt/infos/bounds[@height='0']"_ostr, 4);
+ discardDumpedLayout();
+ }
+
+ xSection->setPropertyValue(u"IsVisible"_ustr, css::uno::Any(true));
+ calcLayout();
+
+ {
+ xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+ // the problem was that 3 of the text frames had 0 height because
Format was skipped
+ assertXPath(pXmlDoc,
"/root/page/body/section/txt/infos/bounds[@height='0']"_ostr, 0);
+ discardDumpedLayout();
+ }
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testHiddenSectionPageDescs)
{
createSwDoc("hidden-sections-with-pagestyles.odt");
@@ -2944,7 +2979,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3,
testTdf160958_page_break)
assertXPath(pExportDump, "//page/body/section/txt[1]/SwParaPortion"_ostr,
0);
assertXPath(pExportDump, "//page/body/section/txt[2]/SwParaPortion"_ostr,
0);
assertXPath(pExportDump, "//page/body/section/txt[3]/SwParaPortion"_ostr,
0);
- assertXPath(pExportDump,
"//page/body/section/txt[4]/SwParaPortion/SwLineLayout"_ostr, 5);
+ assertXPath(pExportDump, "//page/body/section/txt[4]/SwParaPortion"_ostr,
0);
assertXPath(pExportDump, "//page/body/section/txt[5]/SwParaPortion"_ostr,
0);
assertXPath(pExportDump, "//page/body/section/txt[6]/SwParaPortion"_ostr,
0);
assertXPath(pExportDump, "//page/body/section/txt[7]/SwParaPortion"_ostr,
0);
diff --git a/sw/source/core/layout/sectfrm.cxx
b/sw/source/core/layout/sectfrm.cxx
index 7506b5a001be..d14eb766fb04 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2732,8 +2732,31 @@ void SwSectionFrame::SwClientNotify(const SwModify&
rMod, const SfxHint& rHint)
SwRectFnSet(this).SetHeight(area, HUGE_POSITIVE);
}
- for (SwFrame* pLowerFrame = Lower(); pLowerFrame; pLowerFrame =
pLowerFrame->GetNext())
+ SwColumnFrame * pColumn{Lower()->IsColumnFrame()
+ ? static_cast<SwColumnFrame*>(Lower()) : nullptr};
+ auto IterateLower = [&pColumn](SwFrame *const pLowerFrame) -> SwFrame*
{
+ if (pLowerFrame->GetNext())
+ {
+ return pLowerFrame->GetNext();
+ }
+ if (pColumn)
+ {
+ pColumn = static_cast<SwColumnFrame*>(pColumn->GetNext());
+ if (pColumn)
+ {
+ return
static_cast<SwLayoutFrame*>(pColumn->Lower())->Lower();
+ }
+ }
+ return nullptr;
+ };
+ for (SwFrame* pLowerFrame = pColumn
+ ? static_cast<SwLayoutFrame*>(pColumn->Lower())->Lower()
+ : Lower();
+ pLowerFrame;
+ pLowerFrame = IterateLower(pLowerFrame))
+ {
+ pLowerFrame->Prepare(PrepareHint::Clear, nullptr, false);
pLowerFrame->InvalidateAll();
pLowerFrame->InvalidateObjs(false);
}
@@ -2765,24 +2788,8 @@ void SwSectionFrame::SwClientNotify(const SwModify&
rMod, const SfxHint& rHint)
pFirstOnPage = pFirstOnPage->GetUpper();
}
assert(pFirstOnPage->IsContentFrame() ||
pFirstOnPage->IsTabFrame());
- SwColumnFrame * pColumn{Lower()->IsColumnFrame()
- ? static_cast<SwColumnFrame*>(Lower()) : nullptr};
- auto IterateLower = [&pColumn](SwFrame *const pLowerFrame) ->
SwFrame*
- {
- if (pLowerFrame->GetNext())
- {
- return pLowerFrame->GetNext();
- }
- if (pColumn)
- {
- pColumn = static_cast<SwColumnFrame*>(pColumn->GetNext());
- if (pColumn)
- {
- return
static_cast<SwLayoutFrame*>(pColumn->Lower())->Lower();
- }
- }
- return nullptr;
- };
+ pColumn = Lower()->IsColumnFrame()
+ ? static_cast<SwColumnFrame*>(Lower()) : nullptr;
for (SwFrame* pLowerFrame = pColumn
?
static_cast<SwLayoutFrame*>(pColumn->Lower())->Lower()
: Lower();
commit aff04bbcde8cbc0bcbf94041713447fbc9ce896a
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Thu Aug 29 13:27:03 2024 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Sep 5 13:10:55 2024 +0200
sw: layout: fix page breaks when unhiding a hidden section
Commit ff7f1b59e22092d8548459e75fe912db852f056f removed the
DelFrames()/MakeFrames() in SwSection::ImplSetHiddenFlag(), which was
handling the page breaks previously.
Add some code to SwSectionFrame::SwClientNotify() to call
SwLayHelper::CheckInsertPage() which appears to be the important part
called by InsertCnt_() previously.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172609
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit a97e245ba11598050e1800fde9ace796d20e9df2)
sw: fix iterating columned sections in SwSectionFrame::SwClientNotify()
This was asserting in JunitTest_sw_unoapi_3 on libreoffice-24-2 branch
but strangely enough not on master.
(regression from commit a97e245ba11598050e1800fde9ace796d20e9df2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172740
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit 5f0f69ba9b7d083cf7c0169be6e9c916008787bb)
Change-Id: Id6560d8706abf92fba259a5d534d6cd5067c8e6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172665
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/qa/extras/layout/data/hidden-sections-with-pagestyles.odt
b/sw/qa/extras/layout/data/hidden-sections-with-pagestyles.odt
new file mode 100644
index 000000000000..5b33e7cc86a1
Binary files /dev/null and
b/sw/qa/extras/layout/data/hidden-sections-with-pagestyles.odt differ
diff --git a/sw/qa/extras/layout/layout3.cxx b/sw/qa/extras/layout/layout3.cxx
index 852e88d3da90..d6580ac65ab2 100644
--- a/sw/qa/extras/layout/layout3.cxx
+++ b/sw/qa/extras/layout/layout3.cxx
@@ -1802,6 +1802,96 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf156724)
assertXPath(pXmlDoc, "/root/page"_ostr, 2);
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testHiddenSectionPageDescs)
+{
+ createSwDoc("hidden-sections-with-pagestyles.odt");
+
+ {
+ xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+ assertXPath(pXmlDoc, "/root/page"_ostr, 2);
+ assertXPath(pXmlDoc, "/root/page[1]"_ostr, "formatName"_ostr, "Hotti");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section"_ostr, 1);
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[1]"_ostr,
"formatName"_ostr,
+ u"Verfügung"_ustr);
+ assertXPath(pXmlDoc, "/root/page[2]/body/section"_ostr, 2);
+ assertXPath(pXmlDoc, "/root/page[2]/body/section[1]"_ostr,
"formatName"_ostr,
+ u"Verfügung"_ustr);
+ // should be > 0, no idea why it's different on Windows
+#ifdef _WIN32
+ assertXPath(pXmlDoc,
"/root/page[2]/body/section[1]/infos/bounds"_ostr, "height"_ostr,
+ "552");
+#else
+ assertXPath(pXmlDoc,
"/root/page[2]/body/section[1]/infos/bounds"_ostr, "height"_ostr,
+ "532");
+#endif
+ assertXPath(pXmlDoc, "/root/page[2]/body/section[2]"_ostr,
"formatName"_ostr,
+ "Rueckantwort");
+ assertXPath(pXmlDoc,
"/root/page[2]/body/section[2]/infos/bounds"_ostr, "height"_ostr, "0");
+ assertXPath(pXmlDoc, "/root/page[2]"_ostr, "formatName"_ostr,
"Folgeseite");
+ discardDumpedLayout();
+ }
+
+ // toggle one section hidden and other visible
+ executeMacro(
+
u"vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=document"_ustr);
+ Scheduler::ProcessEventsToIdle();
+
+ {
+ xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+ assertXPath(pXmlDoc, "/root/page"_ostr, 3);
+ assertXPath(pXmlDoc, "/root/page[1]"_ostr, "formatName"_ostr, "Hotti");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section"_ostr, 2);
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[1]"_ostr,
"formatName"_ostr,
+ u"Verfügung"_ustr);
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[2]"_ostr,
"formatName"_ostr,
+ "Rueckantwort");
+ assertXPath(pXmlDoc, "/root/page[2]"_ostr, "formatName"_ostr, "Empty
Page");
+ assertXPath(pXmlDoc, "/root/page[3]/body/section"_ostr, 1);
+ assertXPath(pXmlDoc, "/root/page[3]/body/section[1]"_ostr,
"formatName"_ostr,
+ "Rueckantwort");
+ // should be > 0, no idea why it's different on Windows
+#ifdef _WIN32
+ assertXPath(pXmlDoc,
"/root/page[3]/body/section[1]/infos/bounds"_ostr, "height"_ostr,
+ "552");
+#else
+ assertXPath(pXmlDoc,
"/root/page[3]/body/section[1]/infos/bounds"_ostr, "height"_ostr,
+ "532");
+#endif
+ assertXPath(pXmlDoc, "/root/page[3]"_ostr, "formatName"_ostr,
"RueckantwortRechts");
+ discardDumpedLayout();
+ }
+
+ // toggle one section hidden and other visible
+ executeMacro(
+
u"vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=document"_ustr);
+ Scheduler::ProcessEventsToIdle();
+
+ {
+ xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+ assertXPath(pXmlDoc, "/root/page"_ostr, 2);
+ assertXPath(pXmlDoc, "/root/page[1]"_ostr, "formatName"_ostr, "Hotti");
+ assertXPath(pXmlDoc, "/root/page[1]/body/section"_ostr, 1);
+ assertXPath(pXmlDoc, "/root/page[1]/body/section[1]"_ostr,
"formatName"_ostr,
+ u"Verfügung"_ustr);
+ assertXPath(pXmlDoc, "/root/page[2]/body/section"_ostr, 2);
+ assertXPath(pXmlDoc, "/root/page[2]/body/section[1]"_ostr,
"formatName"_ostr,
+ u"Verfügung"_ustr);
+ // should be > 0, no idea why it's different on Windows
+#ifdef _WIN32
+ assertXPath(pXmlDoc,
"/root/page[2]/body/section[1]/infos/bounds"_ostr, "height"_ostr,
+ "552");
+#else
+ assertXPath(pXmlDoc,
"/root/page[2]/body/section[1]/infos/bounds"_ostr, "height"_ostr,
+ "532");
+#endif
+ assertXPath(pXmlDoc, "/root/page[2]/body/section[2]"_ostr,
"formatName"_ostr,
+ "Rueckantwort");
+ assertXPath(pXmlDoc,
"/root/page[2]/body/section[2]/infos/bounds"_ostr, "height"_ostr, "0");
+ assertXPath(pXmlDoc, "/root/page[2]"_ostr, "formatName"_ostr,
"Folgeseite");
+ discardDumpedLayout();
+ }
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf156725)
{
createSwDoc("tdf156725.fodt");
diff --git a/sw/source/core/layout/laycache.cxx
b/sw/source/core/layout/laycache.cxx
index c2c03bb19f17..75ccf1ac4686 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -635,20 +635,25 @@ sal_uLong SwLayHelper::CalcPageCount()
* The break after flag is set, if the actual content
* wants a break after.
*/
-bool SwLayHelper::CheckInsertPage()
+bool SwLayHelper::CheckInsertPage(
+ SwPageFrame *& rpPage,
+ SwLayoutFrame *& rpLay,
+ SwFrame *& rpFrame,
+ bool & rIsBreakAfter,
+ bool const isForceBreak)
{
- bool bEnd = nullptr == mrpPage->GetNext();
- const SvxFormatBreakItem& rBrk = mrpFrame->GetBreakItem();
- const SwFormatPageDesc& rDesc = mrpFrame->GetPageDescItem();
+ bool bEnd = nullptr == rpPage->GetNext();
+ const SvxFormatBreakItem& rBrk = rpFrame->GetBreakItem();
+ const SwFormatPageDesc& rDesc = rpFrame->GetPageDescItem();
// #118195# Do not evaluate page description if frame
// is a follow frame!
- const SwPageDesc* pDesc = mrpFrame->IsFlowFrame() &&
- SwFlowFrame::CastFlowFrame( mrpFrame
)->IsFollow() ?
- nullptr :
- rDesc.GetPageDesc();
+ const SwPageDesc* pDesc = rpFrame->IsFlowFrame()
+ && SwFlowFrame::CastFlowFrame(rpFrame)->IsFollow()
+ ? nullptr
+ : rDesc.GetPageDesc();
- bool bBrk = mnParagraphCnt > mnMaxParaPerPage || mbBreakAfter;
- mbBreakAfter = rBrk.GetBreak() == SvxBreak::PageAfter ||
+ bool bBrk = isForceBreak || rIsBreakAfter;
+ rIsBreakAfter = rBrk.GetBreak() == SvxBreak::PageAfter ||
rBrk.GetBreak() == SvxBreak::PageBoth;
if ( !bBrk )
bBrk = rBrk.GetBreak() == SvxBreak::PageBefore ||
@@ -659,47 +664,48 @@ bool SwLayHelper::CheckInsertPage()
::std::optional<sal_uInt16> oPgNum;
if ( !pDesc )
{
- pDesc = mrpPage->GetPageDesc()->GetFollow();
+ pDesc = rpPage->GetPageDesc()->GetFollow();
}
else
{
oPgNum = rDesc.GetNumOffset();
if ( oPgNum )
-
static_cast<SwRootFrame*>(mrpPage->GetUpper())->SetVirtPageNum(true);
+
static_cast<SwRootFrame*>(rpPage->GetUpper())->SetVirtPageNum(true);
}
- bool bNextPageRight = !mrpPage->OnRightPage();
+ bool bNextPageRight = !rpPage->OnRightPage();
bool bInsertEmpty = false;
- assert(mrpPage->GetUpper()->GetLower());
+ assert(rpPage->GetUpper()->GetLower());
if (oPgNum && bNextPageRight != IsRightPageByNumber(
- *static_cast<SwRootFrame*>(mrpPage->GetUpper()), *oPgNum))
+ *static_cast<SwRootFrame*>(rpPage->GetUpper()), *oPgNum))
{
bNextPageRight = !bNextPageRight;
bInsertEmpty = true;
}
// If the page style is changing, we'll have a first page.
- bool bNextPageFirst = pDesc != mrpPage->GetPageDesc();
- ::InsertNewPage( const_cast<SwPageDesc&>(*pDesc), mrpPage->GetUpper(),
- bNextPageRight, bNextPageFirst, bInsertEmpty, false,
mrpPage->GetNext());
+ bool bNextPageFirst = pDesc != rpPage->GetPageDesc();
+ ::InsertNewPage( const_cast<SwPageDesc&>(*pDesc), rpPage->GetUpper(),
+ bNextPageRight, bNextPageFirst, bInsertEmpty, false,
rpPage->GetNext());
if ( bEnd )
{
- OSL_ENSURE( mrpPage->GetNext(), "No new page?" );
+ OSL_ENSURE( rpPage->GetNext(), "No new page?" );
do
- { mrpPage = static_cast<SwPageFrame*>(mrpPage->GetNext());
- } while ( mrpPage->GetNext() );
+ {
+ rpPage = static_cast<SwPageFrame*>(rpPage->GetNext());
+ } while (rpPage->GetNext());
}
else
{
- OSL_ENSURE( mrpPage->GetNext(), "No new page?" );
- mrpPage = static_cast<SwPageFrame*>(mrpPage->GetNext());
- if ( mrpPage->IsEmptyPage() )
+ OSL_ENSURE( rpPage->GetNext(), "No new page?" );
+ rpPage = static_cast<SwPageFrame*>(rpPage->GetNext());
+ if (rpPage->IsEmptyPage())
{
- OSL_ENSURE( mrpPage->GetNext(), "No new page?" );
- mrpPage = static_cast<SwPageFrame*>(mrpPage->GetNext());
+ OSL_ENSURE( rpPage->GetNext(), "No new page?" );
+ rpPage = static_cast<SwPageFrame*>(rpPage->GetNext());
}
}
- mrpLay = mrpPage->FindBodyCont();
- while( mrpLay->Lower() )
- mrpLay = static_cast<SwLayoutFrame*>(mrpLay->Lower());
+ rpLay = rpPage->FindBodyCont();
+ while (rpLay->Lower())
+ rpLay = static_cast<SwLayoutFrame*>(rpLay->Lower());
return true;
}
return false;
@@ -885,7 +891,7 @@ bool SwLayHelper::CheckInsert( SwNodeOffset nNodeIndex )
}
SwPageFrame* pLastPage = mrpPage;
- if( CheckInsertPage() )
+ if (CheckInsertPage(mrpPage, mrpLay, mrpFrame, mbBreakAfter,
mnMaxParaPerPage < mnParagraphCnt))
{
CheckFlyCache_( pLastPage );
if( mrpPrv && mrpPrv->IsTextFrame() &&
!mrpPrv->isFrameAreaSizeValid() )
diff --git a/sw/source/core/layout/layhelp.hxx
b/sw/source/core/layout/layhelp.hxx
index 02ff3ca4f327..1ac325cfac82 100644
--- a/sw/source/core/layout/layhelp.hxx
+++ b/sw/source/core/layout/layhelp.hxx
@@ -129,7 +129,8 @@ public:
sal_uLong CalcPageCount();
bool CheckInsert( SwNodeOffset nNodeIndex );
- bool CheckInsertPage();
+ static bool CheckInsertPage(SwPageFrame *& rpPage, SwLayoutFrame *& rpLay,
+ SwFrame *& rpFrame, bool & rIsBreakAfter, bool const isForceBreak);
/// Look for fresh text frames at this (new) page and set them to the right
/// position, if they are in the fly cache.
diff --git a/sw/source/core/layout/sectfrm.cxx
b/sw/source/core/layout/sectfrm.cxx
index 4dc31c4256fd..7506b5a001be 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -39,6 +39,7 @@
#include <colfrm.hxx>
#include <tabfrm.hxx>
#include <ftnfrm.hxx>
+#include "layhelp.hxx"
#include <layouter.hxx>
#include <dbg_lay.hxx>
#include <viewopt.hxx>
@@ -2736,6 +2737,87 @@ void SwSectionFrame::SwClientNotify(const SwModify&
rMod, const SfxHint& rHint)
pLowerFrame->InvalidateAll();
pLowerFrame->InvalidateObjs(false);
}
+ // Check if any page-breaks have been unhidden, create the new pages.
+ // Call IsHiddenNow() because a parent section could still hide.
+ if (!IsFollow() && IsInDocBody() && !IsInTab() && !IsHiddenNow())
+ {
+#if !ENABLE_WASM_STRIP_ACCESSIBILITY
+ SwViewShell *const pViewShell(getRootFrame()->GetCurrShell());
+ // no notification if SwViewShell is in construction
+ if (pViewShell && !pViewShell->IsInConstructor()
+ && pViewShell->GetLayout()
+ && pViewShell->GetLayout()->IsAnyShellAccessible())
+ {
+ auto pNext = FindNextCnt(true);
+ auto pPrev = FindPrevCnt();
+ pViewShell->InvalidateAccessibleParaFlowRelation(
+ pNext ? pNext->DynCastTextFrame() : nullptr,
+ pPrev ? pPrev->DynCastTextFrame() : nullptr );
+ }
+#endif
+ SwSectionFrame * pFollow{this};
+ SwPageFrame * pPage{FindPageFrame()};
+ SwLayoutFrame * pLay{nullptr};
+ bool isBreakAfter{false};
+ SwFrame * pFirstOnPage{pPage->FindFirstBodyContent()};
+ while (pFirstOnPage->GetUpper()->IsInTab())
+ {
+ pFirstOnPage = pFirstOnPage->GetUpper();
+ }
+ assert(pFirstOnPage->IsContentFrame() ||
pFirstOnPage->IsTabFrame());
+ SwColumnFrame * pColumn{Lower()->IsColumnFrame()
+ ? static_cast<SwColumnFrame*>(Lower()) : nullptr};
+ auto IterateLower = [&pColumn](SwFrame *const pLowerFrame) ->
SwFrame*
+ {
+ if (pLowerFrame->GetNext())
+ {
+ return pLowerFrame->GetNext();
+ }
+ if (pColumn)
+ {
+ pColumn = static_cast<SwColumnFrame*>(pColumn->GetNext());
+ if (pColumn)
+ {
+ return
static_cast<SwLayoutFrame*>(pColumn->Lower())->Lower();
+ }
+ }
+ return nullptr;
+ };
+ for (SwFrame* pLowerFrame = pColumn
+ ?
static_cast<SwLayoutFrame*>(pColumn->Lower())->Lower()
+ : Lower();
+ pLowerFrame;
+ pLowerFrame = IterateLower(pLowerFrame))
+ {
+ if (pLowerFrame == pFirstOnPage)
+ {
+ continue;
+ }
+ assert(pLowerFrame->IsContentFrame() ||
pLowerFrame->IsTabFrame());
+ if (SwLayHelper::CheckInsertPage(pPage, pLay, pLowerFrame,
isBreakAfter, false))
+ {
+ if (pLowerFrame == Lower())
+ { // move the whole section
+ assert(pFollow == this);
+ MoveSubTree(pLay, nullptr);
+ }
+ else
+ {
+ if (GetNext())
+ {
+ assert(GetNext()->IsFlowFrame());
+
SwFlowFrame::CastFlowFrame(GetNext())->MoveSubTree(pLay, nullptr);
+ }
+ pFollow = new SwSectionFrame(*pFollow, false);
+ SimpleFormat();
+ pFollow->InsertBehind(pLay, nullptr);
+ pFollow->Init();
+
SwFlowFrame::CastFlowFrame(pLowerFrame)->MoveSubTree(pFollow, nullptr);
+ }
+ }
+ }
+ CheckPageDescs(FindPageFrame());
+ }
}
else
SwFrame::SwClientNotify(rMod, rHint);
