Kaydet (Commit) 1151fec7 authored tarafından Julien Nabet's avatar Julien Nabet Kaydeden (comit) Noel Grandin

Let's use the iterator return by erase method (final)

Change-Id: I1934b0c2a9ae9fa089d7e9ded4a289908fb2709a
Reviewed-on: https://gerrit.libreoffice.org/23173Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 0c3ff8ca
......@@ -1776,7 +1776,7 @@ void cppuhelper::ServiceManager::removeRdbFiles(
removeFromImplementationMap(
&data_.singletons, j->second->info->singletons,
j->second);
data_.namedImplementations.erase(j++);
j = data_.namedImplementations.erase(j);
} else {
++j;
}
......
......@@ -736,7 +736,7 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene
)
)
{
m_arrStatusListener.erase( iterSearch++ );
iterSearch = m_arrStatusListener.erase(iterSearch);
if (!bRemoveForAll)
// remove the listener only for the given URL, so we can exit the loop after deletion
break;
......
......@@ -2269,7 +2269,7 @@ bool ScConditionalFormatList::CheckAllEntries()
if ((*itr)->GetRange().empty())
{
bValid = false;
m_ConditionalFormats.erase(itr++);
itr = m_ConditionalFormats.erase(itr);
}
else
++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