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

[Julien Nabet]

 comphelper/source/property/ChainablePropertySetInfo.cxx |    4 +---
 comphelper/source/property/MasterPropertySetInfo.cxx    |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 7ec010c8c2311bba4b97c023ba04feabc38ae7d1
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Mar 29 07:12:02 2013 +0100

    Use const_iterator and put them in for loop
    
    Change-Id: I1dbfe5735580d940081298c372c12db8a3c3b3a3

diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx
index aa76953..4136518 100644
--- a/comphelper/source/property/ChainablePropertySetInfo.cxx
+++ b/comphelper/source/property/ChainablePropertySetInfo.cxx
@@ -84,9 +84,7 @@ Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties()
         maProperties.realloc ( nSize );
         Property* pProperties = maProperties.getArray();
 
-        PropertyInfoHash::iterator aIter = maMap.begin();
-        const PropertyInfoHash::iterator aEnd = maMap.end();
-        for ( ; aIter != aEnd; ++aIter, ++pProperties)
+        for (PropertyInfoHash::const_iterator aIter(maMap.begin()), aEnd(maMap.end()); aIter != aEnd; ++aIter, ++pProperties)
         {
             PropertyInfo* pInfo = (*aIter).second;
 
diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx
index d0f9cd0..e59d907 100644
--- a/comphelper/source/property/MasterPropertySetInfo.cxx
+++ b/comphelper/source/property/MasterPropertySetInfo.cxx
@@ -101,9 +101,7 @@ Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties()
         maProperties.realloc ( nSize );
         Property* pProperties = maProperties.getArray();
 
-        PropertyDataHash::iterator aIter = maMap.begin();
-        const PropertyDataHash::iterator aEnd = maMap.end();
-        for ( ; aIter != aEnd; ++aIter, ++pProperties)
+        for (PropertyDataHash::const_iterator aIter(maMap.begin()), aEnd(maMap.end()) ; aIter != aEnd; ++aIter, ++pProperties)
         {
             PropertyInfo* pInfo = (*aIter).second->mpInfo;