diff options
Diffstat (limited to 'oox/source/drawingml/diagram')
| -rw-r--r-- | oox/source/drawingml/diagram/diagram.cxx | 42 | ||||
| -rw-r--r-- | oox/source/drawingml/diagram/layoutatomvisitors.cxx | 32 |
2 files changed, 42 insertions, 32 deletions
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx index c3c28a84db23..7460c52f1fed 100644 --- a/oox/source/drawingml/diagram/diagram.cxx +++ b/oox/source/drawingml/diagram/diagram.cxx @@ -138,6 +138,46 @@ static sal_Int32 calcDepth( const OUString& rNodeName, return 0; } +static void sortChildrenByZOrder(const ShapePtr& pShape) +{ + std::vector<ShapePtr>& rChildren = pShape->getChildren(); + + // Offset the children from their default z-order stacking, if necessary. + for (size_t i = 0; i < rChildren.size(); ++i) + rChildren[i]->setZOrder(i); + + for (size_t i = 0; i < rChildren.size(); ++i) + { + const ShapePtr& pChild = rChildren[i]; + sal_Int32 nZOrderOff = pChild->getZOrderOff(); + if (nZOrderOff <= 0) + continue; + + // Increase my ZOrder by nZOrderOff. + pChild->setZOrder(pChild->getZOrder() + nZOrderOff); + pChild->setZOrderOff(0); + + for (sal_Int32 j = 0; j < nZOrderOff; ++j) + { + size_t nIndex = i + j + 1; + if (nIndex >= rChildren.size()) + break; + + // Decrease the ZOrder of the next nZOrderOff elements by one. + const ShapePtr& pNext = rChildren[nIndex]; + pNext->setZOrder(pNext->getZOrder() - 1); + } + } + + // Now that the ZOrders are adjusted, sort the children. + std::sort(rChildren.begin(), rChildren.end(), + [](const ShapePtr& a, const ShapePtr& b) { return a->getZOrder() < b->getZOrder(); }); + + // Apply also for children. + for (auto& rChild : rChildren) + sortChildrenByZOrder(rChild); +} + void Diagram::build( ) { // build name-object maps @@ -318,6 +358,8 @@ void Diagram::addTo( const ShapePtr & pParentShape ) // layout shapes - now all shapes are created ShapeLayoutingVisitor aLayoutingVisitor; mpLayout->getNode()->accept(aLayoutingVisitor); + + sortChildrenByZOrder(pParentShape); } ShapePtr pBackground(new Shape("com.sun.star.drawing.CustomShape")); diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.cxx b/oox/source/drawingml/diagram/layoutatomvisitors.cxx index b93c06c6a636..d7d89d2968d0 100644 --- a/oox/source/drawingml/diagram/layoutatomvisitors.cxx +++ b/oox/source/drawingml/diagram/layoutatomvisitors.cxx @@ -187,38 +187,6 @@ void ShapeCreationVisitor::visit(LayoutNode& rAtom) std::remove_if(pCurrParent->getChildren().begin(), pCurrParent->getChildren().end(), [] (const ShapePtr & aChild) { return aChild->getServiceName() == "com.sun.star.drawing.GroupShape" && aChild->getChildren().empty(); }), pCurrParent->getChildren().end()); - - // Offset the children from their default z-order stacking, if necessary. - std::vector<ShapePtr>& rChildren = pCurrParent->getChildren(); - for (size_t i = 0; i < rChildren.size(); ++i) - rChildren[i]->setZOrder(i); - - for (size_t i = 0; i < rChildren.size(); ++i) - { - const ShapePtr& pChild = rChildren[i]; - sal_Int32 nZOrderOff = pChild->getZOrderOff(); - if (nZOrderOff <= 0) - continue; - - // Increase my ZOrder by nZOrderOff. - pChild->setZOrder(pChild->getZOrder() + nZOrderOff); - pChild->setZOrderOff(0); - - for (sal_Int32 j = 0; j < nZOrderOff; ++j) - { - size_t nIndex = i + j + 1; - if (nIndex >= rChildren.size()) - break; - - // Decrease the ZOrder of the next nZOrderOff elements by one. - const ShapePtr& pNext = rChildren[nIndex]; - pNext->setZOrder(pNext->getZOrder() - 1); - } - } - - // Now that the ZOrders are adjusted, sort the children. - std::sort(rChildren.begin(), rChildren.end(), - [](const ShapePtr& a, const ShapePtr& b) { return a->getZOrder() < b->getZOrder(); }); } void ShapeCreationVisitor::visit(ShapeAtom& /*rAtom*/) |