From 6788133b3bdf02097d66a99047aa7bcba3a99a66 Mon Sep 17 00:00:00 2001 From: Tibor Nagy Date: Fri, 14 Aug 2020 08:19:28 +0200 Subject: tdf#135720 sw: fix PAGE_PRINT_AREA_BOTTOM alignment with footer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Top of the page margin area was the footer instead of the page text area bottom, when the vertical position of the object was "top" or "center" instead of "from top", resulting lower positions after DOCX import. Follow-up of commit d54264e34c1ccc0eaf4178ab165a843028500223 (tdf#133071 DOCX import: fix vertical alignment to bottom page margin) Co-authored-by: Attila Szűcs (NISZ) Change-Id: I4be46501fc4a3e5fb17330ea5f695a65014a7585 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100720 Tested-by: László Németh Reviewed-by: László Németh --- sw/qa/core/objectpositioning/objectpositioning.cxx | 70 ++++++++++++++++++++++ 1 file changed, 70 insertions(+) (limited to 'sw/qa/core/objectpositioning/objectpositioning.cxx') diff --git a/sw/qa/core/objectpositioning/objectpositioning.cxx b/sw/qa/core/objectpositioning/objectpositioning.cxx index 58ea30b3ce53..21151f3b92de 100644 --- a/sw/qa/core/objectpositioning/objectpositioning.cxx +++ b/sw/qa/core/objectpositioning/objectpositioning.cxx @@ -141,6 +141,76 @@ CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest, testVertAlignBottomMargin) // Verify that the distance between the bottom of body and top of third shape is around 0cm. (align=top) CPPUNIT_ASSERT_EQUAL(static_cast(0), nThirdShapeTop - nBodyBottom); } + +CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest, testVertAlignBottomMarginWithFooter) +{ + // Load an empty document with footer. + load(DATA_DIRECTORY, "bottom-margin-with-footer.docx"); + uno::Reference xFactory(mxComponent, uno::UNO_QUERY); + + // Insert three shapes and align it the bottom,center,top of page print area bottom. + // The height of page print area bottom is 2268 ~ 4cm. + // The size of shapes are 567 ~ 1cm + // Create first shape and align bottom of page print area bottom. + uno::Reference xShapeBottom( + xFactory->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); + xShapeBottom->setSize(awt::Size(1000, 1000)); + uno::Reference xShapePropsBottom(xShapeBottom, uno::UNO_QUERY); + xShapePropsBottom->setPropertyValue("AnchorType", + uno::makeAny(text::TextContentAnchorType_AT_CHARACTER)); + xShapePropsBottom->setPropertyValue("VertOrient", uno::makeAny(text::VertOrientation::BOTTOM)); + xShapePropsBottom->setPropertyValue("VertOrientRelation", + uno::makeAny(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM)); + uno::Reference xDrawPageSupplierBottom(mxComponent, uno::UNO_QUERY); + xDrawPageSupplierBottom->getDrawPage()->add(xShapeBottom); + + // Create second shape and align center of page print area bottom. + uno::Reference xShapeCenter( + xFactory->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); + xShapeCenter->setSize(awt::Size(1000, 1000)); + uno::Reference xShapePropsCenter(xShapeCenter, uno::UNO_QUERY); + xShapePropsCenter->setPropertyValue("AnchorType", + uno::makeAny(text::TextContentAnchorType_AT_CHARACTER)); + xShapePropsCenter->setPropertyValue("VertOrient", uno::makeAny(text::VertOrientation::CENTER)); + xShapePropsCenter->setPropertyValue("VertOrientRelation", + uno::makeAny(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM)); + uno::Reference xDrawPageSupplierCenter(mxComponent, uno::UNO_QUERY); + xDrawPageSupplierCenter->getDrawPage()->add(xShapeCenter); + + // Create third shape and align top of page print area bottom. + uno::Reference xShapeTop( + xFactory->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); + xShapeTop->setSize(awt::Size(1000, 1000)); + uno::Reference xShapePropsTop(xShapeTop, uno::UNO_QUERY); + xShapePropsTop->setPropertyValue("AnchorType", + uno::makeAny(text::TextContentAnchorType_AT_CHARACTER)); + xShapePropsTop->setPropertyValue("VertOrient", uno::makeAny(text::VertOrientation::TOP)); + xShapePropsTop->setPropertyValue("VertOrientRelation", + uno::makeAny(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM)); + uno::Reference xDrawPageSupplierTop(mxComponent, uno::UNO_QUERY); + xDrawPageSupplierTop->getDrawPage()->add(xShapeTop); + + xmlDocUniquePtr pXmlDoc = parseLayoutDump(); + sal_Int32 nBodyBottom = getXPath(pXmlDoc, "//body/infos/bounds", "bottom").toInt32(); //14853 + sal_Int32 nPageBottom = getXPath(pXmlDoc, "//page/infos/bounds", "bottom").toInt32(); //17121 + sal_Int32 nFirstShapeBottom + = getXPath(pXmlDoc, "//SwAnchoredDrawObject[1]/bounds", "bottom").toInt32(); //17122 + sal_Int32 nSecondShapeTop + = getXPath(pXmlDoc, "//SwAnchoredDrawObject[2]/bounds", "top").toInt32(); //15703 + sal_Int32 nSecondShapeBottom + = getXPath(pXmlDoc, "//SwAnchoredDrawObject[2]/bounds", "bottom").toInt32(); //16272 + sal_Int32 nThirdShapeTop + = getXPath(pXmlDoc, "//SwAnchoredDrawObject[3]/bounds", "top").toInt32(); //14853 + + // Verify that the distance between the bottom of page and bottom of first shape is around 0cm. (align=bottom) + CPPUNIT_ASSERT_EQUAL(static_cast(1), nFirstShapeBottom - nPageBottom); + // Verify that the distance between the bottom of page and bottom of second shape is around 1.5cm and + // verify that the distance between the bottom of body and top of second shape is around 1.5cm.(align=center) + CPPUNIT_ASSERT_EQUAL(static_cast(849), nPageBottom - nSecondShapeBottom); + CPPUNIT_ASSERT_EQUAL(static_cast(850), nSecondShapeTop - nBodyBottom); + // Verify that the distance between the bottom of body and top of third shape is around 0cm. (align=top) + CPPUNIT_ASSERT_EQUAL(static_cast(0), nThirdShapeTop - nBodyBottom); +} CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3