summaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2018-03-18 10:34:42 +0100
committerJulien Nabet <serval2412@yahoo.fr>2018-03-18 11:33:16 +0100
commit1e3a5bb9e92aea074d7350ccde0dae5c123e885d (patch)
tree1244921df6b85b0e7ba81e74043a72251be5070f /io
parent2980e65d9728cfee73c1c49d64e19af50f756521 (diff)
Use for-range loops in hwpfilter, i18n*, idl* and io
Change-Id: I980464162b73ed9ee0a09acbca1b9050af8d1027 Reviewed-on: https://gerrit.libreoffice.org/51492 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'io')
-rw-r--r--io/source/stm/omark.cxx24
1 files changed, 14 insertions, 10 deletions
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<sal_Int8> 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 );