From aa8fb790e8d3f975c7ffadcb5a4fa390186c6d5d Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 30 Mar 2023 10:19:35 +0200
Subject: loplugin:stringadd in starmath..svl
when applying my upcoming patch to also consider O[U]StringBuffer
Change-Id: Id8f229c3a5223dee8d2710caf15d4612594fc763
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149748
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
svl/qa/unit/test_URIHelper.cxx | 41 ++++++++------------
svl/source/misc/gridprinter.cxx | 3 +-
svl/source/misc/urihelper.cxx | 3 +-
svl/source/numbers/zforlist.cxx | 45 +++++++---------------
svl/source/numbers/zformat.cxx | 16 +++-----
svl/source/passwordcontainer/passwordcontainer.cxx | 7 ++--
6 files changed, 41 insertions(+), 74 deletions(-)
(limited to 'svl')
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx
index 1f81867e658a..eb5135cbe3c6 100644
--- a/svl/qa/unit/test_URIHelper.cxx
+++ b/svl/qa/unit/test_URIHelper.cxx
@@ -254,12 +254,11 @@ void Test::testNormalizedMakeRelative() {
: ref.is() && ref->getUriReference().equalsAscii(tests[i].relative);
OString msg;
if (!ok) {
- OStringBuffer buf;
- buf.append('<');
- buf.append(tests[i].base);
- buf.append(">, <");
- buf.append(tests[i].absolute);
- buf.append(">: ");
+ OStringBuffer buf(OString::Concat("<")
+ + tests[i].base
+ + ">, <"
+ + tests[i].absolute
+ + ">: ");
if (ref.is()) {
buf.append('<');
buf.append(
@@ -273,9 +272,7 @@ void Test::testNormalizedMakeRelative() {
if (tests[i].relative == nullptr) {
buf.append("none");
} else {
- buf.append('<');
- buf.append(tests[i].relative);
- buf.append('>');
+ buf.append(OString::Concat("<") + tests[i].relative + ">");
}
msg = buf.makeStringAndClear();
}
@@ -383,22 +380,18 @@ void Test::testFindFirstURLInText() {
OString msg;
if (!ok) {
OStringBuffer buf;
- buf.append('"');
- buf.append(tests[i].input);
- buf.append("\" -> ");
+ buf.append(OString::Concat("\"")
+ + tests[i].input
+ + "\" -> ");
buf.append(tests[i].result == nullptr ? "none" : tests[i].result);
- buf.append(" (");
- buf.append(tests[i].begin);
- buf.append(", ");
- buf.append(tests[i].end);
- buf.append(')');
- buf.append(" != ");
- buf.append(OUStringToOString(result, RTL_TEXTENCODING_UTF8));
- buf.append(" (");
- buf.append(begin);
- buf.append(", ");
- buf.append(end);
- buf.append(')');
+ buf.append(" ("
+ + OString::number(tests[i].begin)
+ + ", "
+ + OString::number(tests[i].end)
+ + ")"
+ " != "
+ + OUStringToOString(result, RTL_TEXTENCODING_UTF8)
+ + " (" + OString::number(begin) + ", " + OString::number(end) +")");
msg = buf.makeStringAndClear();
}
CPPUNIT_ASSERT_MESSAGE(msg.getStr(), ok);
diff --git a/svl/source/misc/gridprinter.cxx b/svl/source/misc/gridprinter.cxx
index 250d5bf84445..0aea7b433b3c 100644
--- a/svl/source/misc/gridprinter.cxx
+++ b/svl/source/misc/gridprinter.cxx
@@ -91,8 +91,7 @@ void GridPrinter::print( const char* pHeader ) const
}
// Make the row separator string.
- OUStringBuffer aBuf;
- aBuf.append("+");
+ OUStringBuffer aBuf("+");
for (size_t col = 0; col < ns.column; ++col)
{
aBuf.append("-");
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 1cb5c9f7caee..6f121fba56d9 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -197,8 +197,7 @@ OUString normalize(
OUStringBuffer head(ref->getScheme());
head.append(':');
if (ref->hasAuthority()) {
- head.append("//");
- head.append(ref->getAuthority());
+ head.append("//" + ref->getAuthority());
}
for (sal_Int32 i = count - 1; i > 0; --i) {
OUStringBuffer buf(head);
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 3baa04812142..3b6c2bd7f1b5 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1105,10 +1105,7 @@ sal_uInt32 SvNumberFormatter::ImpGenerateCL( LanguageType eLnge )
{
if ( i != j && xSeq[i].formatIndex == nIdx )
{
- aDupes.append( i );
- aDupes.append("(");
- aDupes.append(xSeq[i].formatKey);
- aDupes.append( ") ");
+ aDupes.append( OUString::number(i) + "(" + xSeq[i].formatKey + ") ");
}
}
if ( !aDupes.isEmpty() )
@@ -2469,8 +2466,8 @@ void SvNumberFormatter::ImpAdjustFormatCodeDefault(
if (!aMsg.isEmpty())
{
aMsg.insert(0, "SvNumberFormatter::ImpAdjustFormatCodeDefault: ");
- aMsg.append("\nXML locale data FormatElement formatindex: ");
- aMsg.append(static_cast<sal_Int32>(pFormatArr[nElem].Index));
+ aMsg.append("\nXML locale data FormatElement formatindex: "
+ + OUString::number(static_cast<sal_Int32>(pFormatArr[nElem].Index)));
LocaleDataWrapper::outputCheckMessage(xLocaleData->appendLocaleInfo(aMsg));
aMsg.setLength(0);
}
@@ -3201,8 +3198,7 @@ OUString SvNumberFormatter::GenerateFormat(sal_uInt32 nIndex,
}
else
{
- sString.append('#');
- sString.append(rThSep);
+ sString.append("#" + rThSep);
padToLength(sString, sString.getLength() + nDigitsInFirstGroup, '#');
}
}
@@ -3314,9 +3310,7 @@ OUString SvNumberFormatter::GenerateFormat(sal_uInt32 nIndex,
sString.append( ';' );
if (IsRed)
{
- sString.append('[');
- sString.append(pFormatScanner->GetRedString());
- sString.append(']');
+ sString.append("[" +pFormatScanner->GetRedString() + "]");
}
sString.append( sNegNatNumModifier );
if ( isNegNatNum12 )
@@ -3332,12 +3326,10 @@ OUString SvNumberFormatter::GenerateFormat(sal_uInt32 nIndex,
sString.append( aIntegerFractionDelimiterString );
else
{
- sString.append( '"' );
- sString.append( aIntegerFractionDelimiterString );
- sString.append( '"' );
+ sString.append( "\"" + aIntegerFractionDelimiterString + "\"" );
}
- sString.append( pFormat->GetNumeratorString( 0 ) );
- sString.append( '/' );
+ sString.append( pFormat->GetNumeratorString( 0 )
+ + "/" );
if ( nPrecision > 0 )
padToLength(sString, sString.getLength() + nPrecision, '?');
else
@@ -3356,29 +3348,23 @@ OUString SvNumberFormatter::GenerateFormat(sal_uInt32 nIndex,
if (pFormat && pFormat->HasPositiveBracketPlaceholder())
{
- sTmpStr.append('_');
- sTmpStr.append(')');
+ sTmpStr.append("_)");
}
sTmpStr.append(';');
if (IsRed)
{
- sTmpStr.append('[');
- sTmpStr.append(pFormatScanner->GetRedString());
- sTmpStr.append(']');
+ sTmpStr.append("[" + pFormatScanner->GetRedString() + "]");
}
sTmpStr.append( sNegNatNumModifier );
if (insertBrackets)
{
- sTmpStr.append('(');
- sTmpStr.append(sString);
- sTmpStr.append(')');
+ sTmpStr.append("(" + sString + ")");
}
else
{
- sTmpStr.append('-');
- sTmpStr.append(sString);
+ sTmpStr.append("-" + sString);
}
sString = sTmpStr;
}
@@ -3972,9 +3958,7 @@ bool SvNumberFormatter::GetNewCurrencySymbolString( sal_uInt32 nFormat, OUString
if ( aSymbol.indexOf( '-' ) != -1 ||
aSymbol.indexOf( ']' ) != -1 )
{
- sBuff.append('"');
- sBuff.append( aSymbol);
- sBuff.append('"');
+ sBuff.append("\"" + aSymbol + "\"");
}
else
{
@@ -4526,8 +4510,7 @@ OUString NfCurrencyEntry::BuildSymbolString(bool bBank,
OUString NfCurrencyEntry::Impl_BuildFormatStringNumChars( const LocaleDataWrapper& rLoc,
sal_uInt16 nDecimalFormat) const
{
- OUStringBuffer aBuf;
- aBuf.append("#" + rLoc.getNumThousandSep() + "##0");
+ OUStringBuffer aBuf("#" + rLoc.getNumThousandSep() + "##0");
if (nDecimalFormat && nDigits)
{
aBuf.append(rLoc.getNumDecimalSep());
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 549194736e69..676692da6fdb 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1334,8 +1334,7 @@ SvNumberformat::SvNumberformat(OUString& rString,
{
NumFor[nIndex].Enlarge(nCnt);
pSc->CopyInfo( &(NumFor[nIndex].Info()), nCnt );
- sBuff.append(";");
- sBuff.append(aAdd);
+ sBuff.append(";" + aAdd);
}
}
}
@@ -1352,8 +1351,7 @@ SvNumberformat::SvNumberformat(OUString& rString,
{
NumFor[nIndex].Enlarge(nCnt);
pSc->CopyInfo( &(NumFor[nIndex].Info()), nCnt );
- sBuff.append(";");
- sBuff.append(aAdd);
+ sBuff.append(";" + aAdd);
}
}
}
@@ -5435,9 +5433,7 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
}
else
{
- aStr.append( '"' );
- aStr.append( rStrArray[j] );
- aStr.append( '"' );
+ aStr.append( "\"" + rStrArray[j] + "\"" );
}
break;
case NF_SYMBOLTYPE_CALDEL :
@@ -5768,13 +5764,11 @@ OUString SvNumberformat::GetNatNumModifierString( sal_uInt16 nNumFor ) const
const SvNumberNatNum& rNum = NumFor[nNumFor].GetNatNum();
if ( !rNum.IsSet() )
return "";
- OUStringBuffer sNatNumModifier = "[NatNum";
const sal_Int32 nNum = rNum.GetNatNum();
- sNatNumModifier.append( nNum );
+ OUStringBuffer sNatNumModifier = "[NatNum" + OUString::number( nNum );
if ( NatNumTakesParameters( nNum ) )
{
- sNatNumModifier.append( " " );
- sNatNumModifier.append( rNum.GetParams() );
+ sNatNumModifier.append( " " + rNum.GetParams() );
}
sNatNumModifier.append( "]" );
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 365f952aa553..ee83b293491e 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -658,8 +658,7 @@ OUString PasswordContainer::createIV()
OUStringBuffer aBuffer;
for (sal_uInt8 i : iv)
{
- aBuffer.append(OUString::number(i >> 4, 16));
- aBuffer.append(OUString::number(i & 15, 16));
+ aBuffer.append(OUString::number(i >> 4, 16) + OUString::number(i & 15, 16));
}
return aBuffer.makeStringAndClear();
}
@@ -851,8 +850,8 @@ static OUString ReencodeAsOldHash(std::u16string_view rPass)
{
auto tmp = rPass.substr(ind * 2, 2);
unsigned char i = static_cast<char>(rtl_ustr_toInt64_WithLength(tmp.data(), 16, tmp.size()));
- aBuffer.append(static_cast< sal_Unicode >('a' + (i >> 4)));
- aBuffer.append(static_cast< sal_Unicode >('a' + (i & 15)));
+ aBuffer.append(OUStringChar(static_cast< sal_Unicode >('a' + (i >> 4)))
+ + OUStringChar(static_cast< sal_Unicode >('a' + (i & 15))));
}
return aBuffer.makeStringAndClear();
}
--
cgit