From 24556a49123f4c2f3c221488fc7015b49e459a7b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 30 Jul 2019 17:54:06 +0200 Subject: Improved loplugin:stringconstant (now that GCC 7 supports it): i18npool Change-Id: Icc5871d548fd7795936e58ff73b9d6fa7eeb6414 Reviewed-on: https://gerrit.libreoffice.org/76670 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- .../source/breakiterator/breakiteratorImpl.cxx | 2 +- i18npool/source/calendar/calendarImpl.cxx | 2 +- .../characterclassification/cclass_unicode.cxx | 2 +- .../characterclassificationImpl.cxx | 2 +- .../unoscripttypedetector.cxx | 2 +- i18npool/source/collator/chaptercollator.cxx | 2 +- i18npool/source/collator/collatorImpl.cxx | 2 +- i18npool/source/collator/collator_unicode.cxx | 2 +- .../defaultnumberingprovider.cxx | 2 +- i18npool/source/indexentry/indexentrysupplier.cxx | 2 +- i18npool/source/localedata/localedata.cxx | 2 +- .../source/nativenumber/nativenumbersupplier.cxx | 2 +- .../source/numberformatcode/numberformatcode.cxx | 24 +++++++++++----------- i18npool/source/ordinalsuffix/ordinalsuffix.cxx | 2 +- i18npool/source/search/textsearch.cxx | 2 +- .../source/textconversion/textconversionImpl.cxx | 2 +- .../source/transliteration/transliterationImpl.cxx | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) (limited to 'i18npool') diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 857aa21ee449..0eb7737c9156 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -617,7 +617,7 @@ BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) OUString SAL_CALL BreakIteratorImpl::getImplementationName() { - return OUString("com.sun.star.i18n.BreakIterator"); + return "com.sun.star.i18n.BreakIterator"; } sal_Bool SAL_CALL diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx index 228bed358b09..35e70146c3f9 100644 --- a/i18npool/source/calendar/calendarImpl.cxx +++ b/i18npool/source/calendar/calendarImpl.cxx @@ -353,7 +353,7 @@ CalendarImpl::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativ OUString SAL_CALL CalendarImpl::getImplementationName() { - return OUString("com.sun.star.i18n.CalendarImpl"); + return "com.sun.star.i18n.CalendarImpl"; } sal_Bool SAL_CALL diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx index 9656f1281abc..05769bc65eb1 100644 --- a/i18npool/source/characterclassification/cclass_unicode.cxx +++ b/i18npool/source/characterclassification/cclass_unicode.cxx @@ -276,7 +276,7 @@ ParseResult SAL_CALL cclass_Unicode::parsePredefinedToken( OUString SAL_CALL cclass_Unicode::getImplementationName() { - return OUString("com.sun.star.i18n.CharacterClassification_Unicode"); + return "com.sun.star.i18n.CharacterClassification_Unicode"; } sal_Bool SAL_CALL cclass_Unicode::supportsService(const OUString& rServiceName) diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx index 751e9d12b7e4..c7db5f0f9df4 100644 --- a/i18npool/source/characterclassification/characterclassificationImpl.cxx +++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx @@ -190,7 +190,7 @@ CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Loca OUString SAL_CALL CharacterClassificationImpl::getImplementationName() { - return OUString("com.sun.star.i18n.CharacterClassification"); + return "com.sun.star.i18n.CharacterClassification"; } sal_Bool SAL_CALL diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx b/i18npool/source/characterclassification/unoscripttypedetector.cxx index 947d79bff0d6..78324ba85756 100644 --- a/i18npool/source/characterclassification/unoscripttypedetector.cxx +++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx @@ -66,7 +66,7 @@ UnoScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 nPos OUString SAL_CALL UnoScriptTypeDetector::getImplementationName() { - return OUString("com.sun.star.i18n.ScriptTypeDetector"); + return "com.sun.star.i18n.ScriptTypeDetector"; } sal_Bool SAL_CALL diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx index 1f48d61c7824..5b57f5cad03a 100644 --- a/i18npool/source/collator/chaptercollator.cxx +++ b/i18npool/source/collator/chaptercollator.cxx @@ -77,7 +77,7 @@ const sal_Char cChapCollator[] = "com.sun.star.i18n.ChapterCollator"; OUString SAL_CALL ChapterCollator::getImplementationName() { - return OUString(cChapCollator); + return cChapCollator; } sal_Bool SAL_CALL diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index c298a34910a9..fb2edb5f7447 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -208,7 +208,7 @@ CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rS OUString SAL_CALL CollatorImpl::getImplementationName() { - return OUString("com.sun.star.i18n.Collator"); + return "com.sun.star.i18n.Collator"; } sal_Bool SAL_CALL CollatorImpl::supportsService(const OUString& rServiceName) diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index 0921aef13f8a..e2aee8282541 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -400,7 +400,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang:: OUString SAL_CALL Collator_Unicode::getImplementationName() { - return OUString(implementationName); + return implementationName; } sal_Bool SAL_CALL diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index 6f45022486a0..89cd7d59c438 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -1108,7 +1108,7 @@ OUString DefaultNumberingProvider::getNumberingIdentifier( sal_Int16 nNumberingT OUString DefaultNumberingProvider::getImplementationName() { - return OUString("com.sun.star.text.DefaultNumberingProvider"); + return "com.sun.star.text.DefaultNumberingProvider"; } sal_Bool DefaultNumberingProvider::supportsService(const OUString& rServiceName) diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx index 3660c89e6e46..44be37a66fe0 100644 --- a/i18npool/source/indexentry/indexentrysupplier.cxx +++ b/i18npool/source/indexentry/indexentrysupplier.cxx @@ -175,7 +175,7 @@ OUString SAL_CALL IndexEntrySupplier::getIndexFollowPageWord( sal_Bool bMorePage OUString SAL_CALL IndexEntrySupplier::getImplementationName() { - return OUString( implementationName ); + return implementationName; } sal_Bool SAL_CALL diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index f1c42c2db830..3d244fcfbab1 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -1575,7 +1575,7 @@ sal_Bool OutlineNumbering::hasElements( ) OUString SAL_CALL LocaleDataImpl::getImplementationName() { - return OUString("com.sun.star.i18n.LocaleDataImpl"); + return "com.sun.star.i18n.LocaleDataImpl"; } sal_Bool SAL_CALL LocaleDataImpl::supportsService(const OUString& rServiceName) diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index c106d887b53c..6e563585506f 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -1204,7 +1204,7 @@ static const sal_Char implementationName[] = "com.sun.star.i18n.NativeNumberSupp OUString SAL_CALL NativeNumberSupplierService::getImplementationName() { - return OUString(implementationName); + return implementationName; } sal_Bool SAL_CALL diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx index ac8454caf9d8..680d3ccfef1d 100644 --- a/i18npool/source/numberformatcode/numberformatcode.cxx +++ b/i18npool/source/numberformatcode/numberformatcode.cxx @@ -172,11 +172,11 @@ NumberFormatCodeMapper::mapElementTypeShortToString(sal_Int16 formatType) switch ( formatType ) { case css::i18n::KNumberFormatType::SHORT : - return OUString( "short" ); + return "short"; case css::i18n::KNumberFormatType::MEDIUM : - return OUString( "medium" ); + return "medium"; case css::i18n::KNumberFormatType::LONG : - return OUString( "long" ); + return "long"; } return OUString(); } @@ -200,21 +200,21 @@ NumberFormatCodeMapper::mapElementUsageShortToString(sal_Int16 formatUsage) switch ( formatUsage ) { case css::i18n::KNumberFormatUsage::DATE : - return OUString( "DATE" ); + return "DATE"; case css::i18n::KNumberFormatUsage::TIME : - return OUString( "TIME" ); + return "TIME"; case css::i18n::KNumberFormatUsage::DATE_TIME : - return OUString( "DATE_TIME" ); + return "DATE_TIME"; case css::i18n::KNumberFormatUsage::FIXED_NUMBER : - return OUString( "FIXED_NUMBER" ); + return "FIXED_NUMBER"; case css::i18n::KNumberFormatUsage::FRACTION_NUMBER : - return OUString( "FRACTION_NUMBER" ); + return "FRACTION_NUMBER"; case css::i18n::KNumberFormatUsage::PERCENT_NUMBER : - return OUString( "PERCENT_NUMBER" ); + return "PERCENT_NUMBER"; case css::i18n::KNumberFormatUsage::CURRENCY : - return OUString( "CURRENCY" ); + return "CURRENCY"; case css::i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER : - return OUString( "SCIENTIFIC_NUMBER" ); + return "SCIENTIFIC_NUMBER"; } return OUString(); } @@ -247,7 +247,7 @@ NumberFormatCodeMapper::mapElementUsageStringToShort(const OUString& formatUsage OUString SAL_CALL NumberFormatCodeMapper::getImplementationName() { - return OUString("com.sun.star.i18n.NumberFormatCodeMapper"); + return "com.sun.star.i18n.NumberFormatCodeMapper"; } sal_Bool SAL_CALL NumberFormatCodeMapper::supportsService(const OUString& rServiceName) diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx index 3ded2a8150d5..8dca75c556e1 100644 --- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx +++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx @@ -138,7 +138,7 @@ const sal_Char cOrdinalSuffix[] = "com.sun.star.i18n.OrdinalSuffix"; OUString SAL_CALL OrdinalSuffixService::getImplementationName() { - return OUString(cOrdinalSuffix); + return cOrdinalSuffix; } sal_Bool SAL_CALL OrdinalSuffixService::supportsService( const OUString& rServiceName) diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index 09841d207dd8..3a22a3626326 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -1526,7 +1526,7 @@ static uno::Sequence< OUString > getServiceName_Static() static OUString getImplementationName_Static() { - return OUString( cSearchImpl ); + return cSearchImpl; } OUString SAL_CALL diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx index 4897e84d4e78..6033441c489c 100644 --- a/i18npool/source/textconversion/textconversionImpl.cxx +++ b/i18npool/source/textconversion/textconversionImpl.cxx @@ -104,7 +104,7 @@ TextConversionImpl::getLocaleSpecificTextConversion(const Locale& rLocale) OUString SAL_CALL TextConversionImpl::getImplementationName() { - return OUString("com.sun.star.i18n.TextConversion"); + return "com.sun.star.i18n.TextConversion"; } sal_Bool SAL_CALL diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index 7c040713e7b2..084f991048c4 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -638,7 +638,7 @@ TransliterationImpl::loadModuleByName( const OUString& implName, OUString SAL_CALL TransliterationImpl::getImplementationName() { - return OUString("com.sun.star.i18n.Transliteration"); + return "com.sun.star.i18n.Transliteration"; } sal_Bool SAL_CALL -- cgit