diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2021-10-01 09:09:45 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2021-10-11 14:22:22 +0200 |
commit | 4f5b3e4bd53d6d61df1f65f496f7bc8dc525c8a1 (patch) | |
tree | e0ac44b8f22f944f3303bac8e494da41d6c7b164 /unotools | |
parent | 5f84c44e3d5ff19b800b6358e61228546e318d4f (diff) |
In O[U]StringBuffer, make string_view params replacements for OUString ones
...for LIBO_INTERNAL_ONLY, instead of having them as additional overloads. That
way, loplugin:bufferadd and loplugin:stringviewparam found many further
opportunities for simplification (all addressed here). Some notes:
* There is no longer an implicit conversion from O[U]String to O[U]StringBuffer
(as that goes via user-defined conversions through string_view now), which was
most noticeable in copy initializations like
OStringBuffer buf = someStr;
that had to be changed to direct initialization,
OStringBuffer buf(someStr);
But then again, it wasn't too many places that were affected and I think we can
live with that.
* I made the O[U]StringBuffer ctors taking string_view non-explicit, mainly to
get them in line with their counterparts taking O[U]String.
* I added an OUStringBuffer::lastIndexOf string_view overload that was missing
(relative to OUStringBuffer::indexOf).
* loplugin:stringconstant needed some addition to keep the
compilerplugins/clang/test/stringconstant.cxx checks related to
OStringBuffer::append and OStringBuffer::insert working.
* loplugin:stringviewparam no longer needs the special O[U]StringBuffer-related
code that had been introduced in 1250aecd71fabde4dba990bfceb61bbe8e06b8ea
"loplugin:stringviewparam extend to new.."
Change-Id: Ib1bb8c4632d99b744e742605a9fef6eae959fd72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122904
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/qa/unit/testGetEnglishSearchName.cxx | 10 | ||||
-rw-r--r-- | unotools/source/i18n/localedatawrapper.cxx | 29 | ||||
-rw-r--r-- | unotools/source/misc/fontcvt.cxx | 4 | ||||
-rw-r--r-- | unotools/source/misc/fontdefs.cxx | 2 |
4 files changed, 20 insertions, 25 deletions
diff --git a/unotools/qa/unit/testGetEnglishSearchName.cxx b/unotools/qa/unit/testGetEnglishSearchName.cxx index 84feb67b97ae..f20f9c8d46fb 100644 --- a/unotools/qa/unit/testGetEnglishSearchName.cxx +++ b/unotools/qa/unit/testGetEnglishSearchName.cxx @@ -27,18 +27,18 @@ public: void Test::testSingleElement() { // lowercase - OUString test1 = GetEnglishSearchFontName( "SYMBOL" ); + OUString test1 = GetEnglishSearchFontName( u"SYMBOL" ); CPPUNIT_ASSERT_EQUAL( OUString("symbol"),test1); //trailing whitespaces - test1 = GetEnglishSearchFontName( "Symbol " ); + test1 = GetEnglishSearchFontName( u"Symbol " ); CPPUNIT_ASSERT_EQUAL(OUString("symbol"),test1); //no longer remove script suffixes - test1 = GetEnglishSearchFontName( "Symbol(SIP)" ); + test1 = GetEnglishSearchFontName( u"Symbol(SIP)" ); CPPUNIT_ASSERT_EQUAL(OUString("symbol(sip)"),test1); - test1 = GetEnglishSearchFontName( "CM Roman CE" ); + test1 = GetEnglishSearchFontName( u"CM Roman CE" ); CPPUNIT_ASSERT_EQUAL( OUString("cmromance"),test1); //remove special characters; leave semicolon, numbers - test1 = GetEnglishSearchFontName( "sy;mb?=ol129" ); + test1 = GetEnglishSearchFontName( u"sy;mb?=ol129" ); CPPUNIT_ASSERT_EQUAL( OUString("sy;mbol129"),test1); //transformation diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index e30c7d30f558..9d67f1913887 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -118,7 +118,7 @@ void LocaleDataWrapper::loadData() { if (areChecksEnabled()) { - outputCheckMessage( appendLocaleInfo( "LocaleDataWrapper::getCurrSymbolsImpl: no default currency" ) ); + outputCheckMessage( appendLocaleInfo( u"LocaleDataWrapper::getCurrSymbolsImpl: no default currency" ) ); } pCurr = aCurrSeq.begin(); } @@ -547,7 +547,7 @@ void LocaleDataWrapper::loadCurrencyFormats() { // bad luck if (areChecksEnabled()) { - outputCheckMessage( appendLocaleInfo( "LocaleDataWrapper::getCurrFormatsImpl: no currency formats" ) ); + outputCheckMessage( appendLocaleInfo( u"LocaleDataWrapper::getCurrFormatsImpl: no currency formats" ) ); } nCurrPositiveFormat = nCurrNegativeFormat = nCurrFormatDefault; return; @@ -591,7 +591,7 @@ void LocaleDataWrapper::loadCurrencyFormats() scanCurrFormatImpl( pFormatArr[nElem].Code, 0, nSign, nPar, nNum, nBlank, nSym ); if (areChecksEnabled() && (nNum == -1 || nSym == -1)) { - outputCheckMessage( appendLocaleInfo( "LocaleDataWrapper::getCurrFormatsImpl: CurrPositiveFormat?" ) ); + outputCheckMessage( appendLocaleInfo( u"LocaleDataWrapper::getCurrFormatsImpl: CurrPositiveFormat?" ) ); } if (nBlank == -1) { @@ -618,7 +618,7 @@ void LocaleDataWrapper::loadCurrencyFormats() scanCurrFormatImpl( rCode, nDelim+1, nSign, nPar, nNum, nBlank, nSym ); if (areChecksEnabled() && (nNum == -1 || nSym == -1 || (nPar == -1 && nSign == -1))) { - outputCheckMessage( appendLocaleInfo( "LocaleDataWrapper::getCurrFormatsImpl: CurrNegativeFormat?" ) ); + outputCheckMessage( appendLocaleInfo( u"LocaleDataWrapper::getCurrFormatsImpl: CurrNegativeFormat?" ) ); } // NOTE: one of nPar or nSign are allowed to be -1 if (nBlank == -1) @@ -738,7 +738,7 @@ LongDateOrder LocaleDataWrapper::scanDateOrderImpl( const OUString& rCode ) cons { if (areChecksEnabled()) { - outputCheckMessage( appendLocaleInfo( "LocaleDataWrapper::scanDateOrder: not all DMY present" ) ); + outputCheckMessage( appendLocaleInfo( u"LocaleDataWrapper::scanDateOrder: not all DMY present" ) ); } if (nDay == -1) nDay = rCode.getLength(); @@ -761,7 +761,7 @@ LongDateOrder LocaleDataWrapper::scanDateOrderImpl( const OUString& rCode ) cons { if (areChecksEnabled()) { - outputCheckMessage( appendLocaleInfo( "LocaleDataWrapper::scanDateOrder: no magic applicable" ) ); + outputCheckMessage( appendLocaleInfo( u"LocaleDataWrapper::scanDateOrder: no magic applicable" ) ); } return LongDateOrder::DMY; } @@ -796,7 +796,7 @@ void LocaleDataWrapper::loadDateOrders() { // bad luck if (areChecksEnabled()) { - outputCheckMessage( appendLocaleInfo( "LocaleDataWrapper::getDateOrdersImpl: no date formats" ) ); + outputCheckMessage( appendLocaleInfo( u"LocaleDataWrapper::getDateOrdersImpl: no date formats" ) ); } nDateOrder = DateOrder::DMY; nLongDateOrder = LongDateOrder::DMY; @@ -840,13 +840,13 @@ void LocaleDataWrapper::loadDateOrders() { if (areChecksEnabled()) { - outputCheckMessage( appendLocaleInfo( "LocaleDataWrapper::getDateOrdersImpl: no edit" ) ); + outputCheckMessage( appendLocaleInfo( u"LocaleDataWrapper::getDateOrdersImpl: no edit" ) ); } if ( nDef == -1 ) { if (areChecksEnabled()) { - outputCheckMessage( appendLocaleInfo( "LocaleDataWrapper::getDateOrdersImpl: no default" ) ); + outputCheckMessage( appendLocaleInfo( u"LocaleDataWrapper::getDateOrdersImpl: no default" ) ); } if ( nMedium != -1 ) nDef = nMedium; @@ -1463,16 +1463,11 @@ LanguageTag LocaleDataWrapper::getLoadedLanguageTag() const return LanguageTag( lang::Locale( aLCInfo.Language, aLCInfo.Country, aLCInfo.Variant )); } -OUString LocaleDataWrapper::appendLocaleInfo(const OUString& rDebugMsg) const +OUString LocaleDataWrapper::appendLocaleInfo(std::u16string_view rDebugMsg) const { - OUStringBuffer aDebugMsg(rDebugMsg); - aDebugMsg.append('\n'); - aDebugMsg.append(maLanguageTag.getBcp47()); - aDebugMsg.append(" requested\n"); LanguageTag aLoaded = getLoadedLanguageTag(); - aDebugMsg.append(aLoaded.getBcp47()); - aDebugMsg.append(" loaded"); - return aDebugMsg.makeStringAndClear(); + return OUString::Concat(rDebugMsg) + "\n" + maLanguageTag.getBcp47() + " requested\n" + + aLoaded.getBcp47() + " loaded"; } // static diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index b4bd2c45c852..736632f86c75 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -1344,7 +1344,7 @@ const RecodeTable aAppleSymbolRecodeTable[] = { static ConvertChar aImplStarSymbolCvt = { nullptr, "StarBats", ImplStarSymbolToStarBats }; -const ConvertChar* ConvertChar::GetRecodeData( const OUString& rOrgFontName, const OUString& rMapFontName ) +const ConvertChar* ConvertChar::GetRecodeData( std::u16string_view rOrgFontName, std::u16string_view rMapFontName ) { const ConvertChar* pCvt = nullptr; @@ -1391,7 +1391,7 @@ const ConvertChar* ConvertChar::GetRecodeData( const OUString& rOrgFontName, con return pCvt; } -FontToSubsFontConverter CreateFontToSubsFontConverter( const OUString& rOrgName, FontToSubsFontFlags nFlags ) +FontToSubsFontConverter CreateFontToSubsFontConverter( std::u16string_view rOrgName, FontToSubsFontFlags nFlags ) { const ConvertChar* pCvt = nullptr; diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx index 214c8946e553..66bd91363be7 100644 --- a/unotools/source/misc/fontdefs.cxx +++ b/unotools/source/misc/fontdefs.cxx @@ -225,7 +225,7 @@ OUString StripScriptFromName(const OUString& _aName) return aName; } -OUString GetEnglishSearchFontName(const OUString& rInName) +OUString GetEnglishSearchFontName(std::u16string_view rInName) { OUStringBuffer rName(rInName); bool bNeedTranslation = false; |