diff options
91 files changed, 287 insertions, 462 deletions
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index 2fa0e64c31c8..429d9ad7e272 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -436,8 +436,7 @@ void ImplObjectHierarchy::createDataSeriesTree( // data labels if( DataSeriesHelper::hasDataLabelsAtSeries( xSeries ) ) { - OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); - aChildParticle += "="; + OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) + "=" ); aSeriesSubContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle ) ); } diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index a446cd79d538..0f2749a1f6c7 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -358,16 +358,15 @@ void VDataSeries::setParticle( const OUString& rSeriesParticle ) OUString VDataSeries::getErrorBarsCID(bool bYError) const { OUString aChildParticle( ObjectIdentifier::getStringForType( - bYError ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X ) ); - aChildParticle += "="; + bYError ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X ) + + "=" ); return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aSeriesParticle, aChildParticle ); } OUString VDataSeries::getLabelsCID() const { - OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) ); - aChildParticle += "="; + OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) + "=" ); return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aSeriesParticle, aChildParticle ); diff --git a/compilerplugins/clang/stringadd.cxx b/compilerplugins/clang/stringadd.cxx index 653c281f0ac7..e9df02bd10c0 100644 --- a/compilerplugins/clang/stringadd.cxx +++ b/compilerplugins/clang/stringadd.cxx @@ -74,16 +74,21 @@ public: bool VisitCXXOperatorCallExpr(CXXOperatorCallExpr const*); private: - struct VarDeclAndConstant + enum class Summands + { + OnlyCompileTimeConstants, + OnlySideEffectFree, + SideEffect + }; + + struct VarDeclAndSummands { const VarDecl* varDecl; - bool bCompileTimeConstant; - bool bSideEffectFree; + Summands summands; }; - VarDeclAndConstant findAssignOrAdd(Stmt const*); - void checkForCompoundAssign(Stmt const* stmt1, Stmt const* stmt2, - VarDeclAndConstant const& varDecl); + VarDeclAndSummands findAssignOrAdd(Stmt const*); + bool checkForCompoundAssign(Stmt const* stmt1, Stmt const* stmt2, VarDeclAndSummands& varDecl); Expr const* ignore(Expr const*); bool isSideEffectFree(Expr const*); @@ -100,16 +105,21 @@ bool StringAdd::VisitCompoundStmt(CompoundStmt const* compoundStmt) { if (it == compoundStmt->body_end()) break; - VarDeclAndConstant foundVar = findAssignOrAdd(*it); + VarDeclAndSummands foundVar = findAssignOrAdd(*it); // reference types have slightly weird behaviour if (foundVar.varDecl && !foundVar.varDecl->getType()->isReferenceType()) { auto stmt1 = *it; ++it; - if (it == compoundStmt->body_end()) - break; - checkForCompoundAssign(stmt1, *it, foundVar); - continue; + while (it != compoundStmt->body_end()) + { + if (!checkForCompoundAssign(stmt1, *it, foundVar)) + { + break; + } + stmt1 = *it; + ++it; + } } else ++it; @@ -118,7 +128,7 @@ bool StringAdd::VisitCompoundStmt(CompoundStmt const* compoundStmt) return true; } -StringAdd::VarDeclAndConstant StringAdd::findAssignOrAdd(Stmt const* stmt) +StringAdd::VarDeclAndSummands StringAdd::findAssignOrAdd(Stmt const* stmt) { if (auto exprCleanup = dyn_cast<ExprWithCleanups>(stmt)) stmt = exprCleanup->getSubExpr(); @@ -137,8 +147,11 @@ StringAdd::VarDeclAndConstant StringAdd::findAssignOrAdd(Stmt const* stmt) return {}; if (!varDeclLHS->hasInit()) return {}; - return { varDeclLHS, isCompileTimeConstant(varDeclLHS->getInit()), - isSideEffectFree(varDeclLHS->getInit()) }; + return { varDeclLHS, (isCompileTimeConstant(varDeclLHS->getInit()) + ? Summands::OnlyCompileTimeConstants + : (isSideEffectFree(varDeclLHS->getInit()) + ? Summands::OnlySideEffectFree + : Summands::SideEffect)) }; } if (auto operatorCall = dyn_cast<CXXOperatorCallExpr>(stmt)) if (operatorCall->getOperator() == OO_Equal || operatorCall->getOperator() == OO_PlusEqual) @@ -150,13 +163,17 @@ StringAdd::VarDeclAndConstant StringAdd::findAssignOrAdd(Stmt const* stmt) && !tc.Class("OString").Namespace("rtl").GlobalNamespace()) return {}; auto rhs = operatorCall->getArg(1); - return { varDeclLHS, isCompileTimeConstant(rhs), isSideEffectFree(rhs) }; + return { varDeclLHS, + (isCompileTimeConstant(rhs) + ? Summands::OnlyCompileTimeConstants + : (isSideEffectFree(rhs) ? Summands::OnlySideEffectFree + : Summands::SideEffect)) }; } return {}; } -void StringAdd::checkForCompoundAssign(Stmt const* stmt1, Stmt const* stmt2, - VarDeclAndConstant const& varDecl) +bool StringAdd::checkForCompoundAssign(Stmt const* stmt1, Stmt const* stmt2, + VarDeclAndSummands& varDecl) { // OString additions are frequently wrapped in these if (auto exprCleanup = dyn_cast<ExprWithCleanups>(stmt2)) @@ -165,28 +182,42 @@ void StringAdd::checkForCompoundAssign(Stmt const* stmt1, Stmt const* stmt2, stmt2 = switchCase->getSubStmt(); auto operatorCall = dyn_cast<CXXOperatorCallExpr>(stmt2); if (!operatorCall) - return; + return false; if (operatorCall->getOperator() != OO_PlusEqual) - return; + return false; auto declRefExprLHS = dyn_cast<DeclRefExpr>(ignore(operatorCall->getArg(0))); if (!declRefExprLHS) - return; + return false; if (declRefExprLHS->getDecl() != varDecl.varDecl) - return; + return false; // if either side is a compile-time-constant, then we don't care about // side-effects auto rhs = operatorCall->getArg(1); - if (varDecl.bCompileTimeConstant || isCompileTimeConstant(rhs)) - ; // good - else if (!varDecl.bSideEffectFree || !isSideEffectFree(rhs)) - return; + auto const ctcRhs = isCompileTimeConstant(rhs); + if (!ctcRhs) + { + auto const sefRhs = isSideEffectFree(rhs); + auto const oldSummands = varDecl.summands; + varDecl.summands = sefRhs ? Summands::OnlySideEffectFree : Summands::SideEffect; + if (oldSummands != Summands::OnlyCompileTimeConstants + && (oldSummands == Summands::SideEffect || !sefRhs)) + { + return true; + } + } // if we cross a #ifdef boundary if (containsPreprocessingConditionalInclusion( SourceRange(stmt1->getSourceRange().getBegin(), stmt2->getSourceRange().getEnd()))) - return; + { + varDecl.summands + = ctcRhs ? Summands::OnlyCompileTimeConstants + : isSideEffectFree(rhs) ? Summands::OnlySideEffectFree : Summands::SideEffect; + return true; + } report(DiagnosticsEngine::Warning, "simplify by merging with the preceding assignment", compat::getBeginLoc(stmt2)) << stmt2->getSourceRange(); + return true; } // Check for generating temporaries when adding strings @@ -318,10 +349,9 @@ bool StringAdd::isCompileTimeConstant(Expr const* expr) { expr = compat::IgnoreImplicit(expr); if (auto cxxConstructExpr = dyn_cast<CXXConstructExpr>(expr)) - if (cxxConstructExpr->getNumArgs() > 0 - && isa<clang::StringLiteral>(cxxConstructExpr->getArg(0))) - return true; - return false; + if (cxxConstructExpr->getNumArgs() > 0) + expr = cxxConstructExpr->getArg(0); + return isa<clang::StringLiteral>(expr); } loplugin::Plugin::Registration<StringAdd> stringadd("stringadd"); diff --git a/compilerplugins/clang/test/stringadd.cxx b/compilerplugins/clang/test/stringadd.cxx index 00582f2db459..748ee35cfe61 100644 --- a/compilerplugins/clang/test/stringadd.cxx +++ b/compilerplugins/clang/test/stringadd.cxx @@ -65,16 +65,21 @@ void f3(OUString aStr, int nFirstContent) // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}} aFirstStr += "..."; } +OUString side_effect(); void f4(int i) { - OUString s("xxx"); + OUString s1; + OUString s2("xxx"); // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}} - s += "xxx"; + s2 += "xxx"; ++i; // any other kind of statement breaks the chain (at least for now) - s += "xxx"; + s2 += "xxx"; // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}} - s += "xxx"; + s2 += side_effect(); + s1 += "yyy"; + // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}} + s1 += "yyy"; } } @@ -111,23 +116,37 @@ void f(Bar b1, Bar& b2, Bar* b3) s3 += b3->m_field; } OUString side_effect(); -void f2() +void f2(OUString s) { OUString sRet = "xxx"; // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}} sRet += side_effect(); + // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}} + sRet += "xxx"; + sRet += side_effect(); + // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}} + sRet += "xxx"; + // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}} + sRet += "xxx"; + sRet += s; + // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}} + sRet += "xxx"; } } // no warning expected namespace test4 { +OUString side_effect(); void f() { OUString sRet = "xxx"; #if OSL_DEBUG_LEVEL > 0 sRet += ";"; #endif + sRet += " "; + // expected-error@+1 {{simplify by merging with the preceding assignment [loplugin:stringadd]}} + sRet += side_effect(); } } diff --git a/connectivity/source/drivers/mysql_jdbc/YViews.cxx b/connectivity/source/drivers/mysql_jdbc/YViews.cxx index 8884e93244c5..96a5c7db9e2c 100644 --- a/connectivity/source/drivers/mysql_jdbc/YViews.cxx +++ b/connectivity/source/drivers/mysql_jdbc/YViews.cxx @@ -118,9 +118,9 @@ void OViews::createView(const Reference<XPropertySet>& descriptor) OUString sCommand; aSql += ::dbtools::composeTableName(m_xMetaData, descriptor, - ::dbtools::EComposeRule::InTableDefinitions, true); + ::dbtools::EComposeRule::InTableDefinitions, true) + + " AS "; - aSql += " AS "; descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND)) >>= sCommand; aSql += sCommand; diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 940d8ebb564f..b96c1dd85fbf 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -149,8 +149,7 @@ IMPL_LINK_NOARG(SvxPostItDialog, Stamp, weld::Button&, void) tools::Time aTime( tools::Time::SYSTEM ); OUString aTmp( SvtUserOptions().GetID() ); const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); - OUString aStr( m_xEditED->get_text() ); - aStr += "\n---- "; + OUString aStr( m_xEditED->get_text() + "\n---- " ); if ( !aTmp.isEmpty() ) { diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index 87b1ca9b2447..b4000c4ba8b1 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -104,8 +104,7 @@ namespace dbaui aReturn.bEnabled = isEditable() && GetUndoManager().GetUndoActionCount() != 0; if ( aReturn.bEnabled ) { - OUString sUndo(DBA_RES(STR_UNDO_COLON)); - sUndo += " "; + OUString sUndo(DBA_RES(STR_UNDO_COLON) + " "); sUndo += GetUndoManager().GetUndoActionComment(); aReturn.sTitle = sUndo; } @@ -115,8 +114,7 @@ namespace dbaui aReturn.bEnabled = isEditable() && GetUndoManager().GetRedoActionCount() != 0; if ( aReturn.bEnabled ) { - OUString sRedo(DBA_RES(STR_REDO_COLON)); - sRedo += " "; + OUString sRedo(DBA_RES(STR_REDO_COLON) + " "); sRedo += GetUndoManager().GetRedoActionComment(); aReturn.sTitle = sRedo; } diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index abc203ce9c13..8c994510fd80 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -217,8 +217,7 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, weld::ComboBox&, void ) } if ( bAddHint ) { - sHelpText += "\n"; - sHelpText += DBA_RES( STR_JOIN_TYPE_HINT ); + sHelpText += "\n" + DBA_RES( STR_JOIN_TYPE_HINT ); } m_xML_HelpText->set_label( sHelpText ); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 4f68f9edac27..ef94b0d96da3 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1395,9 +1395,7 @@ int Desktop::Main() #ifdef DBG_UTIL //include buildid in non product builds - aTitle += " ["; - aTitle += utl::Bootstrap::getBuildIdData("development"); - aTitle += "]"; + aTitle += " [" + utl::Bootstrap::getBuildIdData("development") + "]"; #endif SetDisplayName( aTitle ); diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index eb29a69f5e09..3fe66f665ea1 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -314,8 +314,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() tempEntry = tempEntry.copy( tempEntry.lastIndexOf( '/' ) + 1 ); - destFolder = dp_misc::makeURL( sTempDir, tempEntry ); - destFolder += "_"; + destFolder = dp_misc::makeURL( sTempDir, tempEntry ) + "_"; m_sDownloadFolder = destFolder; try { @@ -565,8 +564,7 @@ bool UpdateInstallDialog::Thread::download(OUString const & sDownloadURL, Update } tempEntry = tempEntry.copy( tempEntry.lastIndexOf( '/' ) + 1 ); - destFolder = dp_misc::makeURL( m_sDownloadFolder, tempEntry ); - destFolder += "_"; + destFolder = dp_misc::makeURL( m_sDownloadFolder, tempEntry ) + "_"; ::ucbhelper::Content destFolderContent; dp_misc::create_folder( &destFolderContent, destFolder, m_updateCmdEnv.get() ); diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index a0db3f4daaca..ac814592daf8 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -622,8 +622,7 @@ OUString PackageManagerImpl::insertToActivationLayer( ::utl::TempFile aTemp(&baseDir, false); OUString tempEntry = aTemp.GetURL(); tempEntry = tempEntry.copy(tempEntry.lastIndexOf('/') + 1); - OUString destFolder = makeURL( m_activePackages, tempEntry); - destFolder += "_"; + OUString destFolder = makeURL( m_activePackages, tempEntry) + "_"; // prepare activation folder: ::ucbhelper::Content destFolderContent; diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index 686913645c4c..e3bf4bf07a53 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -539,8 +539,7 @@ namespace pcr if ( xBinding.is() ) { // find a nice name for it - OUString sBaseName(PcrRes(RID_STR_BINDING_NAME)); - sBaseName += " "; + OUString sBaseName(PcrRes(RID_STR_BINDING_NAME) + " "); OUString sNewName; sal_Int32 nNumber = 1; do diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 06dfbb6fdb2a..2a5ad9ea23f3 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -1007,8 +1007,7 @@ void SaneDlg::EstablishQuantumRange() mxQuantumRangeBox->set_active_text( OUString( pBuf, strlen(pBuf), osl_getThreadTextEncoding() ) ); } mxQuantumRangeBox->show(); - OUString aText( mrSane.GetOptionName( mnCurrentOption ) ); - aText += " "; + OUString aText( mrSane.GetOptionName( mnCurrentOption ) + " " ); aText += mrSane.GetOptionUnitName( mnCurrentOption ); mxOptionDescTxt->set_label(aText); mxOptionDescTxt->show(); @@ -1025,8 +1024,7 @@ void SaneDlg::EstablishNumericOption() return; char pBuf[256]; - OUString aText( mrSane.GetOptionName( mnCurrentOption ) ); - aText += " "; + OUString aText( mrSane.GetOptionName( mnCurrentOption ) + " " ); aText += mrSane.GetOptionUnitName( mnCurrentOption ); if( mfMin != mfMax ) { @@ -1263,8 +1261,7 @@ bool SaneDlg::LoadState() return false; const char* pEnv = getenv("HOME"); - OUString aFileName = pEnv ? OUString(pEnv, strlen(pEnv), osl_getThreadTextEncoding() ) : OUString(); - aFileName += "/.so_sane_state"; + OUString aFileName = (pEnv ? OUString(pEnv, strlen(pEnv), osl_getThreadTextEncoding() ) : OUString()) + "/.so_sane_state"; Config aConfig( aFileName ); if( ! aConfig.HasGroup( "SANE" ) ) return false; diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index fc7847dbfd06..0cad7f935107 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -2489,9 +2489,7 @@ void SVGExport::writeMtf( const GDIMetaFile& rMtf ) aAttr = OUString::number( aSize.Height() ) + "mm"; AddAttribute( XML_NAMESPACE_NONE, "height", aAttr ); - aAttr = "0 0 "; - aAttr += OUString::number( aSize.Width() * 100L ); - aAttr += " "; + aAttr = "0 0 " + OUString::number( aSize.Width() * 100L ) + " "; aAttr += OUString::number( aSize.Height() * 100L ); AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr ); diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 2f3c31fcb8bc..9253bbace5f3 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1171,8 +1171,7 @@ bool SVGTextWriter::nextTextPortion() if( ( xTextFieldPropSet->getPropertyValue( sFieldName ) ) >>= sURL ) { #if OSL_DEBUG_LEVEL > 0 - sInfo += "url: "; - sInfo += mrExport.GetRelativeReference( sURL ); + sInfo += "url: " + mrExport.GetRelativeReference( sURL ); #endif msUrl = mrExport.GetRelativeReference( sURL ); if( !msUrl.isEmpty() ) diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 24e3c927fa3b..c0352343adb6 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -361,8 +361,7 @@ void XMLFilterTestDialog::onExportBrowse() { if( n > 0 ) aExtension += ";"; - aExtension += "*."; - aExtension += *pExtensions++; + aExtension += "*." + *pExtensions++; } } } diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index a14d6367d3ca..7c51f7c7a1b4 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -817,8 +817,7 @@ namespace frm aStatement += quoteName(aQuote,aFieldName); if (!aBoundFieldName.isEmpty()) { - aStatement += ", "; - aStatement += quoteName(aQuote, aBoundFieldName); + aStatement += ", " + quoteName(aQuote, aBoundFieldName); } aStatement += " FROM "; diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index a512c54a0793..f72cc3193dfd 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -57,8 +57,7 @@ namespace frm OUString getLabelString(const char* pResId) { - OUString sLabel( " " + FRM_RES_STRING(pResId) ); - sLabel += " "; + OUString sLabel( " " + FRM_RES_STRING(pResId) + " " ); return sLabel; } diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 4cc3597c4f99..c4f6a8f1fdc2 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -119,8 +119,7 @@ void ParaWin::UpdateArgDesc( sal_uInt16 nArg ) { sal_uInt16 nRealArg = (nArg < aVisibleArgMapping.size()) ? aVisibleArgMapping[nArg] : nArg; aArgDesc = pFuncDesc->getParameterDescription(nRealArg); - aArgName = pFuncDesc->getParameterName(nRealArg); - aArgName += " "; + aArgName = pFuncDesc->getParameterName(nRealArg) + " "; aArgName += (pFuncDesc->isParameterOptional(nRealArg)) ? m_sOptional : m_sRequired ; } else if ( nArgs < PAIRED_VAR_ARGS ) @@ -134,9 +133,7 @@ void ParaWin::UpdateArgDesc( sal_uInt16 nArg ) sal_uInt16 nVarArgsStart = pFuncDesc->getVarArgsStart(); if ( nArg >= nVarArgsStart ) aArgName += OUString::number( nArg-nVarArgsStart+1 ); - aArgName += " "; - - aArgName += (nArg > nFix || pFuncDesc->isParameterOptional(nRealArg)) ? m_sOptional : m_sRequired ; + aArgName += " " + ((nArg > nFix || pFuncDesc->isParameterOptional(nRealArg)) ? m_sOptional : m_sRequired) ; } else { @@ -153,9 +150,7 @@ void ParaWin::UpdateArgDesc( sal_uInt16 nArg ) sal_uInt16 nVarArgsStart = pFuncDesc->getVarArgsStart(); if ( nArg >= nVarArgsStart ) aArgName += OUString::number( (nArg-nVarArgsStart)/2 + 1 ); - aArgName += " "; - - aArgName += (nArg > (nFix+1) || pFuncDesc->isParameterOptional(nRealArg)) ? m_sOptional : m_sRequired ; + aArgName += " " + ((nArg > (nFix+1) || pFuncDesc->isParameterOptional(nRealArg)) ? m_sOptional : m_sRequired) ; } SetArgumentDesc(aArgDesc); diff --git a/fpicker/source/office/breadcrumb.cxx b/fpicker/source/office/breadcrumb.cxx index 76bc0f1d17d3..a300a32cc1d0 100644 --- a/fpicker/source/office/breadcrumb.cxx +++ b/fpicker/source/office/breadcrumb.cxx @@ -75,8 +75,7 @@ void Breadcrumb::SetURL( const OUString& rURL ) if( aURL.HasPort() ) { - sHostPort += ":"; - sHostPort += OUString::number( aURL.GetPort() ); + sHostPort += ":" + OUString::number( aURL.GetPort() ); } OUString sUser = aURL.GetUser( INetURLObject::DecodeMechanism::NONE ); diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx index 4d14086e0e8b..127a8800be52 100644 --- a/fpicker/source/office/fileview.cxx +++ b/fpicker/source/office/fileview.cxx @@ -1055,8 +1055,7 @@ OUString SvtFileView::GetConfigString() const OUString sRet = OUString::number( mpImpl->mnSortColumn ) + ";"; bool bUp = mpImpl->mbAscending; - sRet += bUp ? OUString("1") : OUString("0"); - sRet += ";"; + sRet += (bUp ? OUString("1") : OUString("0")) + ";"; weld::TreeView* pView = mpImpl->mxView->getWidget(); sal_uInt16 nCount = mpImpl->mxView->TypeColumnVisible() ? 4 : 3; diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 0a30b76cadec..8b9384f672fc 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -230,8 +230,7 @@ void SAL_CALL OReadMenuDocumentHandler::endDocument() { if ( m_nElementDepth > 0 ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "A closing element is missing!"; + OUString aErrorMessage = getErrorLineString() + "A closing element is missing!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -277,14 +276,12 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) m_xReader.clear(); if ( m_eReaderMode == ReaderMode::MenuBar && aName != ELEMENT_MENUBAR ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "closing element menubar expected!"; + OUString aErrorMessage = getErrorLineString() + "closing element menubar expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } else if ( m_eReaderMode == ReaderMode::MenuPopup && aName != ELEMENT_MENUPOPUP ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "closing element menupopup expected!"; + OUString aErrorMessage = getErrorLineString() + "closing element menupopup expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } m_eReaderMode = ReaderMode::None; @@ -384,8 +381,7 @@ void SAL_CALL OReadMenuBarHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "attribute id for element menu required!"; + OUString aErrorMessage = getErrorLineString() + "attribute id for element menu required!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -395,8 +391,7 @@ void SAL_CALL OReadMenuBarHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "element menu expected!"; + OUString aErrorMessage = getErrorLineString() + "element menu expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -417,8 +412,7 @@ void OReadMenuBarHandler::endElement( const OUString& aName ) m_bMenuMode = false; if ( aName != ELEMENT_MENU ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "closing element menu expected!"; + OUString aErrorMessage = getErrorLineString() + "closing element menu expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -466,8 +460,7 @@ void SAL_CALL OReadMenuHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "unknown element found!"; + OUString aErrorMessage = getErrorLineString() + "unknown element found!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -488,8 +481,7 @@ void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) m_bMenuPopupMode = false; if ( aName != ELEMENT_MENUPOPUP ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "closing element menupopup expected!"; + OUString aErrorMessage = getErrorLineString() + "closing element menupopup expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -585,8 +577,7 @@ void SAL_CALL OReadMenuPopupHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "attribute id for element menu required!"; + OUString aErrorMessage = getErrorLineString() + "attribute id for element menu required!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -654,8 +645,7 @@ void SAL_CALL OReadMenuPopupHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "unknown element found!"; + OUString aErrorMessage = getErrorLineString() + "unknown element found!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -676,8 +666,7 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) m_bMenuMode = false; if ( aName != ELEMENT_MENU ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "closing element menu expected!"; + OUString aErrorMessage = getErrorLineString() + "closing element menu expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -690,8 +679,7 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) { if ( aName != ELEMENT_MENUITEM ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "closing element menuitem expected!"; + OUString aErrorMessage = getErrorLineString() + "closing element menuitem expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -699,8 +687,7 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) { if ( aName != ELEMENT_MENUSEPARATOR ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "closing element menuseparator expected!"; + OUString aErrorMessage = getErrorLineString() + "closing element menuseparator expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index b0289933114e..18b6388d41d3 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -187,8 +187,7 @@ void SAL_CALL OReadStatusBarDocumentHandler::endDocument() if ( m_bStatusBarStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "No matching start or end element 'statusbar' found!"; + OUString aErrorMessage = getErrorLineString() + "No matching start or end element 'statusbar' found!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -207,8 +206,7 @@ void SAL_CALL OReadStatusBarDocumentHandler::startElement( { if ( m_bStatusBarStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Element 'statusbar:statusbar' cannot be embedded into 'statusbar:statusbar'!"; + OUString aErrorMessage = getErrorLineString() + "Element 'statusbar:statusbar' cannot be embedded into 'statusbar:statusbar'!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -220,15 +218,13 @@ void SAL_CALL OReadStatusBarDocumentHandler::startElement( { if ( !m_bStatusBarStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Element 'statusbar:statusbaritem' must be embedded into element 'statusbar:statusbar'!"; + OUString aErrorMessage = getErrorLineString() + "Element 'statusbar:statusbaritem' must be embedded into element 'statusbar:statusbar'!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } if ( m_bStatusBarItemStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Element statusbar:statusbaritem is not a container!"; + OUString aErrorMessage = getErrorLineString() + "Element statusbar:statusbaritem is not a container!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -272,8 +268,7 @@ void SAL_CALL OReadStatusBarDocumentHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Attribute statusbar:align must have one value of 'left','right' or 'center'!"; + OUString aErrorMessage = getErrorLineString() + "Attribute statusbar:align must have one value of 'left','right' or 'center'!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -297,8 +292,7 @@ void SAL_CALL OReadStatusBarDocumentHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Attribute statusbar:autosize must have value 'true' or 'false'!"; + OUString aErrorMessage = getErrorLineString() + "Attribute statusbar:autosize must have value 'true' or 'false'!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -312,8 +306,7 @@ void SAL_CALL OReadStatusBarDocumentHandler::startElement( nItemBits &= ~ItemStyle::AUTO_SIZE; else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Attribute statusbar:autosize must have value 'true' or 'false'!"; + OUString aErrorMessage = getErrorLineString() + "Attribute statusbar:autosize must have value 'true' or 'false'!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -327,8 +320,7 @@ void SAL_CALL OReadStatusBarDocumentHandler::startElement( nItemBits &= ~ItemStyle::OWNER_DRAW; else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Attribute statusbar:ownerdraw must have value 'true' or 'false'!"; + OUString aErrorMessage = getErrorLineString() + "Attribute statusbar:ownerdraw must have value 'true' or 'false'!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -360,8 +352,7 @@ void SAL_CALL OReadStatusBarDocumentHandler::startElement( nItemBits &= ~ItemStyle::MANDATORY; else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Attribute statusbar:mandatory must have value 'true' or 'false'!"; + OUString aErrorMessage = getErrorLineString() + "Attribute statusbar:mandatory must have value 'true' or 'false'!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -375,8 +366,7 @@ void SAL_CALL OReadStatusBarDocumentHandler::startElement( if ( !bCommandURL ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Required attribute statusbar:url must have a value!"; + OUString aErrorMessage = getErrorLineString() + "Required attribute statusbar:url must have a value!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } else @@ -420,8 +410,7 @@ void SAL_CALL OReadStatusBarDocumentHandler::endElement(const OUString& aName) { if ( !m_bStatusBarStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "End element 'statusbar' found, but no start element 'statusbar'"; + OUString aErrorMessage = getErrorLineString() + "End element 'statusbar' found, but no start element 'statusbar'"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -433,8 +422,7 @@ void SAL_CALL OReadStatusBarDocumentHandler::endElement(const OUString& aName) { if ( !m_bStatusBarItemStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "End element 'statusbar:statusbaritem' found, but no start element 'statusbar:statusbaritem'"; + OUString aErrorMessage = getErrorLineString() + "End element 'statusbar:statusbaritem' found, but no start element 'statusbar:statusbaritem'"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 509a7235cd50..9b3927839110 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -178,8 +178,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::endDocument() if ( m_bToolBarStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "No matching start or end element 'toolbar' found!"; + OUString aErrorMessage = getErrorLineString() + "No matching start or end element 'toolbar' found!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -198,8 +197,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement( { if ( m_bToolBarStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Element 'toolbar:toolbar' cannot be embedded into 'toolbar:toolbar'!"; + OUString aErrorMessage = getErrorLineString() + "Element 'toolbar:toolbar' cannot be embedded into 'toolbar:toolbar'!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } else @@ -246,8 +244,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement( { if ( !m_bToolBarStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Element 'toolbar:toolbaritem' must be embedded into element 'toolbar:toolbar'!"; + OUString aErrorMessage = getErrorLineString() + "Element 'toolbar:toolbaritem' must be embedded into element 'toolbar:toolbar'!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -256,8 +253,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement( m_bToolBarSpaceStartFound || m_bToolBarItemStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Element toolbar:toolbaritem is not a container!"; + OUString aErrorMessage = getErrorLineString() + "Element toolbar:toolbaritem is not a container!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -297,8 +293,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement( bVisible = false; else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Attribute toolbar:visible must have value 'true' or 'false'!"; + OUString aErrorMessage = getErrorLineString() + "Attribute toolbar:visible must have value 'true' or 'false'!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -346,8 +341,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement( if ( !bAttributeURL ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Required attribute toolbar:url must have a value!"; + OUString aErrorMessage = getErrorLineString() + "Required attribute toolbar:url must have a value!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -390,8 +384,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement( m_bToolBarSpaceStartFound || m_bToolBarItemStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Element toolbar:toolbarspace is not a container!"; + OUString aErrorMessage = getErrorLineString() + "Element toolbar:toolbarspace is not a container!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -415,8 +408,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement( m_bToolBarSpaceStartFound || m_bToolBarItemStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Element toolbar:toolbarbreak is not a container!"; + OUString aErrorMessage = getErrorLineString() + "Element toolbar:toolbarbreak is not a container!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -440,8 +432,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::startElement( m_bToolBarSpaceStartFound || m_bToolBarItemStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Element toolbar:toolbarseparator is not a container!"; + OUString aErrorMessage = getErrorLineString() + "Element toolbar:toolbarseparator is not a container!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -477,8 +468,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::endElement(const OUString& aName) { if ( !m_bToolBarStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "End element 'toolbar' found, but no start element 'toolbar'"; + OUString aErrorMessage = getErrorLineString() + "End element 'toolbar' found, but no start element 'toolbar'"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -490,8 +480,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::endElement(const OUString& aName) { if ( !m_bToolBarItemStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "End element 'toolbar:toolbaritem' found, but no start element 'toolbar:toolbaritem'"; + OUString aErrorMessage = getErrorLineString() + "End element 'toolbar:toolbaritem' found, but no start element 'toolbar:toolbaritem'"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -503,8 +492,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::endElement(const OUString& aName) { if ( !m_bToolBarBreakStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "End element 'toolbar:toolbarbreak' found, but no start element 'toolbar:toolbarbreak'"; + OUString aErrorMessage = getErrorLineString() + "End element 'toolbar:toolbarbreak' found, but no start element 'toolbar:toolbarbreak'"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -516,8 +504,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::endElement(const OUString& aName) { if ( !m_bToolBarSpaceStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "End element 'toolbar:toolbarspace' found, but no start element 'toolbar:toolbarspace'"; + OUString aErrorMessage = getErrorLineString() + "End element 'toolbar:toolbarspace' found, but no start element 'toolbar:toolbarspace'"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -529,8 +516,7 @@ void SAL_CALL OReadToolBoxDocumentHandler::endElement(const OUString& aName) { if ( !m_bToolBarSeparatorStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "End element 'toolbar:toolbarseparator' found, but no start element 'toolbar:toolbarseparator'"; + OUString aErrorMessage = getErrorLineString() + "End element 'toolbar:toolbarseparator' found, but no start element 'toolbar:toolbarseparator'"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } diff --git a/framework/source/uiconfiguration/CommandImageResolver.cxx b/framework/source/uiconfiguration/CommandImageResolver.cxx index 3822f7eb2fa3..b443936684d9 100644 --- a/framework/source/uiconfiguration/CommandImageResolver.cxx +++ b/framework/source/uiconfiguration/CommandImageResolver.cxx @@ -103,8 +103,7 @@ void CommandImageResolver::registerCommands(Sequence<OUString>& aCommandSequence // Image names are not case-dependent. Always use lower case characters to // reflect this. - aImageName = aImageName.toAsciiLowerCase(); - aImageName += ".png"; + aImageName = aImageName.toAsciiLowerCase() + ".png"; m_aImageNameVector[i] = aImageName; m_aCommandToImageNameMap[aCommandName] = aImageName; diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 381b0f1aec2a..00aa56bef709 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -133,8 +133,7 @@ void SAL_CALL OReadImagesDocumentHandler::endDocument() if (m_bImageContainerStartFound != m_bImageContainerEndFound) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "No matching start or end element 'image:imagecontainer' found!"; + OUString aErrorMessage = getErrorLineString() + "No matching start or end element 'image:imagecontainer' found!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -154,8 +153,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( // image:imagecontainer element (container element for all further image elements) if ( m_bImageContainerStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Element 'image:imagecontainer' cannot be embedded into 'image:imagecontainer'!"; + OUString aErrorMessage = getErrorLineString() + "Element 'image:imagecontainer' cannot be embedded into 'image:imagecontainer'!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -167,15 +165,13 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( { if ( !m_bImageContainerStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Element 'image:images' must be embedded into element 'image:imagecontainer'!"; + OUString aErrorMessage = getErrorLineString() + "Element 'image:images' must be embedded into element 'image:imagecontainer'!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } if ( m_bImagesStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Element 'image:images' cannot be embedded into 'image:images'!"; + OUString aErrorMessage = getErrorLineString() + "Element 'image:images' cannot be embedded into 'image:images'!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -188,8 +184,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( // Check that image:entry is embedded into image:images! if ( !m_bImagesStartFound ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Element 'image:entry' must be embedded into element 'image:images'!"; + OUString aErrorMessage = getErrorLineString() + "Element 'image:entry' must be embedded into element 'image:images'!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -219,8 +214,7 @@ void SAL_CALL OReadImagesDocumentHandler::startElement( // Check required attribute "command" if ( aItem.aCommandURL.isEmpty() ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "Required attribute 'image:command' must have a value!"; + OUString aErrorMessage = getErrorLineString() + "Required attribute 'image:command' must have a value!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } diff --git a/sc/source/core/tool/formulalogger.cxx b/sc/source/core/tool/formulalogger.cxx index c1ea0d4d39ea..1de0eaa3fee0 100644 --- a/sc/source/core/tool/formulalogger.cxx +++ b/sc/source/core/tool/formulalogger.cxx @@ -345,8 +345,7 @@ FormulaLogger::GroupScope FormulaLogger::enterGroup( OUString aGroupPrefix = aName + ": formula-group: "; - aGroupPrefix += rCell.aPos.Format(ScRefFlags::VALID | ScRefFlags::TAB_3D, &rDoc, rDoc.GetAddressConvention()); - aGroupPrefix += ": "; + aGroupPrefix += rCell.aPos.Format(ScRefFlags::VALID | ScRefFlags::TAB_3D, &rDoc, rDoc.GetAddressConvention()) + ": "; bool bOutputEnabled = mpLastGroup != rCell.GetCellGroup().get(); mpLastGroup = rCell.GetCellGroup().get(); diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 87cf50e9da2d..9042fe4676e4 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -495,8 +495,7 @@ uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes() strFor = ReplaceFourChar(strFor); strFor = "Formula:" + strFor + ";Note:"; - strFor += ReplaceFourChar(GetAllDisplayNote()); - strFor += ";"; + strFor += ReplaceFourChar(GetAllDisplayNote()) + ";"; strFor += getShadowAttrs();//the string returned contains the spliter ";" strFor += getBorderAttrs();//the string returned contains the spliter ";" //end of cell attributes diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index d4ffbbaac88b..959112b2cd3a 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -2228,8 +2228,7 @@ uno::Any SAL_CALL ScAccessibleDocument::getExtendedAttributes() sValue += sName + OUString::number(sheetIndex+1) ; sName = ";total-pages:"; sValue += sName; - sValue += OUString::number(GetDocument()->GetTableCount()); - sValue += ";"; + sValue += OUString::number(GetDocument()->GetTableCount()) + ";"; anyAtrribute <<= sValue; return anyAtrribute; } diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 44b36a9ce435..5defaf8c5c5f 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -637,8 +637,7 @@ void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, weld::Wind OUString aAuthor = pAction->GetUser(); DateTime aDT = pAction->GetDateTime(); - OUString aDate = ScGlobal::pLocaleData->getDate( aDT ); - aDate += " "; + OUString aDate = ScGlobal::pLocaleData->getDate( aDT ) + " "; aDate += ScGlobal::pLocaleData->getTime( aDT, false ); SfxItemSet aSet( diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 76edb39ccd0d..f62eb242de05 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -293,8 +293,7 @@ void ScFunctionWin::DoEnter() // the above call can result in us being disposed if (OutputDevice::isDisposed()) return; - aString = "="; - aString += aFuncList->GetSelectedEntry(); + aString = "=" + aFuncList->GetSelectedEntry(); if (pHdl) pHdl->ClearText(); } @@ -339,8 +338,7 @@ void ScFunctionWin::DoEnter() { if (pHdl->GetEditString().isEmpty()) { - aString = "="; - aString += aFuncList->GetSelectedEntry(); + aString = "=" + aFuncList->GetSelectedEntry(); } EditView *pEdView=pHdl->GetActiveView(); if(pEdView!=nullptr) // @ needed because of crash during setting a name diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 809fecc3bb81..0d478d612ef0 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -421,8 +421,7 @@ void ScConflictsDlg::SetActionString(const ScChangeAction* pAction, ScDocument* rTreeView.set_text(rEntry, aUser, 1); DateTime aDateTime = pAction->GetDateTime(); - OUString aString = ScGlobal::pLocaleData->getDate( aDateTime ); - aString += " "; + OUString aString = ScGlobal::pLocaleData->getDate( aDateTime ) + " "; aString += ScGlobal::pLocaleData->getTime( aDateTime, false ); rTreeView.set_text(rEntry, aString, 2); } diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index d63b5a529091..abd37aad7b39 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -109,8 +109,7 @@ void ScRedComDialog::ReInit(ScChangeAction *pAction) OUString aAuthor = pChangeAction->GetUser(); DateTime aDT = pChangeAction->GetDateTime(); - OUString aDate = ScGlobal::pLocaleData->getDate( aDT ); - aDate += " "; + OUString aDate = ScGlobal::pLocaleData->getDate( aDT ) + " "; aDate += ScGlobal::pLocaleData->getTime( aDT, false ); pDlg->ShowLastAuthor(aAuthor, aDate); diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 34d104f37c22..ad036ddd26e3 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -196,8 +196,7 @@ void ScShareDocumentDlg::UpdateView() util::DateTime uDT(xDocProps->getModificationDate()); DateTime aDateTime(uDT); - OUString aString = formatTime(aDateTime, *ScGlobal::pLocaleData); - aString += " "; + OUString aString = formatTime(aDateTime, *ScGlobal::pLocaleData) + " "; aString += ScGlobal::pLocaleData->getTime( aDateTime, false ); m_xLbUsers->append_text(aUser); diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 40efcef60260..ce9f4f6d7c66 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -245,8 +245,7 @@ void ScSolverOptionsDialog::EditOption() { pStringItem->SetDoubleValue( aValDialog.GetValue() ); - OUString sTxt(pStringItem->GetText()); - sTxt += ": "; + OUString sTxt(pStringItem->GetText() + ": "); sTxt += rtl::math::doubleToUString(pStringItem->GetDoubleValue(), rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, ScGlobal::GetpLocaleData()->getNumDecimalSep()[0], true ); @@ -263,8 +262,7 @@ void ScSolverOptionsDialog::EditOption() { pStringItem->SetIntValue(aIntDialog.GetValue()); - OUString sTxt(pStringItem->GetText()); - sTxt += ": "; + OUString sTxt(pStringItem->GetText() + ": "); sTxt += OUString::number(pStringItem->GetIntValue()); m_xLbSettings->set_text(nEntry, sTxt, 1); diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 2d22892668b9..b12592bcf29c 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -675,8 +675,7 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling) OUString aCreatedByEntry( m_xFtCreatedBy->get_label() + " " + aUserOpt.GetFirstName() + " " + aUserOpt.GetLastName()); m_xWndLeft->GetEditEngine()->SetText(aCreatedByEntry); m_xWndCenter->InsertField( SvxFieldItem(SvxDateField(Date( Date::SYSTEM ),SvxDateType::Var), EE_FEATURE_FIELD) ); - OUString aPageEntry( m_xFtPage->get_label() ); - aPageEntry += " "; + OUString aPageEntry( m_xFtPage->get_label() + " " ); m_xWndRight->GetEditEngine()->SetText(aPageEntry); m_xWndRight->InsertField( SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD) ); if(!bTravelling) diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index d117a2250ab7..18be8420c7ee 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1914,8 +1914,7 @@ long ScPrintFunc::DoNotes( long nNoteStart, bool bDoPrint, ScPreviewLocationData { pEditEngine->Draw( pDev, Point( nPosX, nPosY ) ); - OUString aMarkStr(rPos.Format(ScRefFlags::VALID, pDoc, pDoc->GetAddressConvention())); - aMarkStr += ":"; + OUString aMarkStr(rPos.Format(ScRefFlags::VALID, pDoc, pDoc->GetAddressConvention()) + ":"); // cell position also via EditEngine, for correct positioning pEditEngine->SetText(aMarkStr); diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 58a4bf3da3dd..5440e7a1c220 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -878,8 +878,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage { if( pLocaleItem ) { - OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem.get(), m_aNameBase ); - aStreamName += ".properties"; + OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem.get(), m_aNameBase ) + ".properties"; try { @@ -899,8 +898,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage if( pLocaleItem != nullptr && (bStoreAll || pLocaleItem->m_bModified) && loadLocale( pLocaleItem.get() ) ) { - OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem.get(), aNameBase ); - aStreamName += ".properties"; + OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem.get(), aNameBase ) + ".properties"; Reference< io::XStream > xElementStream = Storage->openStreamElement( aStreamName, ElementModes::READWRITE ); @@ -932,8 +930,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage { for( auto& pLocaleItem : m_aChangedDefaultLocaleVector ) { - OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem.get(), m_aNameBase ); - aStreamName += ".default"; + OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem.get(), m_aNameBase ) + ".default"; try { @@ -950,8 +947,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage // Default locale if( m_pDefaultLocaleItem != nullptr && (bStoreAll || m_bDefaultModified) ) { - OUString aStreamName = implGetFileNameForLocaleItem( m_pDefaultLocaleItem, aNameBase ); - aStreamName += ".default"; + OUString aStreamName = implGetFileNameForLocaleItem( m_pDefaultLocaleItem, aNameBase ) + ".default"; Reference< io::XStream > xElementStream = Storage->openStreamElement( aStreamName, ElementModes::READWRITE ); @@ -2313,8 +2309,7 @@ bool StringResourceWithStorageImpl::implLoadLocale( LocaleItem* pLocaleItem ) bool bSuccess = false; try { - OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase ); - aStreamName += ".properties"; + OUString aStreamName = implGetFileNameForLocaleItem( pLocaleItem, m_aNameBase ) + ".properties"; Reference< io::XStream > xElementStream = m_xStorage->openStreamElement( aStreamName, ElementModes::READ ); diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index eedeb4056d44..ffbd3ff1041f 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1936,8 +1936,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const ::tools::Rectangle& rN } else if (pObj == GetPresObj(PRESOBJ_OUTLINE, 0)) { - OUString aName(GetLayoutName()); - aName += " "; + OUString aName(GetLayoutName() + " "); for (sal_Int32 i=1; i<=9; i++) { diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 04da532ca255..2e295a0eaf56 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -889,8 +889,7 @@ uno::Reference<XAccessible> AccessibleDrawDocumentView::GetSelAccContextInTable( void AccessibleDrawDocumentView::UpdateAccessibleName() { - OUString sNewName (CreateAccessibleName()); - sNewName += ": "; + OUString sNewName (CreateAccessibleName() + ": "); // Add the number of the current slide. uno::Reference<drawing::XDrawView> xView (mxController, uno::UNO_QUERY); @@ -918,8 +917,7 @@ void AccessibleDrawDocumentView::UpdateAccessibleName() Reference<container::XIndexAccess> xPages = xPagesSupplier->getDrawPages(); if (xPages.is()) { - sNewName += " / "; - sNewName += OUString::number(xPages->getCount()); + sNewName += " / " + OUString::number(xPages->getCount()); } } diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 83def14415df..e14f266d6c72 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -151,8 +151,7 @@ OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText if (bAppendIndex) { - aDescription += " "; - aDescription += OUString::number(getShapeIndex(xShape)); + aDescription += " " + OUString::number(getShapeIndex(xShape)); } if( bWithText ) diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index a61c7858937d..eaf7e0a3b7cf 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -506,9 +506,7 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly ) SvtSysLocale aSysLocale; const LocaleDataWrapper& aLocaleData = aSysLocale.GetLocaleData(); - aText += " ( "; - aText += aLocaleData.getDuration( ::tools::Time( 0, 0, mnPauseTimeout ) ); - aText += " )"; + aText += " ( " + aLocaleData.getDuration( ::tools::Time( 0, 0, mnPauseTimeout ) ) + " )"; pVDev->DrawText( Point( aOffset.Width(), 0 ), aText ); DrawOutDev( Point( aOutOrg.X(), aOffset.Height() ), aVDevSize, Point(), aVDevSize, *pVDev ); bDrawn = true; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index bd4f39205b3d..caa352e3b152 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1359,8 +1359,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { SdrGrafObj* pNewObject = dialog.GetCompressedSdrGrafObj(); SdrPageView* pPageView = mpDrawView->GetSdrPageView(); - OUString aUndoString = mpDrawView->GetDescriptionOfMarkedObjects(); - aUndoString += " Compress"; + OUString aUndoString = mpDrawView->GetDescriptionOfMarkedObjects() + " Compress"; mpDrawView->BegUndo( aUndoString ); mpDrawView->ReplaceObjectAtView( pObj, *pPageView, pNewObject ); mpDrawView->EndUndo(); diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index e9437eaed638..53fc3cfa941d 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -696,9 +696,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) SdrLayer* pLayer = rLayerAdmin.GetLayerPerID( nLayer ); if( pLayer ) { - aOUString += " (" ; - aOUString += LayerTabBar::convertToLocalizedName(pLayer->GetName()); - aOUString += ")"; + aOUString += " (" + LayerTabBar::convertToLocalizedName(pLayer->GetName()) + ")"; } } } diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 503199400ec2..faf95ef021b8 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -526,8 +526,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) if (!aName.isEmpty()) { - aName += " "; - aName += mrOptimizerDialog.getString(STR_FILENAME_SUFFIX); + aName += " " + mrOptimizerDialog.getString(STR_FILENAME_SUFFIX); aFileOpenDialog.setDefaultName(aName); } diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 09dcd0cfe85c..10eb16a0c815 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -148,8 +148,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL, const OUString &rReloadURL = i_xDocProps->getAutoloadURL(); if( !rReloadURL.isEmpty() ) { - sContent += ";URL="; - sContent += URIHelper::simpleNormalizedMakeRelative( + sContent += ";URL=" + URIHelper::simpleNormalizedMakeRelative( rBaseURL, rReloadURL); } diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index fec0cd321c8b..d549ab6c0d42 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -157,8 +157,7 @@ std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUStrin OUString aTitle( xRow->getString(1) ); bool bFolder = xRow->getBoolean(2); OUString aRow = aTitle + "\t"; - aRow += xContentAccess->queryContentIdentifierString(); - aRow += "\t"; + aRow += xContentAccess->queryContentIdentifierString() + "\t"; aRow += bFolder ? OUString("1") : OUString("0"); aProperties.push_back( aRow ); } diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 184509187e2f..d58bd3986540 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -818,8 +818,7 @@ void SfxDocumentPage::ImplUpdateSignatures() else if ( aInfos.getLength() == 1 ) { const security::DocumentSignatureInformation& rInfo = aInfos[ 0 ]; - s = utl::GetDateTimeString( rInfo.SignatureDate, rInfo.SignatureTime ); - s += ", "; + s = utl::GetDateTimeString( rInfo.SignatureDate, rInfo.SignatureTime ) + ", "; s += comphelper::xmlsec::GetContentPart(rInfo.Signer->getSubjectName()); } m_xSignedValFt->set_label(s); diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index eea857b6628f..edfbf407961d 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -93,17 +93,12 @@ void SearchDialog::SaveConfig() int i = 0, nCount = std::min(m_xSearchEdit->get_count(), static_cast<int>(MAX_SAVE_COUNT)); for ( ; i < nCount; ++i ) { - sUserData += m_xSearchEdit->get_text(i); - sUserData += "\t"; + sUserData += m_xSearchEdit->get_text(i) + "\t"; } - sUserData = comphelper::string::stripStart(sUserData, '\t'); - sUserData += ";"; - sUserData += OUString::number( m_xWholeWordsBox->get_active() ? 1 : 0 ); - sUserData += ";"; - sUserData += OUString::number( m_xMatchCaseBox->get_active() ? 1 : 0 ); - sUserData += ";"; - sUserData += OUString::number( m_xWrapAroundBox->get_active() ? 1 : 0 ); - sUserData += ";"; + sUserData = comphelper::string::stripStart(sUserData, '\t') + ";"; + sUserData += OUString::number( m_xWholeWordsBox->get_active() ? 1 : 0 ) + ";"; + sUserData += OUString::number( m_xMatchCaseBox->get_active() ? 1 : 0 ) + ";"; + sUserData += OUString::number( m_xWrapAroundBox->get_active() ? 1 : 0 ) + ";"; sUserData += OUString::number( m_xBackwardsBox->get_active() ? 1 : 0 ); Any aUserItem = makeAny( sUserData ); diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 1f7db49ccec1..e7b430b20986 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -5203,9 +5203,7 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords, { if ( rKey[j] == rColorName ) { - aPrefix += "["; - aPrefix += rKeywords[j]; - aPrefix += "]"; + aPrefix += "[" + rKeywords[j] + "]"; break; // for } } @@ -5219,9 +5217,7 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords, aNatNum.SetLang( nOriginalLang ); if ( aNatNum.GetDBNum() > 0 ) { - aPrefix += "[DBNum"; - aPrefix += OUString::number( aNatNum.GetDBNum() ); - aPrefix += "]"; + aPrefix += "[DBNum" + OUString::number( aNatNum.GetDBNum() ) + "]"; bDBNumInserted = true; } } diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 02d5d8ae2816..bfbc2e21593b 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -407,8 +407,8 @@ IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl, weld::Button&, void ) sEncodedUsername = rtl::Uri::encode(m_sUsername, rtl_UriCharClassUserinfo, rtl_UriEncodeKeepEscapes, - RTL_TEXTENCODING_UTF8 ); - sEncodedUsername += "@"; + RTL_TEXTENCODING_UTF8 ) + + "@"; } // Clean the listbox diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 67681e491ff4..1f819f0974d1 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -44,8 +44,7 @@ OUString GetDicInfoStr( const OUString& rName, const LanguageType nLang, bool bN INetURLObject aURLObj; aURLObj.SetSmartProtocol( INetProtocol::File ); aURLObj.SetSmartURL( rName, INetURLObject::EncodeMechanism::All ); - OUString aTmp( aURLObj.GetBase() ); - aTmp += " "; + OUString aTmp( aURLObj.GetBase() + " " ); if ( bNeg ) { @@ -56,9 +55,7 @@ OUString GetDicInfoStr( const OUString& rName, const LanguageType nLang, bool bN aTmp += SvxResId(RID_SVXSTR_LANGUAGE_ALL); else { - aTmp += "["; - aTmp += SvtLanguageTable::GetLanguageString( nLang ); - aTmp += "]"; + aTmp += "[" + SvtLanguageTable::GetLanguageString( nLang ) + "]"; } return aTmp; @@ -340,14 +337,12 @@ weld::ComboBoxEntry SvxLanguageBox::BuildEntry(const LanguageType nLangType, sal if (nRealLang == LANGUAGE_SYSTEM) { nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, nType); - aStrEntry += " - "; - aStrEntry += SvtLanguageTable::GetLanguageString( nRealLang ); + aStrEntry += " - " + SvtLanguageTable::GetLanguageString( nRealLang ); } else if (nRealLang == LANGUAGE_USER_SYSTEM_CONFIG) { nRealLang = MsLangId::getSystemLanguage(); - aStrEntry += " - "; - aStrEntry += SvtLanguageTable::GetLanguageString( nRealLang ); + aStrEntry += " - " + SvtLanguageTable::GetLanguageString( nRealLang ); } if (m_bWithCheckmark) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 8ffe69bc6f48..1ce2d39f5d6d 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -741,8 +741,7 @@ void DbGridControl::NavigationBar::SetState(DbGridControlNavigationBarState nWhi { OUString aExtendedInfo = aText + " ("; - aExtendedInfo += m_aAbsolute->CreateFieldText(pParent->GetSelectRowCount()); - aExtendedInfo += ")"; + aExtendedInfo += m_aAbsolute->CreateFieldText(pParent->GetSelectRowCount()) + ")"; pWnd->SetText(aExtendedInfo); } else diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index e460a025de90..ebf593635f49 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3096,11 +3096,9 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) // do we already have the control ? if (aRow.find(rFieldInfo.xText) != aRow.end()) { - OUString aCompText = aRow[rFieldInfo.xText]; - aCompText += " "; + OUString aCompText = aRow[rFieldInfo.xText] + " "; OString aVal = m_pParser->getContext().getIntlKeywordAscii(IParseContext::InternationalKeyCode::And); - aCompText += OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US); - aCompText += " "; + aCompText += OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US) + " "; aCompText += ::comphelper::getString(rRefValue.Value); aRow[rFieldInfo.xText] = aCompText; } diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 45775316bf40..d67df26a067f 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -231,8 +231,7 @@ namespace sdr if (aDraftText.isEmpty()) { - aDraftText = GetGrafObject().GetName(); - aDraftText += " ..."; + aDraftText = GetGrafObject().GetName() + " ..."; } if (!aDraftText.isEmpty()) diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 084d251c91dd..1e0c63c06a24 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -407,8 +407,7 @@ void SvxPosSizeStatusBarControl::Paint( const UserDrawEvent& rUsrEvt ) pDev->DrawImage( aPnt, pImpl->aPosImage ); aPnt.AdjustX(pImpl->aPosImage.GetSizePixel().Width() ); aPnt.AdjustX(PAINT_OFFSET ); - OUString aStr = GetMetricStr_Impl( pImpl->aPos.X()); - aStr += " / "; + OUString aStr = GetMetricStr_Impl( pImpl->aPos.X()) + " / "; aStr += GetMetricStr_Impl( pImpl->aPos.Y()); tools::Rectangle aRect(aPnt, Point(nSizePosX, rRect.Bottom())); pDev->DrawRect(aRect); @@ -426,8 +425,7 @@ void SvxPosSizeStatusBarControl::Paint( const UserDrawEvent& rUsrEvt ) aPnt.AdjustX(pImpl->aSizeImage.GetSizePixel().Width() ); Point aDrwPnt = aPnt; aPnt.AdjustX(PAINT_OFFSET ); - aStr = GetMetricStr_Impl( pImpl->aSize.Width() ); - aStr += " x "; + aStr = GetMetricStr_Impl( pImpl->aSize.Width() ) + " x "; aStr += GetMetricStr_Impl( pImpl->aSize.Height() ); aRect = tools::Rectangle(aDrwPnt, rRect.BottomRight()); pDev->DrawRect(aRect); @@ -465,16 +463,13 @@ void SvxPosSizeStatusBarControl::ImplUpdateItemText() int nCharsWidth = -1; if ( pImpl->bPos || pImpl->bSize ) { - aText = GetMetricStr_Impl( pImpl->aPos.X()); - aText += " / "; + aText = GetMetricStr_Impl( pImpl->aPos.X()) + " / "; aText += GetMetricStr_Impl( pImpl->aPos.Y()); // widest X/Y string looks like "-999,99" nCharsWidth = 1 + 6 + 3 + 6; // icon + x + slash + y if ( pImpl->bSize ) { - aText += " "; - aText += GetMetricStr_Impl( pImpl->aSize.Width() ); - aText += " x "; + aText += " " + GetMetricStr_Impl( pImpl->aSize.Width() ) + " x "; aText += GetMetricStr_Impl( pImpl->aSize.Height() ); nCharsWidth += 1 + 1 + 4 + 3 + 4; // icon + space + w + x + h } diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 532df4f7a8b2..26da3cef6f65 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -500,10 +500,8 @@ bool SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos) OUString aNewName = aWNameMemorized + " "; aNewName += pEntry->GetItemTypeStr(); if (pEntry->bCanNum) { - aNewName += ": "; - aNewName += OUString::number(pEntry->nMin); - aNewName += ".."; - aNewName += OUString::number(pEntry->nMax); + aNewName += ": " + OUString::number(pEntry->nMin); + aNewName += ".." + OUString::number(pEntry->nMax); } aNewName += " - Type 'del' to reset to default."; pParent->SetText(aNewName); diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index ec9514698168..76222cd30158 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1260,8 +1260,7 @@ OUString SdrView::GetStatusText() aStr = aStr.replaceFirst("%3", OUString::number(nCol + 1)); #ifdef DBG_UTIL - aStr += ", Level " ; - aStr += OUString::number( pTextEditOutliner->GetDepth( aSel.nEndPara ) ); + aStr += ", Level " + OUString::number( pTextEditOutliner->GetDepth( aSel.nEndPara ) ); #endif } diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 7942eee58af5..dee443327e08 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -561,8 +561,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) if( bUndo ) { - aUndoStr = rView.GetDescriptionOfMarkedObjects(); - aUndoStr += " "; + aUndoStr = rView.GetDescriptionOfMarkedObjects() + " "; } const SfxItemSet* pArgs = rReq.GetArgs(); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index ce8142d560be..2c2603fb4c8d 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -3812,8 +3812,7 @@ void SvxCurrencyToolBoxControl::GetCurrencySymbols( std::vector<OUString>& rList sal_uInt16 nStart = 1; - OUString aString( ApplyLreOrRleEmbedding( rCurrencyTable[0].GetSymbol() ) ); - aString += " "; + OUString aString( ApplyLreOrRleEmbedding( rCurrencyTable[0].GetSymbol() ) + " " ); aString += ApplyLreOrRleEmbedding( SvtLanguageTable::GetLanguageString( rCurrencyTable[0].GetLanguage() ) ); diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 57be5a899702..92b7fdb3bdd2 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -129,10 +129,8 @@ ErrCode XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileName, // calculate correct file name if( !( nFlags & XOutFlags::DontExpandFilename ) ) { - OUString aName( aURL.getBase() ); - aName += "_"; - aName += aURL.getExtension(); - aName += "_"; + OUString aName( aURL.getBase() + "_" ); + aName += aURL.getExtension() + "_"; OUString aStr( OUString::number( rGraphic.GetChecksum(), 16 ) ); if ( aStr[0] == '-' ) aStr = "m" + aStr.copy(1); diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 0aecf604ca66..f89541b1c09c 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -542,8 +542,7 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() ";page-number:" + OUString::number( nPage ) + ";total-pages:"; - sValue += OUString::number( pCursorShell->GetPageCnt() ) ; - sValue += ";"; + sValue += OUString::number( pCursorShell->GetPageCnt() ) + ";"; SwContentFrame* pCurrFrame = pCursorShell->GetCurrFrame(); SwPageFrame* pCurrPage=static_cast<SwFrame*>(pCurrFrame)->FindPageFrame(); diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 335f06e86452..e50c0a3a9c7f 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1287,8 +1287,7 @@ OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex) break; case SwFieldIds::Author: { - strTypeName += "-"; - strTypeName += aMgr.GetFormatStr(pField->GetTypeId(), pField->GetFormat() & 0xff); + strTypeName += "-" + aMgr.GetFormatStr(pField->GetTypeId(), pField->GetFormat() & 0xff); } break; default: break; diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx index e6181791584f..71f6cc74c1d3 100644 --- a/sw/source/core/crsr/trvltbl.cxx +++ b/sw/source/core/crsr/trvltbl.cxx @@ -762,8 +762,7 @@ OUString SwCursorShell::GetBoxNms() const if( !pFrame ) return sNm; - sNm = static_cast<SwCellFrame*>(pFrame)->GetTabBox()->GetName(); - sNm += ":"; + sNm = static_cast<SwCellFrame*>(pFrame)->GetTabBox()->GetName() + ":"; pPos = m_pTableCursor->End(); } else diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx index 2d64955bb1f8..54ac718099d7 100644 --- a/sw/source/core/doc/DocumentFieldsManager.cxx +++ b/sw/source/core/doc/DocumentFieldsManager.cxx @@ -1241,8 +1241,7 @@ void DocumentFieldsManager::UpdateExpFieldsImpl( } } - aNew += "="; - aNew += pSField->GetFormula(); + aNew += "=" + pSField->GetFormula(); SwSbxValue aValue = aCalc.Calculate( aNew ); if (!aCalc.IsCalcError()) diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index 26792bd8e3a0..a4a6d8e25794 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -344,8 +344,7 @@ static OUString lcl_dbg_out(const SwPaM & rPam) if (rPam.HasMark()) { - aStr += ", Mk: "; - aStr += lcl_dbg_out(*rPam.GetMark()); + aStr += ", Mk: " + lcl_dbg_out(*rPam.GetMark()); } aStr += " ]"; @@ -397,15 +396,12 @@ static OUString lcl_dbg_out(const SwFrameFormat & rFrameFormat) OUString aResult = "[ " + OUString(sBuffer, strlen(sBuffer), RTL_TEXTENCODING_ASCII_US) + "("; - aResult += rFrameFormat.GetName(); - aResult += ")"; + aResult += rFrameFormat.GetName() + ")"; if (rFrameFormat.IsAuto()) aResult += "*"; - aResult += " ,"; - aResult += lcl_dbg_out(rFrameFormat.FindLayoutRect()); - aResult += " ]"; + aResult += " ," + lcl_dbg_out(rFrameFormat.FindLayoutRect()) + " ]"; return aResult; } @@ -515,16 +511,12 @@ static OUString lcl_dbg_out(const SwNode & rNode) { const SfxItemSet * pAttrSet = pTextNode->GetpSwAttrSet(); - aTmpStr += "<txt>"; - aTmpStr += pTextNode->GetText().getLength() > 10 ? pTextNode->GetText().copy(0, 10) : pTextNode->GetText(); - aTmpStr += "</txt>"; + aTmpStr += "<txt>" + (pTextNode->GetText().getLength() > 10 ? pTextNode->GetText().copy(0, 10) : pTextNode->GetText()) + "</txt>"; if (rNode.IsTableNode()) aTmpStr += "<tbl/>"; - aTmpStr += "<outlinelevel>"; - aTmpStr += OUString::number(pTextNode->GetAttrOutlineLevel()-1); - aTmpStr += "</outlinelevel>"; + aTmpStr += "<outlinelevel>" + OUString::number(pTextNode->GetAttrOutlineLevel()-1) + "</outlinelevel>"; const SwNumRule * pNumRule = pTextNode->GetNumRule(); @@ -535,9 +527,7 @@ static OUString lcl_dbg_out(const SwNode & rNode) { aTmpStr += lcl_dbg_out(*(pTextNode->GetNum())); } - aTmpStr += "</number>"; - - aTmpStr += "<rule>" + + aTmpStr += "</number><rule>" + pNumRule->GetName(); const SfxPoolItem * pItem = nullptr; @@ -545,10 +535,8 @@ static OUString lcl_dbg_out(const SwNode & rNode) if (pAttrSet && SfxItemState::SET == pAttrSet->GetItemState(RES_PARATR_NUMRULE, false, &pItem)) { - aTmpStr += "("; - aTmpStr += - static_cast<const SwNumRuleItem *>(pItem)->GetValue(); - aTmpStr += ")*"; + aTmpStr += "(" + + static_cast<const SwNumRuleItem *>(pItem)->GetValue() + ")*"; } const SwNumFormat * pNumFormat = nullptr; @@ -559,10 +547,8 @@ static OUString lcl_dbg_out(const SwNode & rNode) if (pNumFormat) { - aTmpStr += "<numformat>"; - aTmpStr += - lcl_dbg_out_NumType(pNumFormat->GetNumberingType()); - aTmpStr += "</numformat>"; + aTmpStr += "<numformat>" + + lcl_dbg_out_NumType(pNumFormat->GetNumberingType()) + "</numformat>"; } } @@ -573,10 +559,7 @@ static OUString lcl_dbg_out(const SwNode & rNode) if (pColl) { - aTmpStr += "<coll>"; - aTmpStr += pColl->GetName(); - - aTmpStr += "("; + aTmpStr += "<coll>" + pColl->GetName() + "("; SwTextFormatColl *pTextColl = static_cast<SwTextFormatColl*>(pColl); if (pTextColl->IsAssignedToListLevelOfOutlineStyle()) @@ -604,20 +587,14 @@ static OUString lcl_dbg_out(const SwNode & rNode) if (pCColl) { - aTmpStr += "<ccoll>"; - aTmpStr += pCColl->GetName(); - aTmpStr += "</ccoll>"; + aTmpStr += "<ccoll>" + pCColl->GetName() + "</ccoll>"; } - aTmpStr += "<frms>"; - aTmpStr += lcl_AnchoredFrames(rNode); - aTmpStr += "</frms>"; + aTmpStr += "<frms>" + lcl_AnchoredFrames(rNode) + "</frms>"; if (bDbgOutPrintAttrSet) { - aTmpStr += "<attrs>"; - aTmpStr += lcl_dbg_out(pTextNode->GetSwAttrSet()); - aTmpStr += "</attrs>"; + aTmpStr += "<attrs>" + lcl_dbg_out(pTextNode->GetSwAttrSet()) + "</attrs>"; } } else if (rNode.IsStartNode()) @@ -733,11 +710,9 @@ const char * dbg_out(const SwNumRule & rRule) static OUString lcl_dbg_out(const SwTextFormatColl & rFormat) { - OUString aResult(rFormat.GetName()); + OUString aResult(rFormat.GetName() + "("); - aResult += "("; - aResult += OUString::number(rFormat.GetAttrOutlineLevel()); - aResult += ")"; + aResult += OUString::number(rFormat.GetAttrOutlineLevel()) + ")"; return aResult; } diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 38b2404c52d8..3dd87d73c75a 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -611,8 +611,7 @@ static void lcl_FormatPostIt( } aStr += SwViewShell::GetShellRes()->aPostItAuthor; aStr += sTmp; - aStr += pField->GetPar1(); - aStr += " "; + aStr += pField->GetPar1() + " "; SvtSysLocale aSysLocale; aStr += /*(LocaleDataWrapper&)*/aSysLocale.GetLocaleData().getDate( pField->GetDate() ); if(pField->GetResolved()) diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx index 4714c45ce1bb..dae424c596eb 100644 --- a/sw/source/core/tox/ToxTextGenerator.cxx +++ b/sw/source/core/tox/ToxTextGenerator.cxx @@ -155,8 +155,7 @@ ToxTextGenerator::GenerateTextForChapterToken(const SwFormToken& chapterToken, c retval += aField.GetNumber(pLayout); // get the string number without pre/postfix } else if (CF_NUMBER_NOPREPST == chapterToken.nChapterFormat || CF_NUM_TITLE == chapterToken.nChapterFormat) { - retval += aField.GetNumber(pLayout); - retval += " "; + retval += aField.GetNumber(pLayout) + " "; retval += aField.GetTitle(pLayout); } else if (CF_TITLE == chapterToken.nChapterFormat) { retval += aField.GetTitle(pLayout); diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index a17f62576072..5893bc2ce75c 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -244,8 +244,7 @@ static OUString GetCellRangeName( SwFrameFormat &rTableFormat, SwUnoCursor &rTab if (!pStartBox) return aRes; - aRes = pStartBox->GetName(); - aRes += ":"; + aRes = pStartBox->GetName() + ":"; if (pEndBox) aRes += pEndBox->GetName(); else @@ -1732,8 +1731,7 @@ OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const OUString& rXML // does cell range consist of more than a single cell? if (!aCellRange.aLowerRight.bIsEmpty) { - aTmp += ":"; - aTmp += sw_GetCellName( aCellRange.aLowerRight.nColumn, + aTmp += ":" + sw_GetCellName( aCellRange.aLowerRight.nColumn, aCellRange.aLowerRight.nRow ); } diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index e6c55e4bc19a..90ae515291c3 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -1878,10 +1878,8 @@ static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt, const SwFrameFormat& rF if (rHTMLWrt.GetOrigFileName()) aFileName = *rHTMLWrt.GetOrigFileName(); INetURLObject aURL(aFileName); - OUString aName(aURL.getBase()); - aName += "_"; - aName += aURL.getExtension(); - aName += "_"; + OUString aName(aURL.getBase() + "_"); + aName += aURL.getExtension() + "_"; aName += OUString::number(aGraphic.GetChecksum(), 16); aURL.setBase(aName); aURL.setExtension("ole"); diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index f543fd279fae..11bd6556e387 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -322,13 +322,11 @@ void SwHTMLWriter::OutFootEndNotes() OUString sFootnoteName; if( m_pFormatFootnote->IsEndNote() ) { - sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote; - sFootnoteName += OUString::number(static_cast<sal_Int32>(++m_nEndNote)); + sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdendnote + OUString::number(static_cast<sal_Int32>(++m_nEndNote)); } else { - sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote; - sFootnoteName += OUString::number(static_cast<sal_Int32>(++m_nFootNote)); + sFootnoteName = OOO_STRING_SVTOOLS_HTML_sdfootnote + OUString::number(static_cast<sal_Int32>(++m_nFootNote)); } if( m_bLFPossible ) diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 29a1e0237d2d..9e87beb61706 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -150,10 +150,8 @@ OUString lcl_CalculateFileName(const OUString* pOrigFileName, const Graphic& rGr if (pOrigFileName) aFileName = *pOrigFileName; INetURLObject aURL(aFileName); - OUString aName(aURL.getBase()); - aName += "_"; - aName += aURL.getExtension(); - aName += "_"; + OUString aName(aURL.getBase() + "_"); + aName += aURL.getExtension() + "_"; aName += OUString::number(rGraphic.GetChecksum(), 16); aURL.setBase(aName); aURL.setExtension(rExtension); diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 70ba0dd85115..edc99691fe54 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -506,27 +506,18 @@ void RtfAttributeOutput::StartRuby(const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby) { WW8Ruby aWW8Ruby(rNode, rRuby, GetExport()); - OUString aStr(FieldString(ww::eEQ)); - aStr += "\\* jc"; - aStr += OUString::number(aWW8Ruby.GetJC()); - - aStr += " \\* \"Font:"; - aStr += aWW8Ruby.GetFontFamily(); - aStr += "\" \\* hps"; - aStr += OUString::number((aWW8Ruby.GetRubyHeight() + 5) / 10); - aStr += " \\o"; + OUString aStr(FieldString(ww::eEQ) + "\\* jc"); + aStr += OUString::number(aWW8Ruby.GetJC()) + " \\* \"Font:"; + aStr += aWW8Ruby.GetFontFamily() + "\" \\* hps"; + aStr += OUString::number((aWW8Ruby.GetRubyHeight() + 5) / 10) + " \\o"; if (aWW8Ruby.GetDirective()) { aStr += "\\a" + OUStringChar(aWW8Ruby.GetDirective()); } - aStr += "(\\s\\up "; - - aStr += OUString::number((aWW8Ruby.GetBaseHeight() + 10) / 20 - 1); - aStr += "("; + aStr += "(\\s\\up " + OUString::number((aWW8Ruby.GetBaseHeight() + 10) / 20 - 1) + "("; EndRun(&rNode, nPos); m_rExport.OutputField(nullptr, ww::eEQ, aStr, FieldFlags::Start | FieldFlags::CmdStart); - aStr = rRuby.GetText(); - aStr += "),"; + aStr = rRuby.GetText() + "),"; m_rExport.OutputField(nullptr, ww::eEQ, aStr, FieldFlags::NONE); } diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 924ed9fbd5ee..bd73cc4ab542 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -832,26 +832,16 @@ const SfxPoolItem& SwWW8AttrIter::GetItem(sal_uInt16 nWhich) const void WW8AttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 /*nPos*/, const SwFormatRuby& rRuby ) { WW8Ruby aWW8Ruby(rNode, rRuby, GetExport()); - OUString aStr( FieldString( ww::eEQ ) ); - aStr += "\\* jc"; - aStr += OUString::number(aWW8Ruby.GetJC()); - - - aStr += " \\* \"Font:"; - aStr += aWW8Ruby.GetFontFamily(); - aStr += "\" \\* hps"; - aStr += OUString::number((aWW8Ruby.GetRubyHeight() + 5) / 10); - aStr += " \\o"; + OUString aStr( FieldString( ww::eEQ ) + "\\* jc" ); + aStr += OUString::number(aWW8Ruby.GetJC()) + " \\* \"Font:"; + aStr += aWW8Ruby.GetFontFamily() + "\" \\* hps"; + aStr += OUString::number((aWW8Ruby.GetRubyHeight() + 5) / 10) + " \\o"; if (aWW8Ruby.GetDirective()) { aStr += OUStringLiteral("\\a") + OUStringChar(aWW8Ruby.GetDirective()); } - aStr += "(\\s\\up "; - - aStr += OUString::number((aWW8Ruby.GetBaseHeight() + 10) / 20 - 1); - aStr += "("; - aStr += rRuby.GetText(); - aStr += ")"; + aStr += "(\\s\\up " + OUString::number((aWW8Ruby.GetBaseHeight() + 10) / 20 - 1) + "("; + aStr += rRuby.GetText() + ")"; // The parameter separator depends on the FIB.lid if ( m_rWW8Export.pFib->getNumDecimalSep() == '.' ) diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 3dcf725cab70..aedbb4bccf51 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -266,8 +266,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl, weld::Button&, void) IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl, weld::Button&, void) { OUString aMessage = m_aStrDelMsg + "\n\n"; - aMessage += m_xLbFormat->get_selected_text(); - aMessage += "\n"; + aMessage += m_xLbFormat->get_selected_text() + "\n"; std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(m_xDialog.get(), VclMessageType::Question, VclButtonsType::OkCancel, m_aStrDelTitle)); diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 2fa0ee8a4055..64ec3bd4e391 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1179,8 +1179,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, xMailDispatcher->addListener( xMailListener ); if(!rMergeDescriptor.bSendAsAttachment && rMergeDescriptor.bSendAsHTML) { - sMailBodyMimeType = "text/html; charset="; - sMailBodyMimeType += OUString::createFromAscii( + sMailBodyMimeType = "text/html; charset=" + OUString::createFromAscii( rtl_getBestMimeCharsetFromTextEncoding( sMailEncoding )); SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get(); sMailEncoding = rHtmlOptions.GetTextEncoding(); diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx index cf9082253f5b..f8b96e99f2c0 100644 --- a/sw/source/uibase/docvw/edtwin2.cxx +++ b/sw/source/uibase/docvw/edtwin2.cxx @@ -151,8 +151,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) switch( aContentAtPos.eContentAtPos ) { case IsAttrAtPos::TableBoxFml: - sText = "= "; - sText += static_cast<const SwTableBoxFormula*>(aContentAtPos.aFnd.pAttr)->GetFormula(); + sText = "= " + static_cast<const SwTableBoxFormula*>(aContentAtPos.aFnd.pAttr)->GetFormula(); break; #ifdef DBG_UTIL case IsAttrAtPos::TableBoxValue: diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 10530cffd435..be7a42416eae 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -1554,8 +1554,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) if( rShell.IsCursorInTable() ) { // table name + cell coordinate - sStr = rShell.GetTableFormat()->GetName(); - sStr += ":"; + sStr = rShell.GetTableFormat()->GetName() + ":"; sStr += rShell.GetBoxNms(); } else diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 19c71ccea2db..f7367f429ab9 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -4056,8 +4056,7 @@ Sequence< OUString > SwXLinkNameAccessWrapper::getElementNames() const SwNumRule* pOutlRule = pDoc->GetOutlineNumRule(); for (size_t i = 0; i < nOutlineCount; ++i) { - OUString sEntry = lcl_CreateOutlineString(i, rOutlineNodes, pOutlRule); - sEntry += "|outline"; + OUString sEntry = lcl_CreateOutlineString(i, rOutlineNodes, pOutlRule) + "|outline"; pResArr[i] = sEntry; } } diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 183553d266f9..47a6852df369 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1932,8 +1932,7 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, nLevel++ ) { const SwNumberTree::tSwNumTreeNumber nVal = aNumVector[nLevel] + 1; - sEntry += OUString::number( nVal - pOutlRule->Get(nLevel).GetStart() ); - sEntry += "."; + sEntry += OUString::number( nVal - pOutlRule->Get(nLevel).GetStart() ) + "."; } } sEntry += pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineText(nPos, pWrtShell->GetLayout(), false); diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 0046f06a66f9..c2e02c7daf29 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -964,8 +964,7 @@ void SwNavigationPI::UpdateListBox() // #i53333# don't show help pages here if ( !pDoc->IsHelpDocument() ) { - OUString sEntry = pDoc->GetTitle(); - sEntry += " ("; + OUString sEntry = pDoc->GetTitle() + " ("; if (pView == pActView) { nAct = nCount; diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index 347f2f87c0e6..eeb01bf62dac 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -611,9 +611,7 @@ OUString VCLXAccessibleComponent::getAccessibleName( ) { aName = GetWindow()->GetAccessibleName(); #if OSL_DEBUG_LEVEL > 0 - aName += " (Type = "; - aName += OUString::number(static_cast<sal_Int32>(GetWindow()->GetType())); - aName += ")"; + aName += " (Type = " + OUString::number(static_cast<sal_Int32>(GetWindow()->GetType())) + ")"; #endif } return aName; diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index a32e8d69607a..ea5e23d38f9b 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -685,8 +685,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, try { OUString aOldValuesKey - = makeHierarchalNameSegment( rOldKey ); - aOldValuesKey += "/Values"; + = makeHierarchalNameSegment( rOldKey ) + "/Values"; Reference< XNameAccess > xOldNameAccess; xRootHierNameAccess->getByHierarchicalName( @@ -705,8 +704,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey, if ( aElems.hasElements() ) { OUString aNewValuesKey - = makeHierarchalNameSegment( rNewKey ); - aNewValuesKey += "/Values"; + = makeHierarchalNameSegment( rNewKey ) + "/Values"; Reference< XSingleServiceFactory > xNewFac; xRootHierNameAccess->getByHierarchicalName( @@ -1189,8 +1187,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aProperty m_pImpl->m_pCreator->getRootConfigReadAccess(), UNO_QUERY ); if ( xRootHierNameAccess.is() ) { - OUString aFullPropName( getFullKey() ); - aFullPropName += "/"; + OUString aFullPropName( getFullKey() + "/" ); aFullPropName += makeHierarchalNameSegment( aPropertyName ); // Does property exist? @@ -1285,10 +1282,8 @@ Any SAL_CALL PersistentPropertySet::getPropertyValue( m_pImpl->m_pCreator->getRootConfigReadAccess(), UNO_QUERY ); if ( xNameAccess.is() ) { - OUString aFullPropName( getFullKey() ); - aFullPropName += "/"; - aFullPropName += makeHierarchalNameSegment( PropertyName ); - aFullPropName += "/Value"; + OUString aFullPropName( getFullKey() + "/" ); + aFullPropName += makeHierarchalNameSegment( PropertyName ) + "/Value"; try { return xNameAccess->getByHierarchicalName( aFullPropName ); @@ -1863,8 +1858,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValues( { std::vector< PropertyChangeEvent > aEvents; - OUString aFullPropNamePrefix( getFullKey() ); - aFullPropNamePrefix += "/"; + OUString aFullPropNamePrefix( getFullKey() + "/" ); // Iterate over given property value sequence. for ( const PropertyValue& rNewValue : aProps ) @@ -2210,8 +2204,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName( UNO_QUERY ); if ( xRootHierNameAccess.is() ) { - OUString aFullPropName( m_pOwner->getFullKey() ); - aFullPropName += "/"; + OUString aFullPropName( m_pOwner->getFullKey() + "/" ); aFullPropName += makeHierarchalNameSegment( aName ); // Does property exist? @@ -2290,8 +2283,7 @@ sal_Bool SAL_CALL PropertySetInfo_Impl::hasPropertyByName( UNO_QUERY ); if ( xRootHierNameAccess.is() ) { - OUString aFullPropName( m_pOwner->getFullKey() ); - aFullPropName += "/"; + OUString aFullPropName( m_pOwner->getFullKey() + "/" ); aFullPropName += makeHierarchalNameSegment( Name ); return xRootHierNameAccess->hasByHierarchicalName( aFullPropName ); diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 5a15896cfca5..707f0e31a1f7 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -698,8 +698,7 @@ HierarchyContent::makeNewIdentifier( const OUString& rTitle ) // Assemble new content identifier... HierarchyUri aUri( m_xIdentifier->getContentIdentifier() ); - OUString aNewURL = aUri.getParentUri(); - aNewURL += "/"; + OUString aNewURL = aUri.getParentUri() + "/"; aNewURL += ::ucb_impl::urihelper::encodeSegment( rTitle ); return uno::Reference< ucb::XContentIdentifier >( @@ -1347,8 +1346,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, do { - OUString aNewId = xId->getContentIdentifier(); - aNewId += "_"; + OUString aNewId = xId->getContentIdentifier() + "_"; aNewId += OUString::number( ++nTry ); xId = new ::ucbhelper::ContentIdentifier( aNewId ); } diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 8b645a0b70fb..08e5129b1cfb 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -647,8 +647,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) getContentType( m_aUri.getScheme(), false ) ) ) return uno::Reference< ucb::XContent >(); - OUString aURL = m_aUri.getUri(); - aURL += "/"; + OUString aURL = m_aUri.getUri() + "/"; if ( Info.Type.equalsIgnoreAsciiCase( getContentType( m_aUri.getScheme(), true ) ) ) @@ -1256,8 +1255,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( uno::Reference< ucb::XContentIdentifier > xOldId = m_xIdentifier; // Assemble new content identifier... - OUString aNewURL = m_aUri.getParentUri(); - aNewURL += "/"; + OUString aNewURL = m_aUri.getParentUri() + "/"; aNewURL += ::ucb_impl::urihelper::encodeSegment( aNewTitle ); uno::Reference< ucb::XContentIdentifier > xNewId = new ::ucbhelper::ContentIdentifier( aNewURL ); @@ -1536,8 +1534,7 @@ void Content::insert( do { - OUString aNew = aNewUri.getUri(); - aNew += "_"; + OUString aNew = aNewUri.getUri() + "_"; aNew += OUString::number( ++nTry ); aNewUri.setUri( aNew ); } @@ -1692,8 +1689,7 @@ void Content::transfer( } // Is source not a parent of me / not me? - OUString aId = m_aUri.getParentUri(); - aId += "/"; + OUString aId = m_aUri.getParentUri() + "/"; if ( rInfo.SourceURL.getLength() <= aId.getLength() ) { diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index c0492804e119..36f17c5cebb6 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4511,8 +4511,7 @@ void DomainMapper_Impl::CloseFieldCommand() } else { - sServiceName += "TextField."; - sServiceName += OUString::createFromAscii(aIt->second.cFieldServiceName ); + sServiceName += "TextField." + OUString::createFromAscii(aIt->second.cFieldServiceName ); } #ifdef DBG_UTIL diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 8821edab6381..59dcf10f60a5 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -1470,8 +1470,7 @@ void SvXMLExport::ExportScripts_() // export Basic macros (only for FlatXML) if ( mnExportFlags & SvXMLExportFlags::EMBEDDED ) { - OUString aValue( GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_OOO ) ); - aValue += ":Basic"; + OUString aValue( GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_OOO ) + ":Basic" ); AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, aValue ); SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_SCRIPT, true, true ); diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 212f6060edae..d5b7d906ecfc 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -1591,9 +1591,8 @@ void SdXMLExport::ImpWritePresentationStyles() rtl::Reference<XMLStyleExport> aStEx(new XMLStyleExport(*this, GetAutoStylePool().get())); const rtl::Reference< SvXMLExportPropertyMapper > aMapperRef( GetPropertySetMapper() ); - OUString aPrefix( xNamed->getName() ); + OUString aPrefix( xNamed->getName() + "-" ); - aPrefix += "-"; aStEx->exportStyleFamily(xNamed->getName(), OUString(XML_STYLE_FAMILY_SD_PRESENTATION_NAME), aMapperRef, false, diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index a6f3592e015e..e44881f0aa62 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -1121,8 +1121,7 @@ void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext const & rMas try { uno::Reference< container::XNameAccess > xMasterPageStyles( rStyleFamilies->getByName(rMaster.GetDisplayName()), UNO_QUERY_THROW ); - OUString sPrefix(rMaster.GetDisplayName()); - sPrefix += "-"; + OUString sPrefix(rMaster.GetDisplayName() + "-"); ImpSetGraphicStyles(xMasterPageStyles, XML_STYLE_FAMILY_SD_PRESENTATION_ID, sPrefix); } catch (const uno::Exception&) diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx index 033a99006394..d3c9232f0317 100644 --- a/xmloff/source/script/xmlscripti.cxx +++ b/xmloff/source/script/xmlscripti.cxx @@ -73,8 +73,7 @@ SvXMLImportContextRef XMLScriptChildContext::CreateChildContext( if ( m_xDocumentScripts.is() ) { // document supports embedding scripts/macros - OUString aBasic( GetImport().GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_OOO ) ); - aBasic += ":Basic"; + OUString aBasic( GetImport().GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_OOO ) + ":Basic" ); if ( m_aLanguage == aBasic && nPrefix == XML_NAMESPACE_OOO && IsXMLToken( rLocalName, XML_LIBRARIES ) ) xContext = new XMLBasicImportContext( GetImport(), nPrefix, rLocalName, m_xModel ); @@ -118,8 +117,7 @@ SvXMLImportContextRef XMLScriptContext::CreateChildContext( } else if ( IsXMLToken( rLName, XML_SCRIPT ) ) { - OUString aAttrName( GetImport().GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_SCRIPT ) ); - aAttrName += ":language"; + OUString aAttrName( GetImport().GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_SCRIPT ) + ":language" ); if ( xAttrList.is() ) { OUString aLanguage = xAttrList->getValueByName( aAttrName ); diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 55743c62facb..cb7ce254dd7e 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -187,13 +187,11 @@ CertificateViewerDetailsTP::CertificateViewerDetailsTP(weld::Container* pParent, DateTime aDateTime( DateTime::EMPTY ); utl::typeConvert( xCert->getNotValidBefore(), aDateTime ); - aLBEntry = Application::GetSettings().GetUILocaleDataWrapper().getDate(Date(aDateTime.GetDate())); - aLBEntry += " "; + aLBEntry = Application::GetSettings().GetUILocaleDataWrapper().getDate(Date(aDateTime.GetDate())) + " "; aLBEntry += Application::GetSettings().GetUILocaleDataWrapper().getTime(tools::Time(aDateTime.GetTime())); InsertElement( XsResId( STR_VALIDFROM ), aLBEntry, aLBEntry ); utl::typeConvert( xCert->getNotValidAfter(), aDateTime ); - aLBEntry = Application::GetSettings().GetUILocaleDataWrapper().getDate(Date(aDateTime.GetDate()) ); - aLBEntry += " "; + aLBEntry = Application::GetSettings().GetUILocaleDataWrapper().getDate(Date(aDateTime.GetDate()) ) + " "; aLBEntry += Application::GetSettings().GetUILocaleDataWrapper().getTime(tools::Time(aDateTime.GetTime())); InsertElement( XsResId( STR_VALIDTO ), aLBEntry, aLBEntry ); |