diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2021-03-08 21:06:10 +0100 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-03-11 13:25:50 +0100 |
commit | 291bc2799e4d384cb3ccbb429e82a8ea52d3ea2f (patch) | |
tree | c01f760978f76aa1c10d29ac599b5a9431ff49a9 | |
parent | 18397b2ede1e6c3feb54bd2bf59da57fd8c4d13a (diff) |
tdf#140292 sw: fix z-order of textbox on undo
Regression from commit 200cd2b99bee18962a970edc5d059286f6c3ea0e
(tdf#138995 DOCX import: fix handling of textbox zorders, 2021-01-11),
the problem was already fixed by Michael Stahl, this just adds a test
for it.
Change-Id: Id613224d5fab0c2d2a3bdfd58bff6d77a92dd374
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112181
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112273
-rw-r--r-- | sw/qa/core/draw/data/textbox-undo-ordnum.docx | bin | 0 -> 21223 bytes | |||
-rw-r--r-- | sw/qa/core/draw/draw.cxx | 53 |
2 files changed, 53 insertions, 0 deletions
diff --git a/sw/qa/core/draw/data/textbox-undo-ordnum.docx b/sw/qa/core/draw/data/textbox-undo-ordnum.docx Binary files differnew file mode 100644 index 000000000000..96b00973289a --- /dev/null +++ b/sw/qa/core/draw/data/textbox-undo-ordnum.docx diff --git a/sw/qa/core/draw/draw.cxx b/sw/qa/core/draw/draw.cxx index 162bf237d154..400f701ca352 100644 --- a/sw/qa/core/draw/draw.cxx +++ b/sw/qa/core/draw/draw.cxx @@ -10,11 +10,14 @@ #include <swmodeltestbase.hxx> #include <svx/svdpage.hxx> +#include <vcl/scheduler.hxx> #include <IDocumentDrawModelAccess.hxx> #include <docsh.hxx> #include <drawdoc.hxx> #include <wrtsh.hxx> +#include <frameformats.hxx> +#include <textboxhelper.hxx> char const DATA_DIRECTORY[] = "/sw/qa/core/draw/data/"; @@ -46,6 +49,56 @@ CPPUNIT_TEST_FIXTURE(SwCoreDrawTest, testTextboxDeleteAsChar) CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), nActual); } +CPPUNIT_TEST_FIXTURE(SwCoreDrawTest, testTextboxUndoOrdNum) +{ + // Given a document with 5 frame formats: + // - picture + // - draw format + fly format and a picture in it + // - picture + SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "textbox-undo-ordnum.docx"); + SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); + const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats(); + // Test the state before del + undo. + for (const auto& pFormat : rFormats) + { + const SwFrameFormat* pFlyFormat + = SwTextBoxHelper::getOtherTextBoxFormat(pFormat, RES_DRAWFRMFMT); + if (!pFlyFormat) + { + continue; + } + + sal_Int32 nDrawOrdNum = pFormat->FindRealSdrObject()->GetOrdNum(); + sal_Int32 nFlyOrdNum = pFlyFormat->FindRealSdrObject()->GetOrdNum(); + CPPUNIT_ASSERT_EQUAL(nDrawOrdNum + 1, nFlyOrdNum); + } + + // When selecting the first page, deleting the selection and undoing: + pWrtShell->Down(true, 3); + pWrtShell->DelLeft(); + pWrtShell->Undo(); + + // Then the z-order of the fly format should be still the z-order of the draw format + 1, when + // the fly and draw formats form a textbox pair. + for (const auto& pFormat : rFormats) + { + const SwFrameFormat* pFlyFormat + = SwTextBoxHelper::getOtherTextBoxFormat(pFormat, RES_DRAWFRMFMT); + if (!pFlyFormat) + { + continue; + } + + sal_Int32 nDrawOrdNum = pFormat->FindRealSdrObject()->GetOrdNum(); + sal_Int32 nFlyOrdNum = pFlyFormat->FindRealSdrObject()->GetOrdNum(); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 4 + // - Actual : 2 + // i.e. the fly format was behind the draw format, not visible. + CPPUNIT_ASSERT_EQUAL(nDrawOrdNum + 1, nFlyOrdNum); + } +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |