diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2019-08-03 22:59:04 +0300 |
|---|---|---|
| committer | Arkadiy Illarionov <qarkai@gmail.com> | 2019-08-09 16:58:06 +0200 |
| commit | fca94779872b8ba0b0583d0b7068f1a46beb88c5 (patch) | |
| tree | c3dd200a046d3c6e54cba570f7661b9c1068ed1b /sc/source/filter/oox | |
| parent | d05eb786d408af883500404229b89ffa0d7cde16 (diff) | |
Simplify Sequence iterations in sc
Use range-based loops, STL and comphelper functions
Change-Id: I047fb2e6ec9591166339b9748c5013a32185f14b
Reviewed-on: https://gerrit.libreoffice.org/76912
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov <qarkai@gmail.com>
Diffstat (limited to 'sc/source/filter/oox')
| -rw-r--r-- | sc/source/filter/oox/formulabase.cxx | 12 | ||||
| -rw-r--r-- | sc/source/filter/oox/workbookhelper.cxx | 18 |
2 files changed, 12 insertions, 18 deletions
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 1a7822e7942f..f20cfb82a679 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -1238,10 +1238,8 @@ bool OpCodeProviderImpl::fillTokenMap( ApiTokenMap& orTokenMap, OpCodeEntrySeque orTokenMap.clear(); if( fillEntrySeq( orEntrySeq, rxMapper, nMapGroup ) ) { - const FormulaOpCodeMapEntry* pEntry = orEntrySeq.getConstArray(); - const FormulaOpCodeMapEntry* pEntryEnd = pEntry + orEntrySeq.getLength(); - for( ; pEntry != pEntryEnd; ++pEntry ) - orTokenMap[ pEntry->Name ] = pEntry->Token; + for( const FormulaOpCodeMapEntry& rEntry : orEntrySeq ) + orTokenMap[ rEntry.Name ] = rEntry.Token; } return orEntrySeq.hasElements(); } @@ -1252,10 +1250,8 @@ bool OpCodeProviderImpl::fillFuncTokenMaps( ApiTokenMap& orIntFuncTokenMap, ApiT orExtFuncTokenMap.clear(); if( fillEntrySeq( orEntrySeq, rxMapper, css::sheet::FormulaMapGroup::FUNCTIONS ) ) { - const FormulaOpCodeMapEntry* pEntry = orEntrySeq.getConstArray(); - const FormulaOpCodeMapEntry* pEntryEnd = pEntry + orEntrySeq.getLength(); - for( ; pEntry != pEntryEnd; ++pEntry ) - ((pEntry->Token.OpCode == OPCODE_EXTERNAL) ? orExtFuncTokenMap : orIntFuncTokenMap)[ pEntry->Name ] = pEntry->Token; + for( const FormulaOpCodeMapEntry& rEntry : orEntrySeq ) + ((rEntry.Token.OpCode == OPCODE_EXTERNAL) ? orExtFuncTokenMap : orIntFuncTokenMap)[ rEntry.Name ] = rEntry.Token; } return orEntrySeq.hasElements(); } diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index be05789251e3..00936636335d 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -733,13 +733,12 @@ void WorkbookHelper::finalizeWorkbookImport() { OUString sTabName; Reference< XNameAccess > xSheetsNC; - sal_Int32 nCount (aSeq.getLength()); - for (sal_Int32 i = 0; i < nCount; ++i) + for (const auto& rProp : aSeq) { - OUString sName(aSeq[i].Name); + OUString sName(rProp.Name); if (sName == SC_ACTIVETABLE) { - if(aSeq[i].Value >>= sTabName) + if(rProp.Value >>= sTabName) { SCTAB nTab(0); if (getScDocument().GetTable(sTabName, nTab)) @@ -748,7 +747,7 @@ void WorkbookHelper::finalizeWorkbookImport() } else if (sName == SC_TABLES) { - aSeq[i].Value >>= xSheetsNC; + rProp.Value >>= xSheetsNC; } } if (xSheetsNC.is() && xSheetsNC->hasByName(sTabName)) @@ -757,20 +756,19 @@ void WorkbookHelper::finalizeWorkbookImport() Any aAny = xSheetsNC->getByName(sTabName); if ( aAny >>= aProperties ) { - nCount = aProperties.getLength(); - for (sal_Int32 i = 0; i < nCount; ++i) + for (const auto& rProp : aProperties) { - OUString sName(aProperties[i].Name); + OUString sName(rProp.Name); if (sName == SC_POSITIONLEFT) { SCCOL nPosLeft; - aProperties[i].Value >>= nPosLeft; + rProp.Value >>= nPosLeft; getScDocument().SetPosLeft(nPosLeft); } else if (sName == SC_POSITIONTOP) { SCROW nPosTop; - aProperties[i].Value >>= nPosTop; + rProp.Value >>= nPosTop; getScDocument().SetPosTop(nPosTop); } } |