summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-10-14 14:27:57 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-10-15 14:33:57 +0200
commitf13c6ad5f020a196a0e3aa6f28bda3dc185d465b (patch)
treef9aaab122974d36c134fb1723ec3c1c8df51eeef /extensions
parent9270f74466d0eb841babaa24997f608631c70341 (diff)
new loplugin:bufferadd
look for OUStringBuffer append sequences that can be turned into creating an OUString with + operations Change-Id: Ica840dc096000307b4a105fb4d9ec7588a15ade6 Reviewed-on: https://gerrit.libreoffice.org/80809 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/logging/loggerconfig.cxx6
-rw-r--r--extensions/source/logging/plaintextformatter.cxx23
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx21
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx6
-rw-r--r--extensions/source/scanner/sanedlg.cxx10
-rw-r--r--extensions/source/update/check/updateprotocol.cxx19
6 files changed, 35 insertions, 50 deletions
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index 9d04e98715bb..f43a3c080858 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -108,11 +108,7 @@ namespace logging
::sal::static_int_cast< sal_Int16 >( aDateTime.NanoSeconds / 10000000 ) );
OUString sTime = OUString::createFromAscii( buffer );
- OUStringBuffer aBuff;
- aBuff.append( sDate );
- aBuff.append( '.' );
- aBuff.append( sTime );
- OUString sDateTime = aBuff.makeStringAndClear();
+ OUString sDateTime = sDate + "." + sTime;
oslProcessIdentifier aProcessId = 0;
oslProcessInfo info;
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index a4ac9c35000c..58884a36512c 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -61,18 +61,17 @@ namespace logging
OUString SAL_CALL PlainTextFormatter::getHead( )
{
- OUStringBuffer aHeader;
- aHeader.append( " event no" ); // column 1: the event number
- aHeader.append( " " );
- aHeader.append( "thread " ); // column 2: the thread ID
- aHeader.append( " " );
- aHeader.append( "date " ); // column 3: date
- aHeader.append( " " );
- aHeader.append( "time " ); // column 4: time
- aHeader.append( " " );
- aHeader.append( "(class/method:) message" ); // column 5: class/method/message
- aHeader.append( "\n" );
- return aHeader.makeStringAndClear();
+ return
+ " event no" // column 1: the event number
+ " "
+ "thread " // column 2: the thread ID
+ " "
+ "date " // column 3: date
+ " "
+ "time " // column 4: time
+ " "
+ "(class/method:) message" // column 5: class/method/message
+ "\n";
}
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 3a9a6d147cc5..cd25a2b3b656 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -250,13 +250,11 @@ namespace pcr
OUString sLocation = aScriptEvent.ScriptCode.copy( 0, nPrefixLen );
OUString sMacroPath = aScriptEvent.ScriptCode.copy( nPrefixLen + 1 );
- OUStringBuffer aNewStyleSpec;
- aNewStyleSpec.append( "vnd.sun.star.script:" );
- aNewStyleSpec.append ( sMacroPath );
- aNewStyleSpec.append( "?language=Basic&location=" );
- aNewStyleSpec.append ( sLocation );
-
- aScriptEvent.ScriptCode = aNewStyleSpec.makeStringAndClear();
+ aScriptEvent.ScriptCode =
+ "vnd.sun.star.script:" +
+ sMacroPath +
+ "?language=Basic&location=" +
+ sLocation;
// also, this new-style spec requires the script code to be "Script" instead of "StarBasic"
aScriptEvent.ScriptType = "Script";
@@ -1080,11 +1078,10 @@ namespace pcr
Reference< XScriptEventsSupplier > xEventsSupplier( m_xComponent, UNO_QUERY_THROW );
Reference< XNameContainer > xEvents( xEventsSupplier->getEvents(), UNO_SET_THROW );
- OUStringBuffer aCompleteName;
- aCompleteName.append( _rScriptEvent.ListenerType );
- aCompleteName.append( "::" );
- aCompleteName.append( _rScriptEvent.EventMethod );
- OUString sCompleteName( aCompleteName.makeStringAndClear() );
+ OUString sCompleteName =
+ _rScriptEvent.ListenerType +
+ "::" +
+ _rScriptEvent.EventMethod;
bool bExists = xEvents->hasByName( sCompleteName );
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index b4eada0786fb..166e6989cd0b 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -668,14 +668,10 @@ namespace pcr
xPSI = xSet->getPropertySetInfo();
if ( xPSI.is() && xPSI->hasPropertyByName( PROPERTY_LABEL ) )
{
- OUStringBuffer aValue;
- aValue.append( '<' );
OUString sLabel;
if( ! (xSet->getPropertyValue( PROPERTY_LABEL) >>= sLabel) )
SAL_WARN("extensions.propctrlr", "convertToPropertyValue: unable to get property " PROPERTY_LABEL);
- aValue.append( sLabel );
- aValue.append( '>' );
- sControlValue = aValue.makeStringAndClear();
+ sControlValue = "<" + sLabel + ">";
}
aControlValue <<= sControlValue;
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 9ddbaa519c1d..06dfbb6fdb2a 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -1367,9 +1367,8 @@ void SaneDlg::SaveState()
bool bValue;
if( mrSane.GetOptionValue( nOption, bValue ) )
{
- OStringBuffer aString("BOOL=");
- aString.append(static_cast<sal_Int32>(bValue));
- aConfig.WriteKey(aOption, aString.makeStringAndClear());
+ OString aString = "BOOL=" + OString::number(static_cast<sal_Int32>(bValue));
+ aConfig.WriteKey(aOption, aString);
}
}
break;
@@ -1378,9 +1377,8 @@ void SaneDlg::SaveState()
OString aValue;
if( mrSane.GetOptionValue( nOption, aValue ) )
{
- OStringBuffer aString("STRING=");
- aString.append(aValue);
- aConfig.WriteKey( aOption, aString.makeStringAndClear() );
+ OString aString = "STRING=" + aValue;
+ aConfig.WriteKey( aOption, aString );
}
}
break;
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index 43d55c87b31f..0b083657b5bc 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -132,16 +132,15 @@ checkForUpdates(
if ( !aUpdateInfoEnumeration.is() )
return false; // something went wrong ..
- OUStringBuffer aBuffer;
- aBuffer.append("/child::inst:description[inst:os=\'");
- aBuffer.append( rOS );
- aBuffer.append("\' and inst:arch=\'");
- aBuffer.append( rArch );
- aBuffer.append("\' and inst:gitid!=\'");
- aBuffer.append( rGitID );
- aBuffer.append("\']");
-
- OUString aXPathExpression = aBuffer.makeStringAndClear();
+ OUString aXPathExpression =
+ "/child::inst:description[inst:os=\'"+
+ rOS +
+ "\' and inst:arch=\'"+
+ rArch +
+ "\' and inst:gitid!=\'"+
+ rGitID +
+ "\']";
+
while( aUpdateInfoEnumeration->hasMoreElements() )
{