configure.ac | 2
dev/null |binary
sw/qa/extras/layout/data/tdf156725.fodt | 163 --------------------------------
sw/qa/extras/layout/layout.cxx | 70 -------------
sw/source/core/layout/layact.cxx | 6 -
sw/source/core/layout/sectfrm.cxx | 5
6 files changed, 5 insertions(+), 241 deletions(-)
New commits:
commit a424f77bf317871faa62ee086d1f8e1182201a14
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Thu Jan 11 12:07:21 2024 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Thu Jan 11 12:07:21 2024 +0100
Release 6.3.6.29
Change-Id: Ibb70c89f1bc1cc58470a9df3e4a62f7ae34b99ee
diff --git a/configure.ac b/configure.ac
index e7779a82ce49..107a3505d54f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[6.3.6.28],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.6.29],[],[],[http://documentfoundation.org/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just
fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails
hard
commit 298b86fd148d40dd9bc3c673dd03e2b9a979a91b
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Thu Jan 11 12:05:54 2024 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Thu Jan 11 12:05:54 2024 +0100
Revert "tdf#156724 tdf#156722 tdf#156745 sw: layout: partially remove
IsPaintLocked()"
This reverts commit 46274983c3ac31a0580a4baeb26e3b5d79ed3c91.
diff --git a/sw/qa/extras/layout/data/fdo56797-2-min.odt
b/sw/qa/extras/layout/data/fdo56797-2-min.odt
deleted file mode 100644
index 624149ec0248..000000000000
Binary files a/sw/qa/extras/layout/data/fdo56797-2-min.odt and /dev/null differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index f72715fcba43..11c502d4c09d 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3641,37 +3641,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf155324)
assertXPath(pXmlDoc, "/root/page[5]/ftncont/ftn", 5);
}
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf156724)
-{
- discardDumpedLayout();
- if (mxComponent.is())
- mxComponent->dispose();
-
- OUString const url(m_directories.getURLFromSrc(DATA_DIRECTORY) +
"/fdo56797-2-min.odt");
-
- // note: must set Hidden property, so that
SfxFrameViewWindow_Impl::Resize()
- // does *not* forward initial VCL Window Resize and thereby triggers a
- // layout which does not happen on soffice --convert-to pdf.
- std::vector<beans::PropertyValue> aFilterOptions = {
- { beans::PropertyValue("Hidden", -1, uno::Any(true),
beans::PropertyState_DIRECT_VALUE) },
- };
-
- // inline the loading because currently properties can't be passed...
- mxComponent = loadFromDesktop(url, "com.sun.star.text.TextDocument",
-
comphelper::containerToSequence(aFilterOptions));
- save("writer_pdf_Export", maTempFile);
-
- xmlDocPtr pXmlDoc = parseLayoutDump();
- // both pages have a tab frame and one footnote
- assertXPath(pXmlDoc, "/root/page[1]/body/tab", 1);
- assertXPath(pXmlDoc, "/root/page[1]/ftncont", 1);
- assertXPath(pXmlDoc, "/root/page[1]/ftncont/ftn", 1);
- assertXPath(pXmlDoc, "/root/page[2]/body/tab", 1);
- assertXPath(pXmlDoc, "/root/page[2]/ftncont", 1);
- assertXPath(pXmlDoc, "/root/page[2]/ftncont/ftn", 1);
- assertXPath(pXmlDoc, "/root/page", 2);
-}
-
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 88185c8de95a..6a2fd2046ffb 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1365,10 +1365,10 @@ bool SwLayAction::FormatLayout( OutputDevice
*pRenderContext, SwLayoutFrame *pLa
else if( !pLow->IsSctFrame() ||
static_cast<SwSectionFrame*>(pLow)->GetSection() )
bChanged |= FormatLayout( pRenderContext,
static_cast<SwLayoutFrame*>(pLow), bAddRect );
}
- else if (m_pImp->GetShell()->IsPaintLocked() ||
!pLay->IsColBodyFrame())
- { // tdf#156724 unconditionally for frames in tables, so their
footnotes exist before trying to split
+ else if ( m_pImp->GetShell()->IsPaintLocked() )
+ // Shortcut to minimize the cycles. With Lock, the
+ // paint is coming either way (primarily for browse)
pLow->OptCalc();
- }
if ( IsAgain() )
return false;
commit 56012f32b0d59c59f30d4aef4832e04b26780af0
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Thu Jan 11 12:05:46 2024 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Thu Jan 11 12:05:46 2024 +0100
Revert "tdf#156724 tdf#156722 sw: layout: remove IsPaintLocked() check"
This reverts commit 70265179db368c1f3f5d4463bcb303be88c07e10.
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 2de17673e0e2..88185c8de95a 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1365,7 +1365,7 @@ bool SwLayAction::FormatLayout( OutputDevice
*pRenderContext, SwLayoutFrame *pLa
else if( !pLow->IsSctFrame() ||
static_cast<SwSectionFrame*>(pLow)->GetSection() )
bChanged |= FormatLayout( pRenderContext,
static_cast<SwLayoutFrame*>(pLow), bAddRect );
}
- else if (!pLay->IsColBodyFrame())
+ else if (m_pImp->GetShell()->IsPaintLocked() ||
!pLay->IsColBodyFrame())
{ // tdf#156724 unconditionally for frames in tables, so their
footnotes exist before trying to split
pLow->OptCalc();
}
commit 0daa0fa68e8eff8a85762c7dce080f7ccd549d6a
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Thu Jan 11 12:05:40 2024 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Thu Jan 11 12:05:40 2024 +0100
Revert "tdf#156725 sw: layout: don't prevent moving between columns ..."
This reverts commit 807c2254ccd1a02e7af5a944f52948ef343ad384.
diff --git a/sw/qa/extras/layout/data/tdf156725.fodt
b/sw/qa/extras/layout/data/tdf156725.fodt
deleted file mode 100644
index 9f60e7011954..000000000000
--- a/sw/qa/extras/layout/data/tdf156725.fodt
+++ /dev/null
@@ -1,163 +0,0 @@
-<?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>2023-08-17T18:14:28.115302210</meta:creation-date><dc:date>2023-08-17T18:20:06.109127302</dc:date><meta:editing-duration>PT4M30S</meta:editing-duration><meta:editing-cycles>2</meta:editing-cycles><meta:generator>LibreOfficeDev/24.2.0.0.alpha0$Linux_X86_64
LibreOffice_project/79452241ad33f9eaace2ba8bd1336be69c99ed4d</meta:generator><meta:document-statistic
meta:table-count="0" meta:image-count="0" meta:object-count="0"
meta:page-count="2" meta:paragraph-count="4" meta:word-count="4"
meta:character-count="4" meta:non-whitespace-character-count="4"/></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="Lohit Devanagari1" svg:font-family="'Lohit
Devanagari'" style:font-family-generic="system" style:font-pitch="variable"/>
- <style:font-face style:name="Noto Sans CJK SC" svg:font-family="'Noto Sans
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 Sans CJK SC" style:font-size-asian="10.5pt"
style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="Lohit Devanagari1" 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"
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 Sans CJK SC" style:font-size-asian="10.5pt"
style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="Lohit Devanagari1" 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"/>
- <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:background-color="transparent" draw:fill="none" 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" 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"/>
- <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="P1" style:family="paragraph"
style:parent-style-name="Frame_20_contents">
- <style:text-properties/>
- </style:style>
- <style:style style:name="P3" style:family="paragraph"
style:parent-style-name="Standard">
- <style:paragraph-properties fo:break-before="page"/>
- </style:style>
- <style:style style:name="fr1" style:family="graphic"
style:parent-style-name="Frame">
- <style:graphic-properties style:wrap="parallel"
style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top"
style:vertical-rel="paragraph" style:horizontal-pos="from-left"
style:horizontal-rel="paragraph">
- <style:columns fo:column-count="2" fo:column-gap="0.497cm">
- <style:column style:rel-width="32767*" fo:start-indent="0cm"
fo:end-indent="0.248cm"/>
- <style:column style:rel-width="32768*" fo:start-indent="0.248cm"
fo:end-indent="0cm"/>
- </style:columns>
- </style:graphic-properties>
- </style:style>
- <style:style style:name="Sect1" style:family="section">
- <style:section-properties text:dont-balance-text-columns="false"
style:editable="false">
- <style:columns fo:column-count="2" fo:column-gap="0.497cm">
- <style:column style:rel-width="32767*" fo:start-indent="0cm"
fo:end-indent="0.248cm"/>
- <style:column style:rel-width="32768*" fo:start-indent="0.248cm"
fo:end-indent="0cm"/>
- </style:columns>
- </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: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="Standard"/>
- <text:p text:style-name="P3"><draw:frame draw:style-name="fr1"
draw:name="Frame1" text:anchor-type="paragraph" svg:x="3.491cm" svg:y="0.87cm"
svg:width="13.04cm" draw:z-index="0">
- <draw:text-box fo:min-height="0.499cm">
- <text:section text:style-name="Sect1" text:name="Section1">
- <text:p text:style-name="P1">a</text:p>
- <text:p text:style-name="P1">b</text:p>
- <text:p text:style-name="P1">c</text:p>
- <text:p text:style-name="P1">d</text:p>
- </text:section>
- </draw:text-box>
- </draw:frame></text:p>
- </office:text>
- </office:body>
-</office:document>
\ No newline at end of file
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index def657eec623..f72715fcba43 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3672,27 +3672,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf156724)
assertXPath(pXmlDoc, "/root/page", 2);
}
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf156725)
-{
- createDoc("tdf156725.fodt");
-
- xmlDocPtr pXmlDoc = parseLayoutDump();
- assertXPath(pXmlDoc, "/root/page", 2);
- // the fly has 2 columns, the section in it has 2 columns, and is split
- // across the fly columns => 4 columns with 1 text frame each
- assertXPath(pXmlDoc, "/root/page[2]/body/txt/anchored/fly/column", 2);
- assertXPath(pXmlDoc,
"/root/page[2]/body/txt/anchored/fly/column[1]/body/section/column", 2);
- assertXPath(pXmlDoc,
-
"/root/page[2]/body/txt/anchored/fly/column[1]/body/section/column[1]/body/txt",
1);
- assertXPath(pXmlDoc,
-
"/root/page[2]/body/txt/anchored/fly/column[1]/body/section/column[2]/body/txt",
1);
- assertXPath(pXmlDoc,
"/root/page[2]/body/txt/anchored/fly/column[2]/body/section/column", 2);
- assertXPath(pXmlDoc,
-
"/root/page[2]/body/txt/anchored/fly/column[2]/body/section/column[1]/body/txt",
1);
- assertXPath(pXmlDoc,
-
"/root/page[2]/body/txt/anchored/fly/column[2]/body/section/column[2]/body/txt",
1);
-}
-
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/sectfrm.cxx
b/sw/source/core/layout/sectfrm.cxx
index 163b8932552c..4a34d748a46e 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -1724,9 +1724,7 @@ SwLayoutFrame *SwFrame::GetNextSctLeaf( MakePageType
eMakePage )
// fine to be on the same page. New page creation is handled when
// creating / moving the cell frame.
// It doesn't make sense to move to a page that starts with break?
- if (pNxtPg != FindPageFrame() // tdf#156725 not between columns!
- && (WrongPageDesc(pNxtPg) || HasPageBreakBefore(*pNxtPg))
- && !bLayLeafTableAllowed)
+ if ((WrongPageDesc(pNxtPg) || HasPageBreakBefore(*pNxtPg)) &&
!bLayLeafTableAllowed )
{
if( bWrongPage )
break; // there's a column between me and my right page
commit 64ead946884d4ee9402383e8928bf5d258491cf5
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Thu Jan 11 12:05:32 2024 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Thu Jan 11 12:05:32 2024 +0100
Revert "tdf#156419 sw: layout: don't prevent moving between linked flys"
This reverts commit 37cf497180819135b615023cde58795aec7ee3d0.
diff --git a/sw/qa/extras/layout/data/linked_frames_section_bug.odt
b/sw/qa/extras/layout/data/linked_frames_section_bug.odt
deleted file mode 100644
index 639332ad5516..000000000000
Binary files a/sw/qa/extras/layout/data/linked_frames_section_bug.odt and
/dev/null differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 1e35f749e67d..def657eec623 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3693,24 +3693,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf156725)
"/root/page[2]/body/txt/anchored/fly/column[2]/body/section/column[2]/body/txt",
1);
}
-CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf156419)
-{
- createDoc("linked_frames_section_bug.odt");
-
- xmlDocPtr pXmlDoc = parseLayoutDump();
- assertXPath(pXmlDoc, "/root/page", 2);
- // there are 2 flys on page 1, and 1 on page 2, all linked
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt/anchored/fly[1]/section/column", 2);
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt/anchored/fly[1]/section/column[1]/body/txt", 11);
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt/anchored/fly[1]/section/column[2]/body/txt", 11);
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt/anchored/fly[2]/section/column", 2);
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt/anchored/fly[2]/section/column[1]/body/txt", 12);
- assertXPath(pXmlDoc,
"/root/page[1]/body/txt/anchored/fly[2]/section/column[2]/body/txt", 12);
- assertXPath(pXmlDoc,
"/root/page[2]/body/txt/anchored/fly[1]/section/column", 2);
- assertXPath(pXmlDoc,
"/root/page[2]/body/txt/anchored/fly[1]/section/column[1]/body/txt", 2);
- assertXPath(pXmlDoc,
"/root/page[2]/body/txt/anchored/fly[1]/section/column[2]/body/txt", 1);
-}
-
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/sectfrm.cxx
b/sw/source/core/layout/sectfrm.cxx
index 3ff52ce84117..163b8932552c 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -1725,7 +1725,6 @@ SwLayoutFrame *SwFrame::GetNextSctLeaf( MakePageType
eMakePage )
// creating / moving the cell frame.
// It doesn't make sense to move to a page that starts with break?
if (pNxtPg != FindPageFrame() // tdf#156725 not between columns!
- && !FindFlyFrame() // tdf#156419 linked fly frames don't care!
&& (WrongPageDesc(pNxtPg) || HasPageBreakBefore(*pNxtPg))
&& !bLayLeafTableAllowed)
{
