3 files changed, 15 insertions, 17 deletions
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index 7fa79cf62696..33ac5864a79c 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -39,8 +39,8 @@ BreakIteratorImpl::BreakIteratorImpl()
 BreakIteratorImpl::~BreakIteratorImpl()
 {
     // Clear lookuptable
-    for (size_t l = 0; l < lookupTable.size(); l++)
-        delete lookupTable[l];
+    for (lookupTableItem* p : lookupTable)
+        delete p;
     lookupTable.clear();
 }
 
@@ -526,8 +526,7 @@ sal_Int16  BreakIteratorImpl::getScriptClass(sal_uInt32 currentChar)
 bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUString& aLocaleName) throw( RuntimeException )
 {
     // to share service between same Language but different Country code, like zh_CN and zh_TW
-    for (size_t l = 0; l < lookupTable.size(); l++) {
-        lookupTableItem *listItem = lookupTable[l];
+    for (lookupTableItem* listItem : lookupTable) {
         if (aLocaleName == listItem->aLocale.Language) {
             xBI = listItem->xBI;
             return true;
@@ -555,8 +554,7 @@ BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) throw (
     else if (m_xContext.is()) {
         aLocale = rLocale;
 
-        for (size_t i = 0; i < lookupTable.size(); i++) {
-            lookupTableItem *listItem = lookupTable[i];
+        for (lookupTableItem* listItem : lookupTable) {
             if (rLocale == listItem->aLocale)
                 return xBI = listItem->xBI;
         }
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index f061d11001e5..8707dd452b83 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -52,8 +52,8 @@ BreakIterator_Unicode::~BreakIterator_Unicode()
     delete character.aBreakIterator;
     delete sentence.aBreakIterator;
     delete line.aBreakIterator;
-    for (size_t i = 0; i < SAL_N_ELEMENTS(words); i++)
-        delete words[i].aBreakIterator;
+    for (BI_Data & word : words)
+        delete word.aBreakIterator;
 }
 
 /*
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index 536b67e3edb8..551ce859592b 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -115,18 +115,18 @@ xdictionary::xdictionary(const sal_Char *lang) :
 
 #endif
 
-    for (sal_Int32 i = 0; i < CACHE_MAX; i++)
-        cache[i].size = 0;
+    for (WordBreakCache & i : cache)
+        i.size = 0;
 
     japaneseWordBreak = false;
 }
 
 xdictionary::~xdictionary()
 {
-    for (sal_Int32 i = 0; i < CACHE_MAX; i++) {
-        if (cache[i].size > 0) {
-            delete [] cache[i].contents;
-            delete [] cache[i].wordboundary;
+    for (WordBreakCache & i : cache) {
+        if (i.size > 0) {
+            delete [] i.contents;
+            delete [] i.wordboundary;
         }
     }
 }
@@ -147,11 +147,11 @@ void xdictionary::initDictionaryData(const sal_Char *pLang)
     static std::vector< datacache > aLoadedCache;
 
     osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
-    for( size_t i = 0; i < aLoadedCache.size(); ++i )
+    for(datacache & i : aLoadedCache)
     {
-        if( !strcmp( pLang, aLoadedCache[ i ].maLang.getStr() ) )
+        if( !strcmp( pLang, i.maLang.getStr() ) )
         {
-            data = aLoadedCache[ i ].maData;
+            data = i.maData;
             return;
         }
     }