mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sw from-bottom relative orientation: add layout

Browse Source 
The implementation is a combination of what "bottom" and "from-top"
already provided.

Change-Id: Id7bac8cbcccbadcca377fe9946a21ccb3e368913
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93086
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Miklos Vajna
2020-04-28 17:28:16 +02:00
parent 781a1a8223
commit dd52fdba87
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sw/qa/core/objectpositioning/objectpositioning.cxx
View File

@@ -9,6 +9,8 @@
#include <swmodeltestbase.hxx>
#include <com/sun/star/text/VertOrientation.hpp>
#include <comphelper/classids.hxx>
#include <svtools/embedhlp.hxx>
#include <svx/svdpage.hxx>
@@ -48,6 +50,37 @@ CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest, testOverlapCrash)
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::makeAny(text::TextContentAnchorType_AT_CHARACTER));
xShapeProps->setPropertyValue("VertOrient", uno::makeAny(text::VertOrientation::NONE));
xShapeProps->setPropertyValue("VertOrientRelation",
uno::makeAny(text::RelOrientation::PAGE_PRINT_AREA_BOTTOM));
xShapeProps->setPropertyValue("VertOrientPosition",
uno::makeAny(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.
xmlDocPtr pXmlDoc = parseLayoutDump();
sal_Int32 nBodyBottom = getXPath(pXmlDoc, "//body/infos/bounds", "bottom").toInt32();
sal_Int32 nAnchoredBottom
= getXPath(pXmlDoc, "//SwAnchoredDrawObject/bounds", "bottom").toInt32();
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 564
// - Actual : 9035
// i.e. the vertical position was from-top, not from-bottom.
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(564), nBodyBottom - nAnchoredBottom);
}
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

12
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
View File

@@ -543,6 +543,18 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
aRectFnSet.GetTop(aPgPrtRect),
nTopOfOrient );
}
else if (aVert.GetRelationOrient() == text::RelOrientation::PAGE_PRINT_AREA_BOTTOM)
{
// The anchored object is relative from the bottom of the page's print area.
SwRect aPgPrtRect(rPageAlignLayFrame.getFrameArea());
if (rPageAlignLayFrame.IsPageFrame())
{
auto& rPageFrame = static_cast<const SwPageFrame&>(rPageAlignLayFrame);
aPgPrtRect = rPageFrame.PrtWithoutHeaderAndFooter();
}
SwTwips nPageBottom = aRectFnSet.GetBottom(aPgPrtRect);
nVertOffsetToFrameAnchorPos += aRectFnSet.YDiff(nPageBottom, nTopOfOrient);
}
nRelPosY = nVertOffsetToFrameAnchorPos + aVert.GetPos();
}