[PATCH] Simplify a bit

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3123

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/3123/1

Simplify a bit

Change-Id: I77cb2b08b1d92f3c8ad406bb1ebd2d080cdbfa1a
---
M package/source/xstor/ohierarchyholder.cxx
1 file changed, 7 insertions(+), 7 deletions(-)



diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx
index 39f177e..a5fa776 100644
--- a/package/source/xstor/ohierarchyholder.cxx
+++ b/package/source/xstor/ohierarchyholder.cxx
@@ -301,14 +301,14 @@
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
-        for ( OHierarchyElementList_Impl::iterator aIter = m_aChildren.begin();
-              aIter != m_aChildren.end(); /* increment is done in body */)
+        OHierarchyElementList_Impl::iterator aIter = m_aChildren.begin();
+        const OHierarchyElementList_Impl::const_iterator aEnd = m_aChildren.end();
+        while (aIter != aEnd)
         {
-            OHierarchyElementList_Impl::iterator aTmpIter = aIter;
-            ++aIter;
-
-            if ( aTmpIter->second == aRef )
-                m_aChildren.erase( aTmpIter );
+            if (aIter->second == aRef )
+                aIter = m_aChildren.erase(aIter);
+            else
+                ++aIter;
         }
     }
 

-- 
To view, visit https://gerrit.libreoffice.org/3123
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77cb2b08b1d92f3c8ad406bb1ebd2d080cdbfa1a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet <serval2412 at yahoo.fr>