diff options
| author | Gökhan Gurbetoğlu <gokhan.gurbetoglu@pardus.org.tr> | 2016-08-23 10:23:19 +0300 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-24 06:55:00 +0000 |
| commit | c899cc46fc6522b7fd7c243bf7a67dfbe2e1e586 (patch) | |
| tree | eceb96b16535d86dc810b64aaf102b08bb6825a1 /desktop | |
| parent | 8573b1baa66c65cc170d1393cacf948b4ead3e6a (diff) | |
tdf#100726 - Improve readability of OUString concatanations
Change-Id: I59c605bb31859a2a419cc9e9e60c174e842a03db
Reviewed-on: https://gerrit.libreoffice.org/28349
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/migration/migration.cxx | 11 | ||||
| -rw-r--r-- | desktop/source/migration/services/basicmigration.cxx | 7 | ||||
| -rw-r--r-- | desktop/source/migration/services/wordbookmigration.cxx | 7 |
3 files changed, 14 insertions, 11 deletions
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index fb9b08ddc565..db40b4dfec45 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -207,8 +207,8 @@ void Migration::migrateSettingsIfNecessary() try { bResult = aImpl.doMigration(); } catch (const Exception& e) { - OString aMsg("doMigration() exception: "); - aMsg += OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US); + OString aMsg = "doMigration() exception: " + + OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US); OSL_FAIL(aMsg.getStr()); } OSL_ENSURE(bResult, "Migration has not been successful"); @@ -850,9 +850,10 @@ void MigrationImpl::copyFiles() _checkAndCreateDirectory(aURL); FileBase::RC copyResult = File::copy(*i_file, destName); if (copyResult != FileBase::E_None) { - OString msg("Cannot copy "); - msg += OUStringToOString(*i_file, RTL_TEXTENCODING_UTF8) + " to " - + OUStringToOString(destName, RTL_TEXTENCODING_UTF8); + OString msg = "Cannot copy " + + OUStringToOString(*i_file, RTL_TEXTENCODING_UTF8) + + " to " + + OUStringToOString(destName, RTL_TEXTENCODING_UTF8); OSL_FAIL(msg.getStr()); } ++i_file; diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index ed454096a874..fb7c7afeb7bc 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -132,9 +132,10 @@ namespace migration ::osl::FileBase::RC aResult = ::osl::File::copy( *aI, sTargetName ); if ( aResult != ::osl::FileBase::E_None ) { - OString aMsg( "BasicMigration::copyFiles: cannot copy " ); - aMsg += OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to " - + OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 ); + OString aMsg = "BasicMigration::copyFiles: cannot copy " + + OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + + " to " + + OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 ); OSL_FAIL( aMsg.getStr() ); } ++aI; diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index 77b2ee68df42..429039babb89 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -171,9 +171,10 @@ bool IsUserWordbook( const OUString& rFile ) ::osl::FileBase::RC aResult = ::osl::File::copy( *aI, sTargetName ); if ( aResult != ::osl::FileBase::E_None ) { - OString aMsg( "WordbookMigration::copyFiles: cannot copy " ); - aMsg += OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to " - + OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 ); + OString aMsg = "WordbookMigration::copyFiles: cannot copy " + + OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + + " to " + + OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 ); OSL_FAIL( aMsg.getStr() ); } } |