diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2019-07-13 21:29:10 +0300 |
|---|---|---|
| committer | Arkadiy Illarionov <qarkai@gmail.com> | 2019-07-15 18:57:11 +0200 |
| commit | c9cce0d931b41ede0eca14b2ed2b84453f048362 (patch) | |
| tree | 4931a620a9fe86fcf861456f475dc38184e7dc14 /svl/source/numbers/zformat.cxx | |
| parent | 579b5bcd0477c411d2ae94be9aa33e653d8a38b6 (diff) | |
Simplify Sequence iterations in svl
Use range-based loops, STL and comphelper functions
Change-Id: I1c3dbf194600bec60c0881d2d19ff07b89d8333b
Reviewed-on: https://gerrit.libreoffice.org/75563
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov <qarkai@gmail.com>
Diffstat (limited to 'svl/source/numbers/zformat.cxx')
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 4248e03256f2..c182c932d099 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -3363,20 +3363,18 @@ void SvNumberformat::SwitchToOtherCalendar( OUString& rOrgCalendar, if ( nCnt <= 1 ) return; - for ( sal_Int32 j=0; j < nCnt; j++ ) + auto pCal = std::find_if(xCals.begin(), xCals.end(), + [](const OUString& rCalName) { return rCalName != GREGORIAN; }); + if (pCal == xCals.end()) + return; + + if ( !rOrgCalendar.getLength() ) { - if ( xCals[j] != GREGORIAN ) - { - if ( !rOrgCalendar.getLength() ) - { - rOrgCalendar = rCal.getUniqueID(); - fOrgDateTime = rCal.getDateTime(); - } - rCal.loadCalendar( xCals[j], rLoc().getLanguageTag().getLocale() ); - rCal.setDateTime( fOrgDateTime ); - break; // for - } + rOrgCalendar = rCal.getUniqueID(); + fOrgDateTime = rCal.getDateTime(); } + rCal.loadCalendar( *pCal, rLoc().getLanguageTag().getLocale() ); + rCal.setDateTime( fOrgDateTime ); } void SvNumberformat::SwitchToGregorianCalendar( const OUString& rOrgCalendar, |