[Libreoffice-commits] core.git: cppuhelper/source dbaccess/source sc/source

[Julien Nabet]

 cppuhelper/source/servicemanager.cxx             |    2 +-
 dbaccess/source/ui/browser/genericcontroller.cxx |    2 +-
 sc/source/core/data/conditio.cxx                 |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1151fec7a8c3dfcbc364aa941f477004309b1e59
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Mar 12 13:15:46 2016 +0100

    Let's use the iterator return by erase method (final)
    
    Change-Id: I1934b0c2a9ae9fa089d7e9ded4a289908fb2709a
    Reviewed-on: https://gerrit.libreoffice.org/23173
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index 2c29bb6..fe761fe 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -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;
                 }
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 1230c17..1f47b9f 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -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;
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index d65355b..b67b04f 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -2269,7 +2269,7 @@ bool ScConditionalFormatList::CheckAllEntries()
         if ((*itr)->GetRange().empty())
         {
             bValid = false;
-            m_ConditionalFormats.erase(itr++);
+            itr = m_ConditionalFormats.erase(itr);
         }
         else
             ++itr;