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

oox smartart: add support for <dgm:layoutNode ... chOrder="t">

Browse Source 
This changes the order of children, which matters when they have no
explicit ZOrder. With this, the text shapes on the arrow shape are on
top of the arrow, not behind it.

The trick is that nominally chOrder can be "t"(op) or "b"(ottom),
defaulting to bottom, but there is a difference between an explicit "b"
and not setting it. When not setting it, the layout node is expected to
inherit it from its parent layout node, recursively.

This would probably make sense for other algorithms as well, but set it
only for the linear algorithm for now, as that's where we have a bug
document showing the PowerPoint behavior.

Change-Id: I433f92c620149ef5590aebc8cbf43110e1d2fb85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100047
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Miklos Vajna
2020-08-04 10:58:00 +02:00
parent 16a3a548d4
commit 3c185bf386
4 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
oox/source/drawingml/diagram/diagramlayoutatoms.cxx
View File

@@ -1146,6 +1146,28 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const std::vector<Constraint>&
if (aCurrShape->getSubType() == XML_conn)
aCurrShape->setRotation(nConnectorAngle * PER_DEGREE);
}
// Newer shapes are behind older ones by default. Reverse this if requested.
sal_Int32 nChildOrder = XML_b;
const LayoutNode* pParentLayoutNode = nullptr;
for (LayoutAtomPtr pAtom = getParent(); pAtom; pAtom = pAtom->getParent())
{
auto pLayoutNode = dynamic_cast<LayoutNode*>(pAtom.get());
if (pLayoutNode)
{
pParentLayoutNode = pLayoutNode;
break;
}
}
if (pParentLayoutNode)
{
nChildOrder = pParentLayoutNode->getChildOrder();
}
if (nChildOrder == XML_t)
{
std::reverse(rShape->getChildren().begin(), rShape->getChildren().end());
}
break;
}

1
oox/source/drawingml/diagram/diagramlayoutatoms.hxx
View File

@@ -271,6 +271,7 @@ public:
{ msStyleLabel = sLabel; }
void setChildOrder( sal_Int32 nOrder )
{ mnChildOrder = nOrder; }
sal_Int32 getChildOrder() const { return mnChildOrder; }
void setExistingShape( const ShapePtr& pShape )
{ mpExistingShape = pShape; }
const ShapePtr& getExistingShape() const

19
oox/source/drawingml/diagram/layoutnodecontext.cxx
View File

@@ -198,7 +198,24 @@ LayoutNodeContext::onCreateContext( ::sal_Int32 aElement,
{
LayoutNodePtr pNode = std::make_shared<LayoutNode>(mpNode->getLayoutNode().getDiagram());
LayoutAtom::connect(mpNode, pNode);
pNode->setChildOrder( rAttribs.getToken( XML_chOrder, XML_b ) );
if (rAttribs.hasAttribute(XML_chOrder))
{
pNode->setChildOrder(rAttribs.getToken(XML_chOrder, XML_b));
}
else
{
for (LayoutAtomPtr pAtom = mpNode; pAtom; pAtom = pAtom->getParent())
{
auto pLayoutNode = dynamic_cast<LayoutNode*>(pAtom.get());
if (pLayoutNode)
{
pNode->setChildOrder(pLayoutNode->getChildOrder());
break;
}
}
}
pNode->setMoveWith( rAttribs.getString( XML_moveWith ).get() );
pNode->setStyleLabel( rAttribs.getString( XML_styleLbl ).get() );
return new LayoutNodeContext( *this, rAttribs, pNode );

5
sd/qa/unit/import-tests-smartart.cxx
View File

@@ -1532,8 +1532,9 @@ void SdImportTestSmartArt::testLinearRule()
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-linear-rule.pptx"), PPTX);
uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY);
// Last child, then again last child.
uno::Reference<drawing::XShape> xShape = getChildShape(getChildShape(xGroup, 1), 3);
// Last child, then first child inside that.
// It is first as backgroundArrow is last, but chOrder="t" is set to reverse the order.
uno::Reference<drawing::XShape> xShape = getChildShape(getChildShape(xGroup, 1), 0);
// Without the accompanying fix in place, this test would have failed with:
// - Expected greater than: 17500 (19867)