i18npool/source/characterclassification/cclass_unicode_parser.cxx | 10
+++--
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 3 -
i18nutil/source/utility/unicode.cxx | 3 -
idl/source/prj/database.cxx | 13
+++---
include/comphelper/traceevent.hxx | 9
+---
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 6
+--
slideshow/source/engine/rehearsetimingsactivity.cxx | 6
+--
unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 20
++++------
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 3 -
writerfilter/source/rtftok/rtfsprm.cxx | 4 --
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 3 -
11 files changed, 32 insertions(+), 48 deletions(-)
New commits:
commit db7f33af1438538bb51b376242294ecd3bfcb055
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Mar 30 16:10:11 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Mar 30 20:03:41 2023 +0000
loplugin:stringadd in various
when applying my upcoming patch to also consider O[U]StringBuffer
Change-Id: I8cf6a47ad357ddc73e2c430d966be72d5efd1485
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149767
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 313e42a0f2fe..aed29ea1ce5b 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -906,8 +906,9 @@ void cclass_Unicode::parseText( ParseResult& r, const
OUString& rText, sal_Int32
{
if ( cLast == '\\' )
{ // escaped
- aSymbol.append(rText.subView(postSymbolIndex,
nextCharIndex - postSymbolIndex - 2));
- aSymbol.append(OUString(¤t, 1));
+ aSymbol.append(
+
OUString::Concat(rText.subView(postSymbolIndex, nextCharIndex - postSymbolIndex
- 2))
+ + OUString(¤t, 1));
}
else
{
@@ -931,8 +932,9 @@ void cclass_Unicode::parseText( ParseResult& r, const
OUString& rText, sal_Int32
{
if ( cLast == '\\' )
{ // escaped
- aSymbol.append(rText.subView(postSymbolIndex,
nextCharIndex - postSymbolIndex - 2));
- aSymbol.append(OUString(¤t, 1));
+ aSymbol.append(
+ rText.subView(postSymbolIndex, nextCharIndex -
postSymbolIndex - 2)
+ + OUString(¤t, 1));
}
else if (current == nextChar &&
!(nContTypes &
KParseTokens::TWO_DOUBLE_QUOTES_BREAK_STRING) )
diff --git
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 8ab363672f9e..29be9856a02d 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -1129,8 +1129,7 @@ OUString
DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index)
aPropertiesRange[1].Name = "Value";
for (sal_Int32 j = 1; j <= 3; j++) {
aPropertiesRange[1].Value <<= j;
- result.append( makeNumberingString( aProperties, aLocale ) );
- result.append(", ");
+ result.append( makeNumberingString( aProperties, aLocale ) + ", "
);
}
result.append("...");
// Make known duplicate generated identifiers unique.
diff --git a/i18nutil/source/utility/unicode.cxx
b/i18nutil/source/utility/unicode.cxx
index 730b5105d52c..35bfb25f728f 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -1127,8 +1127,7 @@ OUString ToggleUnicodeCodepoint::ReplacementString()
//pad with zeros - minimum length of 4.
for( sal_Int32 i = 4 - aTmp.getLength(); i > 0; --i )
aTmp.insert( 0,"0" );
- output.append( "U+" );
- output.append( aTmp );
+ output.append( "U+" + aTmp );
}
}
return output.makeStringAndClear();
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 9aba715edaf4..229696b021ec 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -417,8 +417,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
// error text
if( !aError.GetText().isEmpty() )
{
- aErrorText.append("may be <");
- aErrorText.append(aError.GetText());
+ aErrorText.append("may be <" + aError.GetText());
}
SvToken * pPrevTok = nullptr;
while( &rTok != pPrevTok )
@@ -431,11 +430,11 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
}
// error position
- aErrorText.append("> at ( ");
- aErrorText.append(static_cast<sal_Int64>(aError.nLine));
- aErrorText.append(", ");
- aErrorText.append(static_cast<sal_Int64>(aError.nColumn));
- aErrorText.append(" )");
+ aErrorText.append("> at ( "
+ + OString::number(static_cast<sal_Int64>(aError.nLine))
+ + ", "
+ + OString::number(static_cast<sal_Int64>(aError.nColumn))
+ + " )");
// reset error
aError = SvIdlError();
diff --git a/include/comphelper/traceevent.hxx
b/include/comphelper/traceevent.hxx
index a0fe9cae1d16..6409c43eee4a 100644
--- a/include/comphelper/traceevent.hxx
+++ b/include/comphelper/traceevent.hxx
@@ -63,18 +63,13 @@ protected:
if (args.size() == 0)
return "";
- OUStringBuffer sResult;
- sResult.append(",\"args\":{");
+ OUStringBuffer sResult(",\"args\":{");
bool first = true;
for (auto& i : args)
{
if (!first)
sResult.append(',');
- sResult.append('"');
- sResult.append(i.first);
- sResult.append("\":\"");
- sResult.append(i.second);
- sResult.append('"');
+ sResult.append("\"" + i.first + "\":\"" + i.second + "\"");
first = false;
}
sResult.append('}');
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 8b9fd702397e..3ad5f79fbafc 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -165,9 +165,9 @@ std::unique_ptr<JavaInfo> createJavaInfo(
buf.append(info->getRuntimeLibrary());
if (!info->getLibraryPath().isEmpty())
{
- buf.append("\n");
- buf.append(info->getLibraryPath());
- buf.append("\n");
+ buf.append("\n"
+ + info->getLibraryPath()
+ + "\n");
}
OUString sVendorData = buf.makeStringAndClear();
return std::unique_ptr<JavaInfo>(
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx
b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 67c18f8d7f14..8284a998900f 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -416,13 +416,11 @@ void RehearseTimingsActivity::paint(
cppcanvas::CanvasSharedPtr const & canvas )
sal_Int32 n = nTimeSecs / 3600;
if (n < 10)
buf.append( '0' );
- buf.append( n );
- buf.append( ':' );
+ buf.append( OUString::number(n) + ":" );
n = ((nTimeSecs % 3600) / 60);
if (n < 10)
buf.append( '0' );
- buf.append( n );
- buf.append( ':' );
+ buf.append( OUString::number(n) + ":" );
n = (nTimeSecs % 60);
if (n < 10)
buf.append( '0' );
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index 0e57d1132921..b17c35c90c84 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -81,8 +81,7 @@ static short generateNamespace(std::ostream & o,
OStringBuffer buf;
if (index == -1) {
if (serviceobject) {
- buf.append("comp_");
- buf.append(implname);
+ buf.append("comp_" + implname);
nm = buf.makeStringAndClear();
o << "namespace comp_" << implname << " {\n\n";
count=1;
@@ -94,13 +93,11 @@ static short generateNamespace(std::ostream & o,
do {
OString token(implname.getToken(0, '.', nPos));
if (nPos < 0 && serviceobject) {
- buf.append("::comp_");
- buf.append(token);
+ buf.append("::comp_" + token);
o << "namespace comp_" << token << " { ";
count++;
} else {
- buf.append("::");
- buf.append(token);
+ buf.append("::" + token);
o << "namespace " << token << " { ";
count++;
}
@@ -612,14 +609,14 @@ static OString generateClassDefinition(std::ostream& o,
if (!interfaces.empty()) {
if (supportxcomponent) {
- parentname.append("::cppu::WeakComponentImplHelper");
- parentname.append(static_cast<sal_Int32>(interfaces.size()));
+ parentname.append("::cppu::WeakComponentImplHelper" +
+ OString::number(static_cast<sal_Int32>(interfaces.size())));
o << " private ::cppu::BaseMutex,\n"
" public ::cppu::WeakComponentImplHelper"
<< interfaces.size() << "<";
} else {
- parentname.append("::cppu::WeakImplHelper");
- parentname.append(static_cast<sal_Int32>(interfaces.size()));
+ parentname.append("::cppu::WeakImplHelper" +
+ OString::number(static_cast<sal_Int32>(interfaces.size())));
o << " public ::cppu::WeakImplHelper" << interfaces.size() <<
"<";
}
@@ -661,8 +658,7 @@ static OString generateClassDefinition(std::ostream& o,
"css::uno::RuntimeException);\n";
OStringBuffer buffer(256);
- buffer.append(parentname);
- buffer.append("< ");
+ buffer.append(parentname + "< ");
std::set< OUString >::const_iterator iter = interfaces.begin();
while (iter != interfaces.end())
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 45128e43565c..1ca1a0b24e52 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -5248,8 +5248,7 @@ uno::Reference<beans::XPropertySet>
DomainMapper_Impl::FindOrCreateFieldMaster(c
aFieldMasterName.append('.');
if ( bIsMergeField && !sDatabaseDataSourceName.isEmpty() )
{
- aFieldMasterName.append(sDatabaseDataSourceName);
- aFieldMasterName.append('.');
+ aFieldMasterName.append(sDatabaseDataSourceName + ".");
}
aFieldMasterName.append(rFieldMasterName);
OUString sFieldMasterName = aFieldMasterName.makeStringAndClear();
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx
b/writerfilter/source/rtftok/rtfsprm.cxx
index d25c643071a6..dfbb6093bd28 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -47,9 +47,7 @@ std::string RTFSprm::toString() const
aBuf.append(sal_Int32(m_nKeyword));
else
aBuf.append(sResult.c_str());
- aBuf.append("', '");
- aBuf.append(m_pValue->toString().c_str());
- aBuf.append("')");
+ aBuf.append("', '" + m_pValue->toString() + "')");
return aBuf.makeStringAndClear().getStr();
}
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
index 4997a482728e..e1526ea90d54 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
@@ -543,8 +543,7 @@ static OUString CompatDNCryptoAPI(std::u16string_view rDN)
{
if (rDN.size() != i+1 && rDN[i+1] == '"')
{
- buf.append('\\');
- buf.append(rDN[i+1]);
+ buf.append(OUString::Concat("\\") +
OUStringChar(rDN[i+1]));
++i;
}
else
