[Libreoffice-commits] core.git: framework/source

Julien Nabet serval2412 at yahoo.fr
Mon Aug 26 21:32:53 PDT 2013


 framework/source/fwi/uielement/itemcontainer.cxx |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 932dbfd2d12f5526e4d60fc4f17085872e6b8648
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Aug 27 06:32:16 2013 +0200

    Bin intermediate iterator + rename parameter function
    
    Change-Id: Ic1055af502918ee754673a6e3ad704c55ef09a36

diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx
index 956b277..2f9cce5 100644
--- a/framework/source/fwi/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
@@ -200,15 +200,13 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept
                                         (OWeakObject *)this, 2 );
 }
 
-void SAL_CALL ItemContainer::removeByIndex( sal_Int32 Index )
+void SAL_CALL ItemContainer::removeByIndex( sal_Int32 nIndex )
 throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
 {
     ShareGuard aLock( m_aShareMutex );
-    if ( (sal_Int32)m_aItemVector.size() > Index )
+    if ( (sal_Int32)m_aItemVector.size() > nIndex )
     {
-        std::vector< Sequence< PropertyValue > >::iterator aIter = m_aItemVector.begin();
-        aIter += Index;
-        m_aItemVector.erase( aIter );
+        m_aItemVector.erase(m_aItemVector.begin() + nIndex);
     }
     else
         throw IndexOutOfBoundsException( OUString(), (OWeakObject *)this );


More information about the Libreoffice-commits mailing list