From 7af40a445551a07c6918f835da20ca461a6bd4ee Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Tue, 8 Jun 2021 21:39:34 +0200 Subject: Simplify Sequences initializations (i*->p*) Change-Id: I6bf0eaa2233de2487d90a2f9ae7de263b4ddf1bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116865 Tested-by: Jenkins Reviewed-by: Julien Nabet --- i18npool/source/localedata/localedata.cxx | 39 ++++++++-------------- .../transliteration/transliteration_Ignore.cxx | 18 ++-------- .../transliteration/transliteration_body.cxx | 5 +-- .../transliteration/transliteration_caseignore.cxx | 12 ++----- 4 files changed, 19 insertions(+), 55 deletions(-) (limited to 'i18npool') diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 0f3b03a2689a..33da5647adc3 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -784,8 +784,7 @@ LocaleDataImpl::getAllCalendars2( const Locale& rLocale ) return calendarsSeq; } else { - Sequence< Calendar2 > seq1(0); - return seq1; + return {}; } } @@ -828,8 +827,7 @@ LocaleDataImpl::getAllCurrencies2( const Locale& rLocale ) return seq; } else { - Sequence< Currency2 > seq1(0); - return seq1; + return {}; } } @@ -910,8 +908,7 @@ LocaleDataImpl::getDateAcceptancePatterns( const Locale& rLocale ) } else { - Sequence< OUString > seq(0); - return seq; + return {}; } } @@ -954,8 +951,7 @@ LocaleDataImpl::getCollatorImplementations( const Locale& rLocale ) return seq; } else { - Sequence< Implementation > seq1(0); - return seq1; + return {}; } } @@ -974,8 +970,7 @@ LocaleDataImpl::getCollationOptions( const Locale& rLocale ) return seq; } else { - Sequence< OUString > seq1(0); - return seq1; + return {}; } } @@ -994,8 +989,7 @@ LocaleDataImpl::getSearchOptions( const Locale& rLocale ) return seq; } else { - Sequence< OUString > seq1(0); - return seq1; + return {}; } } @@ -1023,8 +1017,7 @@ LocaleDataImpl::getIndexAlgorithm( const Locale& rLocale ) return seq; } else { - Sequence< OUString > seq1(0); - return seq1; + return {}; } } @@ -1108,8 +1101,7 @@ LocaleDataImpl::getUnicodeScripts( const Locale& rLocale ) return seq; } else { - Sequence< UnicodeScript > seq1(0); - return seq1; + return {}; } } @@ -1128,8 +1120,7 @@ LocaleDataImpl::getFollowPageWords( const Locale& rLocale ) return seq; } else { - Sequence< OUString > seq1(0); - return seq1; + return {}; } } @@ -1150,8 +1141,7 @@ LocaleDataImpl::getTransliterations( const Locale& rLocale ) return seq; } else { - Sequence< OUString > seq1(0); - return seq1; + return {}; } @@ -1229,8 +1219,7 @@ LocaleDataImpl::getBreakIteratorRules( const Locale& rLocale ) return seq; } else { - Sequence< OUString > seq1(0); - return seq1; + return {}; } } @@ -1251,8 +1240,7 @@ LocaleDataImpl::getReservedWord( const Locale& rLocale ) return seq; } else { - Sequence< OUString > seq1(0); - return seq1; + return {}; } } @@ -1427,8 +1415,7 @@ LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) return aRet; } else { - Sequence< Reference > seq1(0); - return seq1; + return {}; } } diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx index 946e2979b0da..c3faeb11ed0f 100644 --- a/i18npool/source/transliteration/transliteration_Ignore.cxx +++ b/i18npool/source/transliteration/transliteration_Ignore.cxx @@ -66,10 +66,7 @@ transliteration_Ignore::transliterateRange( const OUString& str1, const OUString if (str1.isEmpty() || str2.isEmpty()) throw RuntimeException(); - Sequence< OUString > r(2); - r[0] = str1.copy(0, 1); - r[1] = str2.copy(0, 1); - return r; + return { str1.copy(0, 1), str2.copy(0, 1) }; } @@ -103,18 +100,9 @@ transliteration_Ignore::transliterateRange( const OUString& str1, const OUString OUString s22 = t2.transliterate( str2, 0, 1, offset ); if ( (s11 == s21) && (s12 == s22) ) { - Sequence< OUString > r(2); - r[0] = s11; - r[1] = s12; - return r; + return { s11, s12 }; } - - Sequence< OUString > r(4); - r[0] = s11; - r[1] = s12; - r[2] = s21; - r[3] = s22; - return r; + return { s11, s12, s21, s22 }; } OUString diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index f873c33374ce..f77fdea155e5 100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx @@ -60,10 +60,7 @@ sal_Bool SAL_CALL Transliteration_body::equals( Sequence< OUString > SAL_CALL Transliteration_body::transliterateRange( const OUString& str1, const OUString& str2 ) { - Sequence< OUString > ostr(2); - ostr[0] = str1; - ostr[1] = str2; - return ostr; + return { str1, str2 }; } static MappingType lcl_getMappingTypeForToggleCase( MappingType nMappingType, sal_Unicode cChar ) diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx index 61db2286e714..dcd7b3b94be7 100644 --- a/i18npool/source/transliteration/transliteration_caseignore.cxx +++ b/i18npool/source/transliteration/transliteration_caseignore.cxx @@ -73,17 +73,9 @@ Transliteration_caseignore::transliterateRange( const OUString& str1, const OUSt OUString u2 = l2u->transliterateString2String(str2, 0, str2.getLength()); if ((l1 == u1) && (l2 == u2)) { - Sequence< OUString > r(2); - r[0] = l1; - r[1] = l2; - return r; + return { l1, l2 }; } else { - Sequence< OUString > r(4); - r[0] = l1; - r[1] = l2; - r[2] = u1; - r[3] = u2; - return r; + return { l1, l2, u1, u2 }; } } -- cgit