diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2019-02-12 00:00:22 +0300 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-12 07:37:08 +0100 |
| commit | 3f08be2e511dc2300021486a1cc2f1e8ba530373 (patch) | |
| tree | 4498ff04e82aa36b94274af254b60f35e29805a8 /sax/source/fastparser/fastparser.cxx | |
| parent | f9c57cae202818258b416b4ca28040a44e8887c2 (diff) | |
Simplify containers iterations in reportdesign, sal, sax
Use range-based loop or replace with STL functions
Change-Id: If6b734dab12a7298fce16003d3d175305fbe798d
Reviewed-on: https://gerrit.libreoffice.org/67701
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sax/source/fastparser/fastparser.cxx')
| -rw-r--r-- | sax/source/fastparser/fastparser.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index ff2d0080794b..a8c0c8fc357c 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -839,14 +839,13 @@ void FastSaxParserImpl::parseStream(const InputSource& rStructSource) if ( rEntity.maPendingEvents.size() <= Entity::mnEventLowWater ) { aGuard.clear(); - for (auto aEventIt = xEventList->maEvents.begin(); - aEventIt != xEventList->maEvents.end(); ++aEventIt) + for (auto& rEvent : xEventList->maEvents) { - if (aEventIt->mxAttributes.is()) + if (rEvent.mxAttributes.is()) { - aEventIt->mxAttributes->clear(); + rEvent.mxAttributes->clear(); if( rEntity.mxNamespaceHandler.is() ) - aEventIt->mxDeclAttributes->clear(); + rEvent.mxDeclAttributes->clear(); } xEventList->mbIsAttributesEmpty = true; } @@ -980,23 +979,22 @@ bool FastSaxParserImpl::consume(EventList& rEventList) { Entity& rEntity = getEntity(); rEventList.mbIsAttributesEmpty = false; - for (auto aEventIt = rEventList.maEvents.begin(); - aEventIt != rEventList.maEvents.end(); ++aEventIt) + for (auto& rEvent : rEventList.maEvents) { - switch ((*aEventIt).maType) + switch (rEvent.maType) { case CallbackType::START_ELEMENT: - rEntity.startElement( &(*aEventIt) ); + rEntity.startElement( &rEvent ); break; case CallbackType::END_ELEMENT: rEntity.endElement(); break; case CallbackType::CHARACTERS: - rEntity.characters( (*aEventIt).msChars ); + rEntity.characters( rEvent.msChars ); break; case CallbackType::PROCESSING_INSTRUCTION: rEntity.processingInstruction( - (*aEventIt).msNamespace, (*aEventIt).msElementName ); // ( target, data ) + rEvent.msNamespace, rEvent.msElementName ); // ( target, data ) break; case CallbackType::DONE: return false; |