From 1e3a5bb9e92aea074d7350ccde0dae5c123e885d Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sun, 18 Mar 2018 10:34:42 +0100 Subject: Use for-range loops in hwpfilter, i18n*, idl* and io Change-Id: I980464162b73ed9ee0a09acbca1b9050af8d1027 Reviewed-on: https://gerrit.libreoffice.org/51492 Tested-by: Jenkins Reviewed-by: Julien Nabet --- io/source/stm/omark.cxx | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'io/source') diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index a49ea4df7015..378d9fd00d2c 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -318,17 +318,19 @@ void OMarkableOutputStream::checkMarksAndFlush() // find the smallest mark sal_Int32 nNextFound = m_nCurrentPos; - for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ++ii ) { - if( (*ii).second <= nNextFound ) { - nNextFound = (*ii).second; + for (auto const& mark : m_mapMarks) + { + if( mark.second <= nNextFound ) { + nNextFound = mark.second; } } if( nNextFound ) { // some data must be released ! m_nCurrentPos -= nNextFound; - for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ++ii ) { - (*ii).second -= nNextFound; + for (auto & mark : m_mapMarks) + { + mark.second -= nNextFound; } Sequence seq(nNextFound); @@ -733,17 +735,19 @@ void OMarkableInputStream::checkMarksAndFlush() // find the smallest mark sal_Int32 nNextFound = m_nCurrentPos; - for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ++ii ) { - if( (*ii).second <= nNextFound ) { - nNextFound = (*ii).second; + for (auto const& mark : m_mapMarks) + { + if( mark.second <= nNextFound ) { + nNextFound = mark.second; } } if( nNextFound ) { // some data must be released ! m_nCurrentPos -= nNextFound; - for( ii = m_mapMarks.begin() ; ii != m_mapMarks.end() ; ++ii ) { - (*ii).second -= nNextFound; + for (auto & mark : m_mapMarks) + { + mark.second -= nNextFound; } m_pBuffer->forgetFromStart( nNextFound ); -- cgit