diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-07-08 12:53:45 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-07-08 12:59:07 +0200 |
commit | 1dca84e374898185851b5a90595a8b5b741431ad (patch) | |
tree | bd503c9dc7b7fe601c3114a5db7c1c9074011b0b /sw | |
parent | 84806f306114a038b4d5cc4eb6f34b90fbe71f9d (diff) |
sw: remove boost::bind from docbm.cxx
Change-Id: I3e91817c5113a391668ef0f35d6b8df4702f9715
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/doc/docbm.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index 930312cf35be..060c32ff3aae 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -19,7 +19,6 @@ #include <MarkManager.hxx> #include <bookmrk.hxx> -#include <boost/bind.hpp> #include <boost/function.hpp> #include <cntfrm.hxx> #include <crossrefbookmark.hxx> @@ -168,7 +167,7 @@ namespace rMarks.begin(), pCandidatesEnd, back_inserter(vCandidates), - boost::bind( ::std::logical_not<bool>(), boost::bind( &IMark::EndsBefore, _1, rPos ) ) ); + [&] (IDocumentMarkAccess::pMark_t const& rpMark) { return !rpMark->EndsBefore(rPos); } ); // no candidate left => we are in front of the first mark or there are none if(vCandidates.empty()) return NULL; // return the highest (last) candidate using mark end ordering @@ -269,7 +268,7 @@ namespace return find_if( ppMarksBegin, ppMarksEnd, - boost::bind(&OUString::equals, boost::bind(&IMark::GetName, _1), rName)); + [&] (IDocumentMarkAccess::pMark_t const& rpMark) { return rpMark->GetName() == rName; } ); } #if 0 @@ -960,7 +959,7 @@ namespace sw { namespace mark find_if( pMarkLow, pMarkHigh, - boost::bind( ::std::equal_to<const IMark*>(), boost::bind(&boost::shared_ptr<IMark>::get, _1), pMark ) ); + [&] (pMark_t const& rpMark) { return rpMark.get() == pMark; } ); if(pMarkFound != pMarkHigh) deleteMark(pMarkFound); } @@ -1015,8 +1014,8 @@ namespace sw { namespace mark { const_iterator_t pFieldmark = find_if( m_vFieldmarks.begin(), - m_vFieldmarks.end( ), - boost::bind(&IMark::IsCoveringPosition, _1, rPos)); + m_vFieldmarks.end(), + [&] (pMark_t const& rpMark) { return rpMark->IsCoveringPosition(rPos); } ); if(pFieldmark == m_vFieldmarks.end()) return NULL; return dynamic_cast<IFieldmark*>(pFieldmark->get()); } @@ -1081,8 +1080,8 @@ namespace sw { namespace mark { const_iterator_t pAnnotationMark = find_if( m_vAnnotationMarks.begin(), - m_vAnnotationMarks.end( ), - boost::bind(&IMark::IsCoveringPosition, _1, rPos)); + m_vAnnotationMarks.end(), + [&] (pMark_t const& rpMark) { return rpMark->IsCoveringPosition(rPos); } ); if (pAnnotationMark == m_vAnnotationMarks.end()) return NULL; return pAnnotationMark->get(); |