sw/qa/extras/layout/data/tdf143239-1-min.odt |binary
sw/qa/extras/layout/layout.cxx | 66 +++++++++++++++++++++++++++
sw/source/core/layout/layact.cxx | 3 +
3 files changed, 69 insertions(+)
New commits:
commit b14bb255199e7d6db6ec9155b5d9237cb35fdba7
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Fri Feb 25 13:43:56 2022 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Feb 25 22:21:30 2022 +0100
tdf#143239 sw: layout: invalidate fly position when moving off page
It's possible that flags on the fly are all valid when it is moved off page
when SwLayAction::FormatContent() returns and then it may not be positioned
again, keeping its (wrong) position on the old page and will appear to be
invisible unless you click on it.
(regression from commits c799de145f7e289f31e3669646e5bd12814e6c5e
and eb85de8e6b61fb3fcb6c03ae0145f7fe5478bccf)
Change-Id: If07d5af7b47eb288bef71d1b9e3459197b50fdc9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130535
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/sw/qa/extras/layout/data/tdf143239-1-min.odt
b/sw/qa/extras/layout/data/tdf143239-1-min.odt
new file mode 100644
index 000000000000..4271bfba775b
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf143239-1-min.odt differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index f87d50b71315..0888e6c493ce 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -1265,6 +1265,72 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter,
testRedlineFlysInFootnote)
}
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf143239)
+{
+ SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf143239-1-min.odt");
+ SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+ {
+ xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+ assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly", 1);
+ assertXPath(pXmlDoc,
"/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "top",
+ "18540");
+#ifndef MACOSX
+ assertXPath(pXmlDoc,
"/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "left",
+ "3559");
+#endif
+ assertXPath(pXmlDoc, "/root/page[2]/body/txt[2]/anchored/fly", 1);
+ assertXPath(pXmlDoc,
"/root/page[2]/body/txt[2]/anchored/fly[1]/infos/bounds", "top",
+ "23894");
+#ifndef MACOSX
+ assertXPath(pXmlDoc,
"/root/page[2]/body/txt[2]/anchored/fly[1]/infos/bounds", "left",
+ "1964");
+#endif
+ assertXPath(pXmlDoc, "/root/page[3]/body/txt[1]/anchored/fly", 1);
+ assertXPath(pXmlDoc,
"/root/page[3]/body/txt[1]/anchored/fly[1]/infos/bounds", "top",
+ "35662");
+#ifndef MACOSX
+ assertXPath(pXmlDoc,
"/root/page[3]/body/txt[1]/anchored/fly[1]/infos/bounds", "left",
+ "3129");
+#endif
+ assertXPath(pXmlDoc, "/root/page", 3);
+ discardDumpedLayout();
+ }
+
+ pWrtShell->SelAll();
+ pWrtShell->Delete();
+ pWrtShell->Undo();
+ Scheduler::ProcessEventsToIdle();
+
+ {
+ xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+ // now the 1st fly was on page 1, and the fly on page 2 was the 2nd one
+ assertXPath(pXmlDoc, "/root/page[2]/body/txt[1]/anchored/fly", 1);
+ assertXPath(pXmlDoc,
"/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "top",
+ "18540");
+#ifndef MACOSX
+ assertXPath(pXmlDoc,
"/root/page[2]/body/txt[1]/anchored/fly[1]/infos/bounds", "left",
+ "3559");
+#endif
+ assertXPath(pXmlDoc, "/root/page[2]/body/txt[2]/anchored/fly", 1);
+ assertXPath(pXmlDoc,
"/root/page[2]/body/txt[2]/anchored/fly[1]/infos/bounds", "top",
+ "23894");
+#ifndef MACOSX
+ assertXPath(pXmlDoc,
"/root/page[2]/body/txt[2]/anchored/fly[1]/infos/bounds", "left",
+ "1964");
+#endif
+ assertXPath(pXmlDoc, "/root/page[3]/body/txt[1]/anchored/fly", 1);
+ assertXPath(pXmlDoc,
"/root/page[3]/body/txt[1]/anchored/fly[1]/infos/bounds", "top",
+ "35662");
+#ifndef MACOSX
+ assertXPath(pXmlDoc,
"/root/page[3]/body/txt[1]/anchored/fly[1]/infos/bounds", "left",
+ "3129");
+#endif
+ assertXPath(pXmlDoc, "/root/page", 3);
+ discardDumpedLayout();
+ }
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTableOverlapFooterFly)
{
// Load a document that has a fly anchored in the footer.
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index a21a16f64afe..c7a00139478a 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1662,6 +1662,9 @@ bool SwLayAction::FormatContent(SwPageFrame *const pPage)
{
SAL_INFO("sw.layout", "SwLayAction::FormatContent: move
anchored " << pObj << " from " << pPage->GetPhyPageNum() << " to " <<
pAnchorPage->GetPhyPageNum());
pObj->RegisterAtPage(*pAnchorPage);
+ // tdf#143239 if the position remains valid, it may not be
+ // positioned again so would remain on the wrong page!
+ pObj->InvalidateObjPos();
::Notify_Background(pObj->GetDrawObj(), pPage,
pObj->GetObjRect(), PrepareHint::FlyFrameLeave, false);
}
