diff options
Diffstat (limited to 'sw/qa/core/objectpositioning')
-rw-r--r-- | sw/qa/core/objectpositioning/data/bottom-margin-with-footer.docx | bin | 0 -> 17919 bytes | |||
-rw-r--r-- | sw/qa/core/objectpositioning/data/inside-outside-vert-align.docx | bin | 0 -> 17252 bytes | |||
-rw-r--r-- | sw/qa/core/objectpositioning/data/overlap-crash.odt | bin | 0 -> 22502 bytes | |||
-rw-r--r-- | sw/qa/core/objectpositioning/data/vml-vertical-alignment.docx | bin | 0 -> 15152 bytes | |||
-rw-r--r-- | sw/qa/core/objectpositioning/objectpositioning.cxx | 282 |
5 files changed, 282 insertions, 0 deletions
diff --git a/sw/qa/core/objectpositioning/data/bottom-margin-with-footer.docx b/sw/qa/core/objectpositioning/data/bottom-margin-with-footer.docx Binary files differnew file mode 100644 index 000000000..bb48ae4a7 --- /dev/null +++ b/sw/qa/core/objectpositioning/data/bottom-margin-with-footer.docx diff --git a/sw/qa/core/objectpositioning/data/inside-outside-vert-align.docx b/sw/qa/core/objectpositioning/data/inside-outside-vert-align.docx Binary files differnew file mode 100644 index 000000000..1308e1f6a --- /dev/null +++ b/sw/qa/core/objectpositioning/data/inside-outside-vert-align.docx diff --git a/sw/qa/core/objectpositioning/data/overlap-crash.odt b/sw/qa/core/objectpositioning/data/overlap-crash.odt Binary files differnew file mode 100644 index 000000000..a756c85dd --- /dev/null +++ b/sw/qa/core/objectpositioning/data/overlap-crash.odt diff --git a/sw/qa/core/objectpositioning/data/vml-vertical-alignment.docx b/sw/qa/core/objectpositioning/data/vml-vertical-alignment.docx Binary files differnew file mode 100644 index 000000000..36ed5fdfb --- /dev/null +++ b/sw/qa/core/objectpositioning/data/vml-vertical-alignment.docx diff --git a/sw/qa/core/objectpositioning/objectpositioning.cxx b/sw/qa/core/objectpositioning/objectpositioning.cxx new file mode 100644 index 000000000..e3aace4ff --- /dev/null +++ b/sw/qa/core/objectpositioning/objectpositioning.cxx @@ -0,0 +1,282 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <swmodeltestbase.hxx> + +#include <com/sun/star/text/VertOrientation.hpp> +#include <com/sun/star/drawing/XDrawPageSupplier.hpp> + +#include <wrtsh.hxx> +#include <unotxdoc.hxx> +#include <docsh.hxx> + +constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/objectpositioning/data/"; + +/// Covers sw/source/core/objectpositioning/ fixes. +class SwCoreObjectpositioningTest : public SwModelTestBase +{ +}; + +CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest, testOverlapCrash) +{ + // Load a document with 2 images. + load(DATA_DIRECTORY, "overlap-crash.odt"); + + // Change their anchor type to to-char. + uno::Reference<beans::XPropertySet> xShape1(getShape(1), uno::UNO_QUERY); + xShape1->setPropertyValue("AnchorType", uno::Any(text::TextContentAnchorType_AT_CHARACTER)); + uno::Reference<beans::XPropertySet> xShape2(getShape(1), uno::UNO_QUERY); + xShape2->setPropertyValue("AnchorType", uno::Any(text::TextContentAnchorType_AT_CHARACTER)); + + // Insert a new paragraph at the start. + SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); + SwDocShell* pDocShell = pTextDoc->GetDocShell(); + SwWrtShell* pWrtShell = pDocShell->GetWrtShell(); + // Without the accompanying fix in place, this test would have crashed. + pWrtShell->SplitNode(); +} + +CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest, testVertPosFromBottom) +{ + // Create a document, insert a shape and position it 1cm above the bottom of the body area. + mxComponent = loadFromDesktop("private:factory/swriter", "com.sun.star.text.TextDocument"); + uno::Reference<css::lang::XMultiServiceFactory> xFactory(mxComponent, uno::UNO_QUERY); + uno::Reference<drawing::XShape> xShape( + xFactory->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); + xShape->setSize(awt::Size(10000, 10000)); + uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY); + xShapeProps->setPropertyValue("AnchorType", uno::Any(text::TextContentAnchorType_AT_CHARACTER)); + xShapeProps->setPropertyValue("VertOrient", uno::Any(text::VertOrientation::NONE)); + xShapeProps->setPropertyValue("VertOrientRelation", + uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM)); + xShapeProps->setPropertyValue("VertOrientPosition", uno::Any(static_cast<sal_Int32>(-11000))); + uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY); + xDrawPageSupplier->getDrawPage()->add(xShape); + + // Verify that the distance between the body and anchored object bottom is indeed around 1cm. + xmlDocUniquePtr pXmlDoc = parseLayoutDump(); + sal_Int32 nBodyBottom = getXPath(pXmlDoc, "//body/infos/bounds", "bottom").toInt32(); + sal_Int32 nAnchoredBottom + = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject/bounds", "bottom").toInt32(); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 565 + // - Actual : 9035 + // i.e. the vertical position was from-top, not from-bottom. + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(565), nBodyBottom - nAnchoredBottom); +} + +CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest, testVertAlignBottomMargin) +{ + // Create a document, insert three shapes and align it the bottom,center,top of page print area bottom. + // The size of shapes are 284 ~ 0.5cm + // The height of page print area bottom is 1134 ~ 2cm + mxComponent = loadFromDesktop("private:factory/swriter", "com.sun.star.text.TextDocument"); + uno::Reference<css::lang::XMultiServiceFactory> xFactory(mxComponent, uno::UNO_QUERY); + + //Create first shape and align bottom of page print area bottom. + uno::Reference<drawing::XShape> xShapeBottom( + xFactory->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); + xShapeBottom->setSize(awt::Size(500, 500)); + uno::Reference<beans::XPropertySet> xShapePropsBottom(xShapeBottom, uno::UNO_QUERY); + xShapePropsBottom->setPropertyValue("AnchorType", + uno::Any(text::TextContentAnchorType_AT_CHARACTER)); + xShapePropsBottom->setPropertyValue("VertOrient", uno::Any(text::VertOrientation::BOTTOM)); + xShapePropsBottom->setPropertyValue("VertOrientRelation", + uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM)); + uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplierBottom(mxComponent, uno::UNO_QUERY); + xDrawPageSupplierBottom->getDrawPage()->add(xShapeBottom); + + //Create second shape and align center of page print area bottom. + uno::Reference<drawing::XShape> xShapeCenter( + xFactory->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); + xShapeCenter->setSize(awt::Size(500, 500)); + uno::Reference<beans::XPropertySet> xShapePropsCenter(xShapeCenter, uno::UNO_QUERY); + xShapePropsCenter->setPropertyValue("AnchorType", + uno::Any(text::TextContentAnchorType_AT_CHARACTER)); + xShapePropsCenter->setPropertyValue("VertOrient", uno::Any(text::VertOrientation::CENTER)); + xShapePropsCenter->setPropertyValue("VertOrientRelation", + uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM)); + uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplierCenter(mxComponent, uno::UNO_QUERY); + xDrawPageSupplierCenter->getDrawPage()->add(xShapeCenter); + + //Create third shape and align top of page print area bottom. + uno::Reference<drawing::XShape> xShapeTop( + xFactory->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); + xShapeTop->setSize(awt::Size(500, 500)); + uno::Reference<beans::XPropertySet> xShapePropsTop(xShapeTop, uno::UNO_QUERY); + xShapePropsTop->setPropertyValue("AnchorType", + uno::Any(text::TextContentAnchorType_AT_CHARACTER)); + xShapePropsTop->setPropertyValue("VertOrient", uno::Any(text::VertOrientation::TOP)); + xShapePropsTop->setPropertyValue("VertOrientRelation", + uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM)); + uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplierTop(mxComponent, uno::UNO_QUERY); + xDrawPageSupplierTop->getDrawPage()->add(xShapeTop); + + xmlDocUniquePtr pXmlDoc = parseLayoutDump(); + sal_Int32 nBodyBottom = getXPath(pXmlDoc, "//body/infos/bounds", "bottom").toInt32(); //14989 + sal_Int32 nPageBottom = getXPath(pXmlDoc, "//page/infos/bounds", "bottom").toInt32(); //16123 + sal_Int32 nFirstShapeBottom + = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject[1]/bounds", "bottom") + .toInt32(); //16124 + sal_Int32 nSecondShapeBottom + = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject[2]/bounds", "bottom") + .toInt32(); //15699 + sal_Int32 nSecondShapeTop + = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject[2]/bounds", "top").toInt32(); //15414 + sal_Int32 nThirdShapeTop + = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject[3]/bounds", "top").toInt32(); //14989 + + // Verify that the distance between the bottom of page and bottom of first shape is around 0cm. (align=bottom) + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), nFirstShapeBottom - nPageBottom); + // Verify that the distance between the bottom of page and bottom of second shape is around 0.75cm and + // verify that the distance between the bottom of body and top of second shape is around 0.75cm.(align=center) + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(424), nPageBottom - nSecondShapeBottom); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(425), 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<sal_Int32>(0), nThirdShapeTop - nBodyBottom); +} + +CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest, testVertAlignBottomMarginWithFooter) +{ + // Load an empty document with footer. + load(DATA_DIRECTORY, "bottom-margin-with-footer.docx"); + uno::Reference<css::lang::XMultiServiceFactory> 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<drawing::XShape> xShapeBottom( + xFactory->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); + xShapeBottom->setSize(awt::Size(1000, 1000)); + uno::Reference<beans::XPropertySet> xShapePropsBottom(xShapeBottom, uno::UNO_QUERY); + xShapePropsBottom->setPropertyValue("AnchorType", + uno::Any(text::TextContentAnchorType_AT_CHARACTER)); + xShapePropsBottom->setPropertyValue("VertOrient", uno::Any(text::VertOrientation::BOTTOM)); + xShapePropsBottom->setPropertyValue("VertOrientRelation", + uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM)); + uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplierBottom(mxComponent, uno::UNO_QUERY); + xDrawPageSupplierBottom->getDrawPage()->add(xShapeBottom); + + // Create second shape and align center of page print area bottom. + uno::Reference<drawing::XShape> xShapeCenter( + xFactory->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); + xShapeCenter->setSize(awt::Size(1000, 1000)); + uno::Reference<beans::XPropertySet> xShapePropsCenter(xShapeCenter, uno::UNO_QUERY); + xShapePropsCenter->setPropertyValue("AnchorType", + uno::Any(text::TextContentAnchorType_AT_CHARACTER)); + xShapePropsCenter->setPropertyValue("VertOrient", uno::Any(text::VertOrientation::CENTER)); + xShapePropsCenter->setPropertyValue("VertOrientRelation", + uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM)); + uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplierCenter(mxComponent, uno::UNO_QUERY); + xDrawPageSupplierCenter->getDrawPage()->add(xShapeCenter); + + // Create third shape and align top of page print area bottom. + uno::Reference<drawing::XShape> xShapeTop( + xFactory->createInstance("com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY); + xShapeTop->setSize(awt::Size(1000, 1000)); + uno::Reference<beans::XPropertySet> xShapePropsTop(xShapeTop, uno::UNO_QUERY); + xShapePropsTop->setPropertyValue("AnchorType", + uno::Any(text::TextContentAnchorType_AT_CHARACTER)); + xShapePropsTop->setPropertyValue("VertOrient", uno::Any(text::VertOrientation::TOP)); + xShapePropsTop->setPropertyValue("VertOrientRelation", + uno::Any(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM)); + uno::Reference<drawing::XDrawPageSupplier> 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, "//anchored/SwAnchoredDrawObject[1]/bounds", "bottom") + .toInt32(); //17122 + sal_Int32 nSecondShapeTop + = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject[2]/bounds", "top").toInt32(); //15703 + sal_Int32 nSecondShapeBottom + = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject[2]/bounds", "bottom") + .toInt32(); //16272 + sal_Int32 nThirdShapeTop + = getXPath(pXmlDoc, "//anchored/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<sal_Int32>(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<sal_Int32>(849), nPageBottom - nSecondShapeBottom); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(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<sal_Int32>(0), nThirdShapeTop - nBodyBottom); +} + +CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest, testInsideOutsideVertAlignBottomMargin) +{ + // Load a document, with two shapes. + // The shapes align the outside and inside of page print area bottom. + load(DATA_DIRECTORY, "inside-outside-vert-align.docx"); + + xmlDocUniquePtr pXmlDoc = parseLayoutDump(); + sal_Int32 nBodyBottom = getXPath(pXmlDoc, "//body/infos/bounds", "bottom").toInt32(); //15704 + sal_Int32 nPageBottom = getXPath(pXmlDoc, "//page/infos/bounds", "bottom").toInt32(); //17121 + sal_Int32 nFirstShapeOutside + = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject[1]/bounds", "bottom") + .toInt32(); //17098 + sal_Int32 nSecondShapeInside + = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject[2]/bounds", "top").toInt32(); //15694 + + // Verify that the distance between the bottom of page and bottom of first shape is around 0cm. (align=outside) + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), nPageBottom - nFirstShapeOutside); + // Verify that the distance between the bottom of body and top of second shape is around 0cm. (align=inside) + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), nBodyBottom - nSecondShapeInside); +} + +CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest, testVMLVertAlignBottomMargin) +{ + // Load a document, with five shapes. + // The shapes align the top,center,bottom,outside and inside of page print area bottom. + // The height of page print area bottom is 4320 ~ 7.62cm. + // The size of shapes are 442 ~ 0.78cm + load(DATA_DIRECTORY, "vml-vertical-alignment.docx"); + + xmlDocUniquePtr pXmlDoc = parseLayoutDump(); + sal_Int32 nBodyBottom = getXPath(pXmlDoc, "//body/infos/bounds", "bottom").toInt32(); //11803 + sal_Int32 nPageBottom = getXPath(pXmlDoc, "//page/infos/bounds", "bottom").toInt32(); //16123 + + sal_Int32 nFirstVMLShapeInside + = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject[1]/bounds", "top").toInt32(); //11802 + sal_Int32 nSecondVMLShapeBottom + = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject[2]/bounds", "bottom") + .toInt32(); //16124 + sal_Int32 nThirdVMLShapeCenterBottom + = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject[3]/bounds", "bottom") + .toInt32(); //14185 + sal_Int32 nThirdVMLShapeCenterTop + = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject[3]/bounds", "top").toInt32(); //13741 + sal_Int32 nFourthVMLShapeTop + = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject[4]/bounds", "top").toInt32(); //11802 + sal_Int32 nFifthVMLShapeOutside + = getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject[5]/bounds", "bottom") + .toInt32(); //16124 + + // Verify that the distance between the bottom of body and top of first VMLshape is around 0cm. (align=inside) + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), nBodyBottom - nFirstVMLShapeInside); + // Verify that the distance between the bottom of page and bottom of second VMLshape is around 0cm. (align=bottom) + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), nSecondVMLShapeBottom - nPageBottom); + // Verify that the distance between the bottom of page and bottom of third VMLshape is around 3.4cm and + // verify that the distance between the bottom of body and top of third shape is around 3.4cm.(align=center) + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1938), nPageBottom - nThirdVMLShapeCenterBottom); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1938), nThirdVMLShapeCenterTop - nBodyBottom); + // Verify that the distance between the bottom of body and top of fourth VMLshape is around 0cm. (align=top) + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), nBodyBottom - nFourthVMLShapeTop); + // Verify that the distance between the bottom of page and bottom of fifth shape is around 0cm. (align=outside) + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), nFifthVMLShapeOutside - nPageBottom); +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |