diff options
Diffstat (limited to 'oox/source/drawingml/diagram/diagramlayoutatoms.cxx')
| -rw-r--r-- | oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index 1d0b78e82aeb..51b58da1a6aa 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -20,7 +20,6 @@ #include "diagramlayoutatoms.hxx" #include <functional> -#include <boost/bind.hpp> #include <osl/diagnose.h> #include <basegfx/numeric/ftools.hxx> @@ -84,9 +83,9 @@ void LayoutAtom::dump(int level) OSL_TRACE( "level = %d - %s of type %s", level, OUSTRING_TO_CSTR( msName ), typeid(*this).name() ); - const std::vector<LayoutAtomPtr>& pChildren=getChildren(); - std::for_each( pChildren.begin(), pChildren.end(), - boost::bind( &LayoutAtom::dump, _1, level + 1 ) ); + const std::vector<LayoutAtomPtr>& rChildren=getChildren(); + std::for_each( rChildren.begin(), rChildren.end(), + [level] (LayoutAtomPtr const& pAtom) { pAtom->dump(level + 1); } ); } ForEachAtom::ForEachAtom(const Reference< XFastAttributeList >& xAttributes) @@ -582,11 +581,9 @@ public: void ShapeCreationVisitor::defaultVisit(LayoutAtom& rAtom) { - const std::vector<LayoutAtomPtr>& pChildren=rAtom.getChildren(); - std::for_each( pChildren.begin(), pChildren.end(), - boost::bind( &LayoutAtom::accept, - _1, - boost::ref(*this)) ); + const std::vector<LayoutAtomPtr>& rChildren=rAtom.getChildren(); + std::for_each( rChildren.begin(), rChildren.end(), + [this] (LayoutAtomPtr const& pAtom) { pAtom->accept(*this); } ); } void ShapeCreationVisitor::visit(ConstraintAtom& /*rAtom*/) @@ -601,7 +598,7 @@ void ShapeCreationVisitor::visit(AlgAtom& rAtom) void ShapeCreationVisitor::visit(ForEachAtom& rAtom) { - const std::vector<LayoutAtomPtr>& pChildren=rAtom.getChildren(); + const std::vector<LayoutAtomPtr>& rChildren=rAtom.getChildren(); sal_Int32 nChildren=1; if( rAtom.iterator().mnPtType == XML_node ) @@ -610,10 +607,8 @@ void ShapeCreationVisitor::visit(ForEachAtom& rAtom) // attribute that is contained in diagram's // getPointsPresNameMap() ShallowPresNameVisitor aVisitor(mrDgm); - std::for_each( pChildren.begin(), pChildren.end(), - boost::bind( &LayoutAtom::accept, - _1, - boost::ref(aVisitor)) ); + std::for_each( rChildren.begin(), rChildren.end(), + [&] (LayoutAtomPtr const& pAtom) { pAtom->accept(aVisitor); } ); nChildren = aVisitor.getCount(); } @@ -626,10 +621,8 @@ void ShapeCreationVisitor::visit(ForEachAtom& rAtom) for( mnCurrIdx=0; mnCurrIdx<nCnt && nStep>0; mnCurrIdx+=nStep ) { // TODO there is likely some conditions - std::for_each( pChildren.begin(), pChildren.end(), - boost::bind( &LayoutAtom::accept, - _1, - boost::ref(*this)) ); + std::for_each( rChildren.begin(), rChildren.end(), + [this] (LayoutAtomPtr const& pAtom) { pAtom->accept(*this); } ); } // and restore idx @@ -695,11 +688,9 @@ void ShapeCreationVisitor::visit(LayoutNode& rAtom) void ShapeLayoutingVisitor::defaultVisit(LayoutAtom& rAtom) { // visit all children, one of them needs to be the layout algorithm - const std::vector<LayoutAtomPtr>& pChildren=rAtom.getChildren(); - std::for_each( pChildren.begin(), pChildren.end(), - boost::bind( &LayoutAtom::accept, - _1, - boost::ref(*this)) ); + const std::vector<LayoutAtomPtr>& rChildren=rAtom.getChildren(); + std::for_each( rChildren.begin(), rChildren.end(), + [this] (LayoutAtomPtr const& pAtom) { pAtom->accept(*this); } ); } void ShapeLayoutingVisitor::visit(ConstraintAtom& /*rAtom*/) @@ -736,11 +727,9 @@ void ShallowPresNameVisitor::defaultVisit(LayoutAtom& rAtom) { // visit all children, at least one of them needs to have proper // name set - const std::vector<LayoutAtomPtr>& pChildren=rAtom.getChildren(); - std::for_each( pChildren.begin(), pChildren.end(), - boost::bind( &LayoutAtom::accept, - _1, - boost::ref(*this)) ); + const std::vector<LayoutAtomPtr>& rChildren=rAtom.getChildren(); + std::for_each( rChildren.begin(), rChildren.end(), + [this] (LayoutAtomPtr const& pAtom) { pAtom->accept(*this); } ); } void ShallowPresNameVisitor::visit(ConstraintAtom& /*rAtom*/) |