Kaydet (Commit) f8e5a25f authored tarafından Peter Foley's avatar Peter Foley Kaydeden (comit) David Tardon

fix sw build with VC2012

Change-Id: I1ba38baa26de2082a21d681efff2f5881092fad7
üst 9f5fca7e
...@@ -148,7 +148,7 @@ bool SwCrsrShell::GoNextBookmark() ...@@ -148,7 +148,7 @@ bool SwCrsrShell::GoNextBookmark()
pMarkAccess->getBookmarksBegin(), pMarkAccess->getBookmarksBegin(),
pMarkAccess->getBookmarksEnd(), pMarkAccess->getBookmarksEnd(),
*GetCrsr()->GetPoint(), *GetCrsr()->GetPoint(),
bind(&::sw::mark::IMark::StartsAfter, _2, _1)), // finds the first that is starting after boost::bind(&::sw::mark::IMark::StartsAfter, _2, _1)), // finds the first that is starting after
pMarkAccess->getBookmarksEnd(), pMarkAccess->getBookmarksEnd(),
back_inserter(vCandidates), back_inserter(vCandidates),
&lcl_IsInvisibleBookmark); &lcl_IsInvisibleBookmark);
...@@ -184,7 +184,7 @@ bool SwCrsrShell::GoPrevBookmark() ...@@ -184,7 +184,7 @@ bool SwCrsrShell::GoPrevBookmark()
pMarkAccess->getBookmarksBegin(), pMarkAccess->getBookmarksBegin(),
pMarkAccess->getBookmarksEnd(), pMarkAccess->getBookmarksEnd(),
*GetCrsr()->GetPoint(), *GetCrsr()->GetPoint(),
bind(&::sw::mark::IMark::StartsAfter, _2, _1)), boost::bind(&::sw::mark::IMark::StartsAfter, _2, _1)),
back_inserter(vCandidates), back_inserter(vCandidates),
&lcl_IsInvisibleBookmark); &lcl_IsInvisibleBookmark);
sort( sort(
......
...@@ -136,7 +136,7 @@ namespace ...@@ -136,7 +136,7 @@ namespace
rMarks.begin(), rMarks.begin(),
rMarks.end(), rMarks.end(),
rPos, rPos,
bind(&IMark::StartsAfter, _2, _1)); // finds the first that is starting after boost::bind(&IMark::StartsAfter, _2, _1)); // finds the first that is starting after
if(pMarkAfter == rMarks.end()) return NULL; if(pMarkAfter == rMarks.end()) return NULL;
return pMarkAfter->get(); return pMarkAfter->get();
}; };
...@@ -150,14 +150,14 @@ namespace ...@@ -150,14 +150,14 @@ namespace
rMarks.begin(), rMarks.begin(),
rMarks.end(), rMarks.end(),
rPos, rPos,
bind(&IMark::StartsAfter, _2, _1)); boost::bind(&IMark::StartsAfter, _2, _1));
vCandidates.reserve(pCandidatesEnd - rMarks.begin()); vCandidates.reserve(pCandidatesEnd - rMarks.begin());
// only marks ending before are candidates // only marks ending before are candidates
remove_copy_if( remove_copy_if(
rMarks.begin(), rMarks.begin(),
pCandidatesEnd, pCandidatesEnd,
back_inserter(vCandidates), back_inserter(vCandidates),
bind(logical_not<bool>(), bind(&IMark::EndsBefore, _1, rPos))); boost::bind(logical_not<bool>(), boost::bind(&IMark::EndsBefore, _1, rPos)));
// no candidate left => we are in front of the first mark or there are none // no candidate left => we are in front of the first mark or there are none
if(!vCandidates.size()) return NULL; if(!vCandidates.size()) return NULL;
// return the highest (last) candidate using mark end ordering // return the highest (last) candidate using mark end ordering
...@@ -214,7 +214,7 @@ namespace ...@@ -214,7 +214,7 @@ namespace
for(IDocumentMarkAccess::iterator_t ppCurrentMark = lower_bound( for(IDocumentMarkAccess::iterator_t ppCurrentMark = lower_bound(
rMarks.begin(), rMarks.end(), rMarks.begin(), rMarks.end(),
rPos, rPos,
bind(&IMark::StartsBefore, _1, _2)); boost::bind(&IMark::StartsBefore, _1, _2));
ppCurrentMark != rMarks.end(); ppCurrentMark != rMarks.end();
++ppCurrentMark) ++ppCurrentMark)
{ {
...@@ -242,7 +242,7 @@ namespace ...@@ -242,7 +242,7 @@ namespace
return find_if( return find_if(
ppMarksBegin, ppMarksBegin,
ppMarksEnd, ppMarksEnd,
bind(&::rtl::OUString::equals, bind(&IMark::GetName, _1), rName)); boost::bind(&::rtl::OUString::equals, boost::bind(&IMark::GetName, _1), rName));
} }
#if 0 #if 0
...@@ -742,7 +742,7 @@ namespace sw { namespace mark ...@@ -742,7 +742,7 @@ namespace sw { namespace mark
iterator_t pMarkLow = lower_bound( iterator_t pMarkLow = lower_bound(
m_vMarks.begin(), m_vMarks.end(), m_vMarks.begin(), m_vMarks.end(),
pMark->GetMarkStart(), pMark->GetMarkStart(),
bind(&IMark::StartsBefore, _1, _2)); boost::bind(&IMark::StartsBefore, _1, _2));
// finds the first Mark that pMark is starting before // finds the first Mark that pMark is starting before
// (pMark < pMarkHigh) // (pMark < pMarkHigh)
//iterator_t pMarkHigh = upper_bound( //iterator_t pMarkHigh = upper_bound(
...@@ -754,7 +754,7 @@ namespace sw { namespace mark ...@@ -754,7 +754,7 @@ namespace sw { namespace mark
iterator_t pMarkHigh = m_vMarks.end(); iterator_t pMarkHigh = m_vMarks.end();
iterator_t pMarkFound = find_if( iterator_t pMarkFound = find_if(
pMarkLow, pMarkHigh, pMarkLow, pMarkHigh,
bind(equal_to<const IMark*>(), bind(&boost::shared_ptr<IMark>::get, _1), pMark)); boost::bind(equal_to<const IMark*>(), boost::bind(&boost::shared_ptr<IMark>::get, _1), pMark));
if(pMarkFound != pMarkHigh) if(pMarkFound != pMarkHigh)
deleteMark(pMarkFound); deleteMark(pMarkFound);
} }
...@@ -808,7 +808,7 @@ namespace sw { namespace mark ...@@ -808,7 +808,7 @@ namespace sw { namespace mark
const_iterator_t pFieldmark = find_if( const_iterator_t pFieldmark = find_if(
m_vFieldmarks.begin(), m_vFieldmarks.begin(),
m_vFieldmarks.end( ), m_vFieldmarks.end( ),
bind(&IMark::IsCoveringPosition, _1, rPos)); boost::bind(&IMark::IsCoveringPosition, _1, rPos));
if(pFieldmark == m_vFieldmarks.end()) return NULL; if(pFieldmark == m_vFieldmarks.end()) return NULL;
return dynamic_cast<IFieldmark*>(pFieldmark->get()); return dynamic_cast<IFieldmark*>(pFieldmark->get());
} }
......
...@@ -145,7 +145,7 @@ namespace ...@@ -145,7 +145,7 @@ namespace
pMarkAccess->getBookmarksBegin(), pMarkAccess->getBookmarksBegin(),
pMarkAccess->getBookmarksEnd(), pMarkAccess->getBookmarksEnd(),
aEndOfPara, aEndOfPara,
bind(&::sw::mark::IMark::StartsAfter, _2, _1)); // finds the first that starts after boost::bind(&::sw::mark::IMark::StartsAfter, _2, _1)); // finds the first that starts after
// search for all bookmarks that start or end in this paragraph // search for all bookmarks that start or end in this paragraph
const SwNodeIndex nOwnNode = rUnoCrsr.GetPoint()->nNode; const SwNodeIndex nOwnNode = rUnoCrsr.GetPoint()->nNode;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment