Kaydet (Commit) 59bdd7ae authored tarafından Markus Mohrhard's avatar Markus Mohrhard

use the typedefs in ScRangeList

Change-Id: If90c068eb4db26203612a54aa3536118650bfb43
üst f8f449c5
...@@ -434,7 +434,7 @@ bool ScRangeList::UpdateReference( ...@@ -434,7 +434,7 @@ bool ScRangeList::UpdateReference(
} }
} }
vector<ScRange*>::iterator itr = maRanges.begin(), itrEnd = maRanges.end(); iterator itr = maRanges.begin(), itrEnd = maRanges.end();
for (; itr != itrEnd; ++itr) for (; itr != itrEnd; ++itr)
{ {
ScRange* pR = *itr; ScRange* pR = *itr;
...@@ -781,14 +781,14 @@ void ScRangeList::DeleteArea( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, ...@@ -781,14 +781,14 @@ void ScRangeList::DeleteArea( SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
const ScRange* ScRangeList::Find( const ScAddress& rAdr ) const const ScRange* ScRangeList::Find( const ScAddress& rAdr ) const
{ {
vector<ScRange*>::const_iterator itr = find_if( const_iterator itr = find_if(
maRanges.begin(), maRanges.end(), FindEnclosingRange<ScAddress>(rAdr)); maRanges.begin(), maRanges.end(), FindEnclosingRange<ScAddress>(rAdr));
return itr == maRanges.end() ? NULL : *itr; return itr == maRanges.end() ? NULL : *itr;
} }
ScRange* ScRangeList::Find( const ScAddress& rAdr ) ScRange* ScRangeList::Find( const ScAddress& rAdr )
{ {
vector<ScRange*>::iterator itr = find_if( iterator itr = find_if(
maRanges.begin(), maRanges.end(), FindEnclosingRange<ScAddress>(rAdr)); maRanges.begin(), maRanges.end(), FindEnclosingRange<ScAddress>(rAdr));
return itr == maRanges.end() ? NULL : *itr; return itr == maRanges.end() ? NULL : *itr;
} }
...@@ -824,16 +824,16 @@ void ScRangeList::Append( const ScRange& rRange ) ...@@ -824,16 +824,16 @@ void ScRangeList::Append( const ScRange& rRange )
bool ScRangeList::Intersects( const ScRange& rRange ) const bool ScRangeList::Intersects( const ScRange& rRange ) const
{ {
vector<ScRange*>::const_iterator itrEnd = maRanges.end(); const_iterator itrEnd = maRanges.end();
vector<ScRange*>::const_iterator itr = const_iterator itr =
find_if(maRanges.begin(), itrEnd, FindIntersectingRange<ScRange>(rRange)); find_if(maRanges.begin(), itrEnd, FindIntersectingRange<ScRange>(rRange));
return itr != itrEnd; return itr != itrEnd;
} }
bool ScRangeList::In( const ScRange& rRange ) const bool ScRangeList::In( const ScRange& rRange ) const
{ {
vector<ScRange*>::const_iterator itrEnd = maRanges.end(); const_iterator itrEnd = maRanges.end();
vector<ScRange*>::const_iterator itr = const_iterator itr =
find_if(maRanges.begin(), itrEnd, FindEnclosingRange<ScRange>(rRange)); find_if(maRanges.begin(), itrEnd, FindEnclosingRange<ScRange>(rRange));
return itr != itrEnd; return itr != itrEnd;
} }
...@@ -851,7 +851,7 @@ ScRange* ScRangeList::Remove(size_t nPos) ...@@ -851,7 +851,7 @@ ScRange* ScRangeList::Remove(size_t nPos)
// Out-of-bound condition. Bail out. // Out-of-bound condition. Bail out.
return NULL; return NULL;
vector<ScRange*>::iterator itr = maRanges.begin(); iterator itr = maRanges.begin();
advance(itr, nPos); advance(itr, nPos);
ScRange* p = *itr; ScRange* p = *itr;
maRanges.erase(itr); maRanges.erase(itr);
...@@ -869,7 +869,7 @@ ScRange ScRangeList::Combine() const ...@@ -869,7 +869,7 @@ ScRange ScRangeList::Combine() const
if (maRanges.empty()) if (maRanges.empty())
return ScRange(); return ScRange();
vector<ScRange*>::const_iterator itr = maRanges.begin(), itrEnd = maRanges.end(); const_iterator itr = maRanges.begin(), itrEnd = maRanges.end();
ScRange aRet = **itr; ScRange aRet = **itr;
++itr; ++itr;
for (; itr != itrEnd; ++itr) for (; itr != itrEnd; ++itr)
......
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