diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2015-11-15 08:43:35 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-15 10:13:08 +0000 |
commit | 8e234c5b7d5bae66c544e581bee5770f3f83dd81 (patch) | |
tree | 7d78f03ce2231de4f727d1135449aeb8cba74e99 /i18npool | |
parent | 3bdd176731c351638f541a37b94094124f3c9f52 (diff) |
use initialiser syntax for Sequence<OUString>
replaced using the script:
git grep -lP 'Sequence.*OUString.*\(1\)'
| xargs perl -0777 -pi
-e "s/Sequence< OUString > (\w+)\(1\);
.*\[0\] = (\S+);/Sequence< OUString > \1 { \2 };/g"
Change-Id: I23688a91562051a8eed11fc2a85599545c285c34
Reviewed-on: https://gerrit.libreoffice.org/19967
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'i18npool')
20 files changed, 21 insertions, 42 deletions
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 114afbef9807..87d3b9f697e4 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -614,8 +614,7 @@ BreakIteratorImpl::supportsService(const OUString& rServiceName) throw( RuntimeE Sequence< OUString > SAL_CALL BreakIteratorImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.i18n.BreakIterator"; + Sequence< OUString > aRet { "com.sun.star.i18n.BreakIterator" }; return aRet; } diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index d76bf14ef269..0db928b56743 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -456,8 +456,7 @@ BreakIterator_Unicode::supportsService(const OUString& rServiceName) throw( uno: uno::Sequence< OUString > SAL_CALL BreakIterator_Unicode::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { - uno::Sequence< OUString > aRet(1); - aRet[0] = OUString::createFromAscii(cBreakIterator); + uno::Sequence< OUString > aRet { OUString::createFromAscii(cBreakIterator) }; return aRet; } diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index 156e347d489e..ba8428cd6474 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -1220,8 +1220,7 @@ Calendar_gregorian::supportsService(const OUString& rServiceName) throw( Runtime Sequence< OUString > SAL_CALL Calendar_gregorian::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = OUString::createFromAscii(cCalendar); + Sequence< OUString > aRet { OUString::createFromAscii(cCalendar) }; return aRet; } diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx index 1414e783523e..3864fba13eaf 100644 --- a/i18npool/source/characterclassification/cclass_unicode.cxx +++ b/i18npool/source/characterclassification/cclass_unicode.cxx @@ -288,8 +288,7 @@ sal_Bool SAL_CALL cclass_Unicode::supportsService(const OUString& rServiceName) Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.i18n.CharacterClassification_Unicode"; + Sequence< OUString > aRet { "com.sun.star.i18n.CharacterClassification_Unicode" }; return aRet; } diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx index cebf37eaa8f7..be40da7fb53f 100644 --- a/i18npool/source/characterclassification/characterclassificationImpl.cxx +++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx @@ -208,8 +208,7 @@ CharacterClassificationImpl::supportsService(const OUString& rServiceName) Sequence< OUString > SAL_CALL CharacterClassificationImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.i18n.CharacterClassification"; + Sequence< OUString > aRet { "com.sun.star.i18n.CharacterClassification" }; return aRet; } diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx b/i18npool/source/characterclassification/unoscripttypedetector.cxx index ecdd68ba587f..48c5138c0a34 100644 --- a/i18npool/source/characterclassification/unoscripttypedetector.cxx +++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx @@ -77,8 +77,7 @@ UnoScriptTypeDetector::supportsService(const OUString& ServiceName) throw( css:: css::uno::Sequence< OUString > SAL_CALL UnoScriptTypeDetector::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - css::uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.i18n.ScriptTypeDetector"; + css::uno::Sequence< OUString > aRet { "com.sun.star.i18n.ScriptTypeDetector" }; return aRet; } diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx index e290c39abbb5..b18e0fcf8859 100644 --- a/i18npool/source/collator/chaptercollator.cxx +++ b/i18npool/source/collator/chaptercollator.cxx @@ -90,8 +90,7 @@ ChapterCollator::supportsService(const OUString& rServiceName) throw( RuntimeExc Sequence< OUString > SAL_CALL ChapterCollator::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = OUString::createFromAscii(cChapCollator); + Sequence< OUString > aRet { OUString::createFromAscii(cChapCollator) }; return aRet; } diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index ca800b194472..874e3469f1f0 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -226,8 +226,7 @@ sal_Bool SAL_CALL CollatorImpl::supportsService(const OUString& rServiceName) Sequence< OUString > SAL_CALL CollatorImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.i18n.Collator"; + Sequence< OUString > aRet { "com.sun.star.i18n.Collator" }; return aRet; } diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index 468321c83586..3a839496ae01 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -404,8 +404,7 @@ Collator_Unicode::supportsService(const OUString& rServiceName) throw( RuntimeEx Sequence< OUString > SAL_CALL Collator_Unicode::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = OUString::createFromAscii(implementationName); + Sequence< OUString > aRet { OUString::createFromAscii(implementationName) }; return aRet; } diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index cb6a974ae3eb..04dee8eaa501 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -1060,8 +1060,7 @@ sal_Bool DefaultNumberingProvider::supportsService(const OUString& rServiceName) Sequence< OUString > DefaultNumberingProvider::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.text.DefaultNumberingProvider"; + Sequence< OUString > aRet { "com.sun.star.text.DefaultNumberingProvider" }; return aRet; } diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx index 3f6855ceb4ae..f2d1ec4cae94 100644 --- a/i18npool/source/indexentry/indexentrysupplier.cxx +++ b/i18npool/source/indexentry/indexentrysupplier.cxx @@ -190,8 +190,7 @@ IndexEntrySupplier::supportsService(const OUString& rServiceName) throw( Runtime Sequence< OUString > SAL_CALL IndexEntrySupplier::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = implementationName; + Sequence< OUString > aRet { implementationName }; return aRet; } diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx index 56599dcb8f9b..148e256d042c 100644 --- a/i18npool/source/inputchecker/inputsequencechecker.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker.cxx @@ -148,8 +148,7 @@ InputSequenceCheckerImpl::supportsService(const OUString& rServiceName) throw( R Sequence< OUString > SAL_CALL InputSequenceCheckerImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = OUString::createFromAscii(serviceName); + Sequence< OUString > aRet { OUString::createFromAscii(serviceName) }; return aRet; } diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 9f0931b97337..d685dd5aa3b8 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -1609,8 +1609,7 @@ sal_Bool SAL_CALL LocaleDataImpl::supportsService(const OUString& rServiceName) Sequence< OUString > SAL_CALL LocaleDataImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.i18n.LocaleData"; + Sequence< OUString > aRet { "com.sun.star.i18n.LocaleData" }; return aRet; } diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx index 544ea67fb592..76beeadabdfe 100644 --- a/i18npool/source/numberformatcode/numberformatcode.cxx +++ b/i18npool/source/numberformatcode/numberformatcode.cxx @@ -275,8 +275,7 @@ sal_Bool SAL_CALL NumberFormatCodeMapper::supportsService(const OUString& rServi css::uno::Sequence< OUString > SAL_CALL NumberFormatCodeMapper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { - css::uno::Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.i18n.NumberFormatMapper"; + css::uno::Sequence< OUString > aRet { "com.sun.star.i18n.NumberFormatMapper" }; return aRet; } diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx index 1eb5a8052835..dbdb1a1542ca 100644 --- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx +++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx @@ -148,8 +148,7 @@ sal_Bool SAL_CALL OrdinalSuffixService::supportsService( const OUString& rServic Sequence< OUString > SAL_CALL OrdinalSuffixService::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = cOrdinalSuffix; + Sequence< OUString > aRet { cOrdinalSuffix }; return aRet; } diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index b0fb546fa7d0..e4804376cc9f 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -1092,8 +1092,7 @@ sal_Bool SAL_CALL TextSearch::supportsService(const OUString& rServiceName) Sequence< OUString > SAL_CALL TextSearch::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = getServiceName_Static(); + Sequence< OUString > aRet { getServiceName_Static() }; return aRet; } @@ -1125,8 +1124,7 @@ i18nsearch_component_getFactory( const sal_Char* sImplementationName, if ( 0 == rtl_str_compare( sImplementationName, cSearchImpl) ) { - css::uno::Sequence< OUString > aServiceNames(1); - aServiceNames[0] = getServiceName_Static(); + css::uno::Sequence< OUString > aServiceNames { getServiceName_Static() }; xFactory = ::cppu::createSingleFactory( pServiceManager, getImplementationName_Static(), &TextSearch_CreateInstance, aServiceNames ); diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx index 1a771a551791..a72cdcbfac1e 100644 --- a/i18npool/source/textconversion/textconversion.cxx +++ b/i18npool/source/textconversion/textconversion.cxx @@ -85,8 +85,7 @@ TextConversionService::supportsService(const OUString& rServiceName) throw( Runt Sequence< OUString > SAL_CALL TextConversionService::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = OUString::createFromAscii(implementationName); + Sequence< OUString > aRet { OUString::createFromAscii(implementationName) }; return aRet; } diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx index 34e5e1ecb0ac..96d77604f413 100644 --- a/i18npool/source/textconversion/textconversionImpl.cxx +++ b/i18npool/source/textconversion/textconversionImpl.cxx @@ -126,8 +126,7 @@ TextConversionImpl::supportsService(const OUString& rServiceName) Sequence< OUString > SAL_CALL TextConversionImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.i18n.TextConversion"; + Sequence< OUString > aRet { "com.sun.star.i18n.TextConversion" }; return aRet; } diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index 72b16e202538..40be08e8fede 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -659,8 +659,7 @@ TransliterationImpl::supportsService(const OUString& rServiceName) throw( Runtim Sequence< OUString > SAL_CALL TransliterationImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.i18n.Transliteration"; + Sequence< OUString > aRet { "com.sun.star.i18n.Transliteration" }; return aRet; } diff --git a/i18npool/source/transliteration/transliteration_commonclass.cxx b/i18npool/source/transliteration/transliteration_commonclass.cxx index 1bdddccf838b..e3895d48fa66 100644 --- a/i18npool/source/transliteration/transliteration_commonclass.cxx +++ b/i18npool/source/transliteration/transliteration_commonclass.cxx @@ -138,8 +138,7 @@ sal_Bool SAL_CALL transliteration_commonclass::supportsService(const OUString& r Sequence< OUString > SAL_CALL transliteration_commonclass::getSupportedServiceNames() throw( RuntimeException, std::exception ) { - Sequence< OUString > aRet(1); - aRet[0] = "com.sun.star.i18n.Transliteration.l10n"; + Sequence< OUString > aRet { "com.sun.star.i18n.Transliteration.l10n" }; return aRet; } |