summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-09-30 15:09:25 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-10-01 08:26:37 +0200
commit4f2465f599020b356dc37f3132049a103dd32486 (patch)
treefdf04c1660b4dc1ae4268c86575a0eae33412845 /desktop
parenteaa2b432abcf31d11256e3dc01712c93367edf32 (diff)
loplugin:stringadd in dbaccess..desktop
Change-Id: I79966c4b5947c87658980b26bea1e0c2898f3343 Reviewed-on: https://gerrit.libreoffice.org/79887 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/officeipcthread.cxx3
-rw-r--r--desktop/source/app/opencl.cxx4
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx13
-rw-r--r--desktop/source/migration/migration.cxx3
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.cxx4
5 files changed, 12 insertions, 15 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 6d4fe1a3c525..679d95f94601 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -1282,8 +1282,7 @@ static void AddConversionsToDispatchList(
if( !rParamOut.trim().isEmpty() )
{
- aParam += ";";
- aParam += aOutDir;
+ aParam += ";" + aOutDir;
}
else
{
diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 6e90d6b71282..34e4d59b5732 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -221,8 +221,8 @@ void Desktop::CheckOpenCLCompute(const Reference< XDesktop2 > &xDesktop)
FileStatus aFileStatus( osl_FileStatus_Mask_ModifyTime );
(void)aItem.getFileStatus( aFileStatus );
TimeValue aTimeVal = aFileStatus.getModifyTime();
- aSelectedCLDeviceVersionID += "--";
- aSelectedCLDeviceVersionID += OUString::number(aTimeVal.Seconds);
+ aSelectedCLDeviceVersionID += "--" +
+ OUString::number(aTimeVal.Seconds);
if (aSelectedCLDeviceVersionID != officecfg::Office::Common::Misc::SelectedOpenCLDeviceIdentifier::get())
{
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index ff65aeca1be6..2d9107d7c9b0 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -370,8 +370,8 @@ void BackendImpl::implProcessHelp(
OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl( aHelpURL );
if( !xSFA->isFolder( aExpandedHelpURL ) )
{
- OUString aErrStr = DpResId( RID_STR_HELPPROCESSING_GENERAL_ERROR );
- aErrStr += "No help folder";
+ OUString aErrStr = DpResId( RID_STR_HELPPROCESSING_GENERAL_ERROR ) +
+ "No help folder";
OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
throw deployment::DeploymentException( OUString(), oWeakThis,
makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
@@ -414,9 +414,8 @@ void BackendImpl::implProcessHelp(
aJarFile, rtl_UriCharClassPchar,
rtl_UriEncodeIgnoreEscapes,
RTL_TEXTENCODING_UTF8 );
- OUString aDestBasePath = "vnd.sun.star.zip://";
- aDestBasePath += aEncodedJarFilePath;
- aDestBasePath += "/" ;
+ OUString aDestBasePath = "vnd.sun.star.zip://" +
+ aEncodedJarFilePath + "/" ;
sal_Int32 nLenLangFolderURL = aLangURL.getLength() + 1;
@@ -515,8 +514,8 @@ void BackendImpl::implProcessHelp(
aErrStr += aDecodedFile;
if( aErrorInfo.m_nXMLParsingLine != -1 )
{
- aErrStr += ", line ";
- aErrStr += OUString::number( aErrorInfo.m_nXMLParsingLine );
+ aErrStr += ", line " +
+ OUString::number( aErrorInfo.m_nXMLParsingLine );
}
}
}
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 93bf9cd3e89b..be21788c40d1 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -688,8 +688,7 @@ void MigrationImpl::copyConfig()
// check if the shared registrymodifications.xcu file exists
bool bRegistryModificationsXcuExists = false;
- OUString regFilePath(m_aInfo.userdata);
- regFilePath += "/user/registrymodifications.xcu";
+ OUString regFilePath = m_aInfo.userdata + "/user/registrymodifications.xcu";
File regFile(regFilePath);
::osl::FileBase::RC nError = regFile.open(osl_File_OpenFlag_Read);
if ( nError == ::osl::FileBase::E_None ) {
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 9d90e0c71b40..20b8d27403ed 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -339,8 +339,8 @@ Any OO3ExtensionMigration::execute( const Sequence< beans::NamedValue >& )
if ( aStatus == ::utl::Bootstrap::PATH_EXISTS )
{
// copy all extensions
- OUString sSourceDir( m_sSourceDir );
- sSourceDir += "/user/uno_packages/cache/uno_packages";
+ OUString sSourceDir = m_sSourceDir +
+ "/user/uno_packages/cache/uno_packages";
TStringVector aExtensionToMigrate;
scanUserExtensions( sSourceDir, aExtensionToMigrate );
for (auto const& extensionToMigrate : aExtensionToMigrate)