Kaydet (Commit) ae5d6e44 authored tarafından Caolán McNamara's avatar Caolán McNamara

get rid of aEndItr entirely

Change-Id: Ib95ca628457d7330ac1e1001ab13a00a764c9bad
Reviewed-on: https://gerrit.libreoffice.org/59598
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 7b52990a
...@@ -744,45 +744,43 @@ void ScXMLChangeTrackingImportHelper::CreateChangeTrack(ScDocument* pTempDoc) ...@@ -744,45 +744,43 @@ void ScXMLChangeTrackingImportHelper::CreateChangeTrack(ScDocument* pTempDoc)
// old files didn't store nanoseconds, disable until encountered // old files didn't store nanoseconds, disable until encountered
pTrack->SetTimeNanoSeconds( false ); pTrack->SetTimeNanoSeconds( false );
auto aItr(aActions.begin()); for (const auto & rAction : aActions)
auto aEndItr(aActions.end());
while (aItr != aEndItr)
{ {
std::unique_ptr<ScChangeAction> pAction; std::unique_ptr<ScChangeAction> pAction;
switch ((*aItr)->nActionType) switch (rAction->nActionType)
{ {
case SC_CAT_INSERT_COLS: case SC_CAT_INSERT_COLS:
case SC_CAT_INSERT_ROWS: case SC_CAT_INSERT_ROWS:
case SC_CAT_INSERT_TABS: case SC_CAT_INSERT_TABS:
{ {
pAction = CreateInsertAction(static_cast<ScMyInsAction*>(aItr->get())); pAction = CreateInsertAction(static_cast<ScMyInsAction*>(rAction.get()));
} }
break; break;
case SC_CAT_DELETE_COLS: case SC_CAT_DELETE_COLS:
case SC_CAT_DELETE_ROWS: case SC_CAT_DELETE_ROWS:
case SC_CAT_DELETE_TABS: case SC_CAT_DELETE_TABS:
{ {
ScMyDelAction* pDelAct = static_cast<ScMyDelAction*>(aItr->get()); ScMyDelAction* pDelAct = static_cast<ScMyDelAction*>(rAction.get());
pAction = CreateDeleteAction(pDelAct); pAction = CreateDeleteAction(pDelAct);
CreateGeneratedActions(pDelAct->aGeneratedList); CreateGeneratedActions(pDelAct->aGeneratedList);
} }
break; break;
case SC_CAT_MOVE: case SC_CAT_MOVE:
{ {
ScMyMoveAction* pMovAct = static_cast<ScMyMoveAction*>(aItr->get()); ScMyMoveAction* pMovAct = static_cast<ScMyMoveAction*>(rAction.get());
pAction = CreateMoveAction(pMovAct); pAction = CreateMoveAction(pMovAct);
CreateGeneratedActions(pMovAct->aGeneratedList); CreateGeneratedActions(pMovAct->aGeneratedList);
} }
break; break;
case SC_CAT_CONTENT: case SC_CAT_CONTENT:
{ {
pAction = CreateContentAction(static_cast<ScMyContentAction*>(aItr->get())); pAction = CreateContentAction(static_cast<ScMyContentAction*>(rAction.get()));
} }
break; break;
case SC_CAT_REJECT: case SC_CAT_REJECT:
{ {
pAction = CreateRejectionAction(static_cast<ScMyRejAction*>(aItr->get())); pAction = CreateRejectionAction(static_cast<ScMyRejAction*>(rAction.get()));
} }
break; break;
default: default:
...@@ -797,13 +795,11 @@ void ScXMLChangeTrackingImportHelper::CreateChangeTrack(ScDocument* pTempDoc) ...@@ -797,13 +795,11 @@ void ScXMLChangeTrackingImportHelper::CreateChangeTrack(ScDocument* pTempDoc)
{ {
OSL_FAIL("no action"); OSL_FAIL("no action");
} }
++aItr;
} }
if (pTrack->GetLast()) if (pTrack->GetLast())
pTrack->SetActionMax(pTrack->GetLast()->GetActionNumber()); pTrack->SetActionMax(pTrack->GetLast()->GetActionNumber());
aItr = aActions.begin(); auto aItr = aActions.begin();
while (aItr != aActions.end()) while (aItr != aActions.end())
{ {
SetDependencies(aItr->get()); SetDependencies(aItr->get());
......
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