diff options
104 files changed, 278 insertions, 333 deletions
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 0de22676121a..83411df39171 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -1681,11 +1681,11 @@ uno::Any SAL_CALL ChartController::getSelection() sal_Int32 nPos = aCID.lastIndexOf('/'); OUString sFirst = aCID.copy(0, nPos); OUString sSecond = aCID.copy(nPos); - aCID = sFirst; - aCID += "/Draggable=" + OUString::number(static_cast<int>(isSelectedObjectDraggable())); - aCID += ":Resizable=" + OUString::number(static_cast<int>(isSelectedObjectResizable())); - aCID += ":Rotatable=" + OUString::number(static_cast<int>(isSelectedObjectRotatable())); - aCID += sSecond; + aCID = sFirst + + "/Draggable=" + OUString::number(static_cast<int>(isSelectedObjectDraggable())) + + ":Resizable=" + OUString::number(static_cast<int>(isSelectedObjectResizable())) + + ":Rotatable=" + OUString::number(static_cast<int>(isSelectedObjectRotatable())) + + sSecond; } aReturn <<= aCID; } diff --git a/cui/source/customize/SvxConfigPageHelper.cxx b/cui/source/customize/SvxConfigPageHelper.cxx index cee19268467e..f59ccb118adc 100644 --- a/cui/source/customize/SvxConfigPageHelper.cxx +++ b/cui/source/customize/SvxConfigPageHelper.cxx @@ -196,10 +196,9 @@ sal_uInt32 SvxConfigPageHelper::generateRandomValue() OUString SvxConfigPageHelper::generateCustomURL( SvxEntries* entries ) { - OUString url = OUStringLiteral(ITEM_TOOLBAR_URL) + CUSTOM_TOOLBAR_STR; - + OUString url = OUStringLiteral(ITEM_TOOLBAR_URL) + CUSTOM_TOOLBAR_STR + // use a random number to minimize possible clash with existing custom toolbars - url += OUString::number( generateRandomValue(), 16 ); + OUString::number( generateRandomValue(), 16 ); // now check is there is an already existing entry with this url bool bFoundEntry = false; diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index ab63f7073a7e..265ee489912e 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -460,9 +460,8 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl, weld::Button&, void) if ((pInfo->GetId() == nId) && (pInfo->GetThemeName() != m_pThm->GetName())) { - OUString aStr( CuiResId( RID_SVXSTR_GALLERY_ID_EXISTS ) ); - - aStr += " (" + pInfo->GetThemeName() + ")"; + OUString aStr = CuiResId( RID_SVXSTR_GALLERY_ID_EXISTS ) + + " (" + pInfo->GetThemeName() + ")"; std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(m_xDialog.get(), VclMessageType::Info, VclButtonsType::Ok, diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 7a8f2d9cc8b3..81f7a549d8a3 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -1728,9 +1728,8 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert if ( !sFilter.isEmpty() && !aSQL.isEmpty() ) { - OUString sTemp(L_BRACKET + sFilter + R_BRACKET); - sTemp += andCriteria ? OUStringLiteral(STR_AND) : OUStringLiteral(STR_OR); - sFilter = sTemp; + sFilter = L_BRACKET + sFilter + R_BRACKET + + (andCriteria ? OUStringLiteral(STR_AND) : OUStringLiteral(STR_OR)); } sFilter += aSQL; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 04a4da3a4aa3..c5cb06c6c645 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -1016,8 +1016,7 @@ void ODbDataSourceAdministrationHelper::convertUrl(SfxItemSet& _rDest) } else { - OUString sNewUrl = pCollection->getPrefix(eType); - sNewUrl += sUrlPart; + OUString sNewUrl = pCollection->getPrefix(eType) + sUrlPart; _rDest.Put( SfxStringItem( DSID_CONNECTURL, sNewUrl ) ); } } diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index b4000c4ba8b1..bd915b0a5547 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -104,8 +104,8 @@ namespace dbaui aReturn.bEnabled = isEditable() && GetUndoManager().GetUndoActionCount() != 0; if ( aReturn.bEnabled ) { - OUString sUndo(DBA_RES(STR_UNDO_COLON) + " "); - sUndo += GetUndoManager().GetUndoActionComment(); + OUString sUndo = DBA_RES(STR_UNDO_COLON) + " " + + GetUndoManager().GetUndoActionComment(); aReturn.sTitle = sUndo; } break; @@ -114,8 +114,8 @@ namespace dbaui aReturn.bEnabled = isEditable() && GetUndoManager().GetRedoActionCount() != 0; if ( aReturn.bEnabled ) { - OUString sRedo(DBA_RES(STR_REDO_COLON) + " "); - sRedo += GetUndoManager().GetRedoActionComment(); + OUString sRedo = DBA_RES(STR_REDO_COLON) + " " + + GetUndoManager().GetRedoActionComment(); aReturn.sTitle = sRedo; } break; diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index e4b6ad431ea4..231d8fd6a701 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2927,8 +2927,7 @@ std::unique_ptr<OSQLParseNode> OQueryDesignView::getPredicateTreeFromEntry(const if ( nType == DataType::OTHER || (sFunction.isEmpty() && pEntry->isNumericOrAggregateFunction()) ) { // first try the international version - OUString sSql; - sSql += "SELECT * FROM x WHERE " + pEntry->GetField() + _sCriteria; + OUString sSql = "SELECT * FROM x WHERE " + pEntry->GetField() + _sCriteria; std::unique_ptr<OSQLParseNode> pParseNode( rParser.parseTree( _rsErrorMessage, sSql, true ) ); nType = DataType::DOUBLE; if (pParseNode) diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index 00fff9797f28..3be1c2d46869 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -655,12 +655,12 @@ OUString SvxBorderLine::GetValueString(MapUnit eSrcUnit, aStr += GetMetricText( static_cast<long>(GetInWidth()), eSrcUnit, eDestUnit, pIntl ); if ( bMetricStr ) aStr += sMetric; - aStr += cpDelim; - aStr += GetMetricText( static_cast<long>(GetOutWidth()), eSrcUnit, eDestUnit, pIntl ); + aStr += cpDelim + + GetMetricText( static_cast<long>(GetOutWidth()), eSrcUnit, eDestUnit, pIntl ); if ( bMetricStr ) aStr += sMetric; - aStr += cpDelim; - aStr += GetMetricText( static_cast<long>(GetDistance()), eSrcUnit, eDestUnit, pIntl ); + aStr += cpDelim + + GetMetricText( static_cast<long>(GetDistance()), eSrcUnit, eDestUnit, pIntl ); if ( bMetricStr ) aStr += sMetric; } diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 0cad7f935107..7913d3704e73 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -2489,8 +2489,8 @@ void SVGExport::writeMtf( const GDIMetaFile& rMtf ) aAttr = OUString::number( aSize.Height() ) + "mm"; AddAttribute( XML_NAMESPACE_NONE, "height", aAttr ); - aAttr = "0 0 " + OUString::number( aSize.Width() * 100L ) + " "; - aAttr += OUString::number( aSize.Height() * 100L ); + aAttr = "0 0 " + OUString::number( aSize.Width() * 100L ) + " " + + OUString::number( aSize.Height() * 100L ); AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr ); AddAttribute( XML_NAMESPACE_NONE, "version", "1.1" ); diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index b2d018befbd2..21ab45c0ee6b 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -233,12 +233,10 @@ void ArgInput::UpdateAccessibleNames() { OUString aArgName = ":" + pFtArg->get_label(); - OUString aName = pBtnFx->get_tooltip_text(); - aName += aArgName; + OUString aName = pBtnFx->get_tooltip_text() + aArgName; pBtnFx->set_accessible_name(aName); - aName = pRefBtn->GetWidget()->get_tooltip_text(); - aName += aArgName; + aName = pRefBtn->GetWidget()->get_tooltip_text() + aArgName; pRefBtn->GetWidget()->set_accessible_name(aName); } diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index c4f6a8f1fdc2..9d8f1be6e0b2 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -119,8 +119,8 @@ void ParaWin::UpdateArgDesc( sal_uInt16 nArg ) { sal_uInt16 nRealArg = (nArg < aVisibleArgMapping.size()) ? aVisibleArgMapping[nArg] : nArg; aArgDesc = pFuncDesc->getParameterDescription(nRealArg); - aArgName = pFuncDesc->getParameterName(nRealArg) + " "; - aArgName += (pFuncDesc->isParameterOptional(nRealArg)) ? m_sOptional : m_sRequired ; + aArgName = pFuncDesc->getParameterName(nRealArg) + " " + + ((pFuncDesc->isParameterOptional(nRealArg)) ? m_sOptional : m_sRequired); } else if ( nArgs < PAIRED_VAR_ARGS ) { @@ -183,8 +183,8 @@ void ParaWin::UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i ) sal_uInt16 nVarArgsStart = pFuncDesc->getVarArgsStart(); if ( nArg >= nVarArgsStart ) { - OUString aArgName( pFuncDesc->getParameterName(nRealArg) ); - aArgName += OUString::number(nArg-nVarArgsStart+1); + OUString aArgName = pFuncDesc->getParameterName(nRealArg) + + OUString::number(nArg-nVarArgsStart+1); SetArgName( i, aArgName ); } else @@ -206,8 +206,8 @@ void ParaWin::UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i ) sal_uInt16 nVarArgsStart = pFuncDesc->getVarArgsStart(); if ( nArg >= nVarArgsStart ) { - OUString aArgName( pFuncDesc->getParameterName(nRealArg) ); - aArgName += OUString::number( (nArg-nVarArgsStart)/2 + 1 ); + OUString aArgName = pFuncDesc->getParameterName(nRealArg) + + OUString::number( (nArg-nVarArgsStart)/2 + 1 ); SetArgName( i, aArgName ); } else diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 8b9384f672fc..94a2dee58d78 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -230,7 +230,8 @@ void SAL_CALL OReadMenuDocumentHandler::endDocument() { if ( m_nElementDepth > 0 ) { - OUString aErrorMessage = getErrorLineString() + "A closing element is missing!"; + OUString aErrorMessage = getErrorLineString() + + "A closing element is missing!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -276,12 +277,14 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) m_xReader.clear(); if ( m_eReaderMode == ReaderMode::MenuBar && aName != ELEMENT_MENUBAR ) { - OUString aErrorMessage = getErrorLineString() + "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() + "closing element menupopup expected!"; + OUString aErrorMessage = getErrorLineString() + + "closing element menupopup expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } m_eReaderMode = ReaderMode::None; @@ -381,7 +384,8 @@ void SAL_CALL OReadMenuBarHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString() + "attribute id for element menu required!"; + OUString aErrorMessage = getErrorLineString() + + "attribute id for element menu required!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -391,7 +395,8 @@ void SAL_CALL OReadMenuBarHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString() + "element menu expected!"; + OUString aErrorMessage = getErrorLineString() + + "element menu expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -412,7 +417,8 @@ void OReadMenuBarHandler::endElement( const OUString& aName ) m_bMenuMode = false; if ( aName != ELEMENT_MENU ) { - OUString aErrorMessage = getErrorLineString() + "closing element menu expected!"; + OUString aErrorMessage = getErrorLineString() + + "closing element menu expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -460,7 +466,8 @@ void SAL_CALL OReadMenuHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString() + "unknown element found!"; + OUString aErrorMessage = getErrorLineString() + + "unknown element found!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -481,7 +488,8 @@ void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) m_bMenuPopupMode = false; if ( aName != ELEMENT_MENUPOPUP ) { - OUString aErrorMessage = getErrorLineString() + "closing element menupopup expected!"; + OUString aErrorMessage = getErrorLineString() + + "closing element menupopup expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -577,7 +585,8 @@ void SAL_CALL OReadMenuPopupHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString() + "attribute id for element menu required!"; + OUString aErrorMessage = getErrorLineString() + + "attribute id for element menu required!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -645,7 +654,8 @@ void SAL_CALL OReadMenuPopupHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString() + "unknown element found!"; + OUString aErrorMessage = getErrorLineString() + + "unknown element found!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -666,7 +676,8 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) m_bMenuMode = false; if ( aName != ELEMENT_MENU ) { - OUString aErrorMessage = getErrorLineString() + "closing element menu expected!"; + OUString aErrorMessage = getErrorLineString() + + "closing element menu expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -679,7 +690,8 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) { if ( aName != ELEMENT_MENUITEM ) { - OUString aErrorMessage = getErrorLineString() + "closing element menuitem expected!"; + OUString aErrorMessage = getErrorLineString() + + "closing element menuitem expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -687,7 +699,8 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) { if ( aName != ELEMENT_MENUSEPARATOR ) { - OUString aErrorMessage = getErrorLineString() + "closing element menuseparator expected!"; + OUString aErrorMessage = getErrorLineString() + + "closing element menuseparator expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index b168a5e37b3a..a7eae7243835 100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx @@ -256,8 +256,8 @@ static OUString transliterate_titlecase_Impl( // now we can properly use toTitle to get the expected result for the resolved string. // The rest of the text should just become lowercase. - aRes = xCharClassImpl->toTitle( aResolvedLigature, 0, nResolvedLen, rLocale ); - aRes += xCharClassImpl->toLower( aText, 1, aText.getLength() - 1, rLocale ); + aRes = xCharClassImpl->toTitle( aResolvedLigature, 0, nResolvedLen, rLocale ) + + xCharClassImpl->toLower( aText, 1, aText.getLength() - 1, rLocale ); offset.realloc( aRes.getLength() ); sal_Int32* pOffset = std::fill_n(offset.begin(), nResolvedLen, 0); diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx index 6523d6408599..ada34a6e2016 100644 --- a/io/source/connector/ctr_socket.cxx +++ b/io/source/connector/ctr_socket.cxx @@ -163,7 +163,7 @@ namespace stoc_connector { { if( m_socket.write( seq.getConstArray() , seq.getLength() ) != seq.getLength() ) { - OUString message = "ctr_socket.cxx:SocketConnection::write: error - "+ + OUString message = "ctr_socket.cxx:SocketConnection::write: error - " + m_socket.getErrorAsString(); IOException ioException(message, static_cast<XConnection *>(this)); diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index aad0388bd23d..5cf0972e645e 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -322,8 +322,8 @@ OString MergeDataFile::CreateKey(const OString& rTYP, const OString& rGID, const OString& rLID, const OString& rFilename, bool bCaseSensitive) { static const char sStroke[] = "-"; - OString sKey = rTYP + sStroke + rGID + sStroke + rLID + sStroke; - sKey += lcl_NormalizeFilename(rFilename); + OString sKey = rTYP + sStroke + rGID + sStroke + rLID + sStroke + + lcl_NormalizeFilename(rFilename); if(bCaseSensitive) return sKey; // officecfg case sensitive identifier return sKey.toAsciiUpperCase(); diff --git a/lotuswordpro/source/filter/lwpbookmarkmgr.cxx b/lotuswordpro/source/filter/lwpbookmarkmgr.cxx index 3ce1ef05355e..140ba4f499b3 100644 --- a/lotuswordpro/source/filter/lwpbookmarkmgr.cxx +++ b/lotuswordpro/source/filter/lwpbookmarkmgr.cxx @@ -65,8 +65,7 @@ void LwpBookmarkMgr::AddXFBookmarkStart(const OUString& sName,XFBookmarkStart* p else //have exist the same bookmark name { auto xFind = iter->second; - OUString totalName = xFind->GetDivision() + ":"; - totalName += xFind->GetName(); + OUString totalName = xFind->GetDivision() + ":" + xFind->GetName(); xFind->SetName(totalName); m_MapStart[totalName] = xFind; m_MapStart[sName] = pMark; @@ -82,8 +81,7 @@ void LwpBookmarkMgr::AddXFBookmarkEnd(const OUString& sName,XFBookmarkEnd* pMark else //have exist the same bookmark name { auto xFind = iter->second; - OUString totalName = xFind->GetDivision() + ":"; - totalName += xFind->GetName(); + OUString totalName = xFind->GetDivision() + ":" + xFind->GetName(); xFind->SetName(totalName); m_MapEnd[totalName] = xFind; m_MapEnd[sName] = pMark; diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx index fa8f39fa0bb4..f79bcaab6bcb 100644 --- a/lotuswordpro/source/filter/lwptblformula.cxx +++ b/lotuswordpro/source/filter/lwptblformula.cxx @@ -461,9 +461,8 @@ OUString LwpFormulaOp::ToString(LwpTableLayout* pCellsMap) aFormula += m_aArgs[1]->ToArgString(pCellsMap) + " "; OUString aFuncName = LwpFormulaTools::GetName(m_nTokenType); - aFormula += aFuncName + " "; - - aFormula += m_aArgs[0]->ToArgString(pCellsMap); + aFormula += aFuncName + " " + + m_aArgs[0]->ToArgString(pCellsMap); } else { @@ -481,8 +480,8 @@ OUString LwpFormulaUnaryOp::ToString(LwpTableLayout* pCellsMap) if (1==m_aArgs.size()) { OUString aFuncName = LwpFormulaTools::GetName(m_nTokenType); - aFormula += aFuncName; - aFormula += m_aArgs[0]->ToArgString(pCellsMap); + aFormula += aFuncName + + m_aArgs[0]->ToArgString(pCellsMap); } else { diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index ce98a6ea45a5..6dfccb71d1ea 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -435,8 +435,8 @@ static bool lcl_HFPresentation else { aText += GetMetricText( static_cast<long>(nLeftMargin), - eCoreMetric, ePresentationMetric, &rIntl ); - aText += " " + EditResId(GetMetricId(ePresentationMetric)); + eCoreMetric, ePresentationMetric, &rIntl ) + + " " + EditResId(GetMetricId(ePresentationMetric)); } aText += cpDelim + // We don't have a nPropFirstLineOfst @@ -449,8 +449,8 @@ static bool lcl_HFPresentation else { aText += GetMetricText( static_cast<long>(nRightMargin), - eCoreMetric, ePresentationMetric, &rIntl ); - aText += " " + EditResId(GetMetricId(ePresentationMetric)); + eCoreMetric, ePresentationMetric, &rIntl ) + + " " + EditResId(GetMetricId(ePresentationMetric)); } } break; diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 056ad097a3d4..f6414450b55d 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -169,9 +169,7 @@ void ScDocument::MakeTable( SCTAB nTab,bool _bNeedsNameCheck ) { // Get Custom prefix const ScDefaultsOptions& rOpt = SC_MOD()->GetDefaultsOptions(); - OUString aString = rOpt.GetInitTabPrefix(); - - aString += OUString::number(nTab+1); + OUString aString = rOpt.GetInitTabPrefix() + OUString::number(nTab+1); if ( _bNeedsNameCheck ) CreateValidTabName( aString ); // no doubles if (nTab < static_cast<SCTAB>(maTabs.size())) diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index f26f3d086e34..ed0bd17537a5 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -2133,8 +2133,7 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam ) DBShowRow(aRowEntry.nDestRow, true); // insert label - OUString label = ScResId(STR_TABLE_GRAND) + " "; - label += ScResId(lcl_GetSubTotalStrId(pResFunc[0])); + OUString label = ScResId(STR_TABLE_GRAND) + " " + ScResId(lcl_GetSubTotalStrId(pResFunc[0])); SetString(nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestRow, nTab, label); ApplyStyle(nGroupCol[aRowEntry.nGroupNo], aRowEntry.nDestRow, pStyle); } diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index c095d3a61c15..f0c755fa1b8c 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -4070,8 +4070,7 @@ void ScCompiler::AutoCorrectParsedSymbol() else nRefs--; } - aSymbol = aSym.makeStringAndClear(); - aSymbol += aTmp1; + aSymbol = aSym.makeStringAndClear() + aTmp1; } else bColons = false; diff --git a/sc/source/core/tool/formulalogger.cxx b/sc/source/core/tool/formulalogger.cxx index 1de0eaa3fee0..eeec1f81189b 100644 --- a/sc/source/core/tool/formulalogger.cxx +++ b/sc/source/core/tool/formulalogger.cxx @@ -343,9 +343,8 @@ FormulaLogger::GroupScope FormulaLogger::enterGroup( if (aName.isEmpty()) aName = "-"; // unsaved document. - OUString aGroupPrefix = aName + - ": formula-group: "; - aGroupPrefix += rCell.aPos.Format(ScRefFlags::VALID | ScRefFlags::TAB_3D, &rDoc, rDoc.GetAddressConvention()) + ": "; + OUString aGroupPrefix = aName + ": formula-group: " + + 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/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index a2b8dc5a6fac..685a2cfe8689 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -1446,8 +1446,7 @@ void ScInterpreter::ScAmpersand() pResMat->PutError( nErr, i, j); else { - OUString aTmp = sStr; - aTmp += pMat->GetString(*pFormatter, i, j).getString(); + OUString aTmp = sStr + pMat->GetString(*pFormatter, i, j).getString(); pResMat->PutString(mrStrPool.intern(aTmp), i, j); } } @@ -1462,8 +1461,7 @@ void ScInterpreter::ScAmpersand() pResMat->PutError( nErr, i, j); else { - OUString aTmp = pMat->GetString(*pFormatter, i, j).getString(); - aTmp += sStr; + OUString aTmp = pMat->GetString(*pFormatter, i, j).getString() + sStr; pResMat->PutString(mrStrPool.intern(aTmp), i, j); } } diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx index 5896ec8dfd56..07d658ceb464 100644 --- a/sc/source/core/tool/reffind.cxx +++ b/sc/source/core/tool/reffind.cxx @@ -324,8 +324,7 @@ void ScRefFinder::ToggleRel( sal_Int32 nStartPos, sal_Int32 nEndPos ) nLoopStart = nEEnd; } - OUString aTotal = maFormula.copy(0, nStartPos); - aTotal += aResult.makeStringAndClear(); + OUString aTotal = maFormula.copy(0, nStartPos) + aResult.makeStringAndClear(); if (nEndPos < maFormula.getLength()-1) aTotal += maFormula.copy(nEndPos+1); diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index f90051af41ad..8d1dca1b0a9c 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -312,9 +312,7 @@ OUString ScfTools::GetNameFromHTMLIndex( sal_uInt32 nIndex ) OUString ScfTools::GetNameFromHTMLName( const OUString& rTabName ) { - OUString aName( GetHTMLNamePrefix() ); - aName += rTabName; - return aName; + return GetHTMLNamePrefix() + rTabName; } bool ScfTools::IsHTMLDocName( const OUString& rSource ) diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index f40bea0967b7..a31caa8e31ca 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -1273,8 +1273,7 @@ void ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm, SvFileStream aTmp( aFileUrl.PathToFileName(), StreamMode::READ ); OUString aSrc = rFileNm; - OUString aDest = aTargetUrl.GetPartBeforeLastName(); - aDest += aFileUrl.GetLastName(); + OUString aDest = aTargetUrl.GetPartBeforeLastName() + aFileUrl.GetLastName(); SfxMedium aMedium( aDest, StreamMode::WRITE | StreamMode::SHARE_DENYNONE ); diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index a3de47cadefa..ab65dbe732d3 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.cxx @@ -250,16 +250,16 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt ) case 0x03: // Date: Day, Month //fDate;dfDayMonthLong; eType = SvNumFormatType::DATE; - aFormString = pFormTable->GetKeyword( eLanguage, NF_KEY_DD); - aFormString += pFormTable->GetDateSep(); // matches last eLanguage - aFormString += pFormTable->GetKeyword( eLanguage, NF_KEY_MMMM); + aFormString = pFormTable->GetKeyword( eLanguage, NF_KEY_DD) + + pFormTable->GetDateSep() + // matches last eLanguage + pFormTable->GetKeyword( eLanguage, NF_KEY_MMMM); break; case 0x04: // Date: Month, Year //fDate;dfMonthYearLong; eType = SvNumFormatType::DATE; - aFormString = pFormTable->GetKeyword( eLanguage, NF_KEY_MM); - aFormString += pFormTable->GetDateSep(); // matches last eLanguage - aFormString += pFormTable->GetKeyword( eLanguage, NF_KEY_YYYY); + aFormString = pFormTable->GetKeyword( eLanguage, NF_KEY_MM) + + pFormTable->GetDateSep() + // matches last eLanguage + pFormTable->GetKeyword( eLanguage, NF_KEY_YYYY); break; case 0x05: // Text formats //fString;nSt; diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx index b59ce7f664ab..b2162cb3f26f 100644 --- a/sc/source/filter/qpro/qpro.cxx +++ b/sc/source/filter/qpro/qpro.cxx @@ -181,8 +181,7 @@ ErrCode ScQProReader::parse( ScDocument *pDoc ) { if( nTab < 26 ) { - OUString aName; - aName += OUStringChar( sal_Unicode('A' + nTab) ); + OUString aName = OUStringChar( sal_Unicode('A' + nTab) ); if (!nTab) pDoc->RenameTab( nTab, aName ); else diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 9042fe4676e4..956b1db6bbc8 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -491,13 +491,13 @@ uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes() if (mpViewShell) { OUString strFor = mpViewShell->GetFormula(maCellAddress) ; - strFor = strFor.replaceAt(0,1,""); + strFor = strFor.copy(1); strFor = ReplaceFourChar(strFor); strFor = "Formula:" + strFor + - ";Note:"; - strFor += ReplaceFourChar(GetAllDisplayNote()) + ";"; - strFor += getShadowAttrs();//the string returned contains the spliter ";" - strFor += getBorderAttrs();//the string returned contains the spliter ";" + ";Note:" + + ReplaceFourChar(GetAllDisplayNote()) + ";" + + getShadowAttrs() + //the string returned contains the spliter ";" + getBorderAttrs();//the string returned contains the spliter ";" //end of cell attributes if( mpDoc ) { diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 959112b2cd3a..e10636b5e678 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -2214,21 +2214,15 @@ uno::Any SAL_CALL ScAccessibleDocument::getExtendedAttributes() uno::Any anyAtrribute; - OUString sName; - OUString sValue; sal_uInt16 sheetIndex; OUString sSheetName; sheetIndex = getVisibleTable(); if(GetDocument()==nullptr) return anyAtrribute; GetDocument()->GetName(sheetIndex,sSheetName); - sName = "page-name:"; - sValue = sName + sSheetName ; - sName = ";page-number:"; - sValue += sName + OUString::number(sheetIndex+1) ; - sName = ";total-pages:"; - sValue += sName; - sValue += OUString::number(GetDocument()->GetTableCount()) + ";"; + OUString sValue = "page-name:" + sSheetName + + ";page-number:" + OUString::number(sheetIndex+1) + + ";total-pages:" + 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 5defaf8c5c5f..3655e0399cb4 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -637,8 +637,8 @@ void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, weld::Wind OUString aAuthor = pAction->GetUser(); DateTime aDT = pAction->GetDateTime(); - OUString aDate = ScGlobal::pLocaleData->getDate( aDT ) + " "; - aDate += ScGlobal::pLocaleData->getTime( aDT, false ); + OUString aDate = ScGlobal::pLocaleData->getDate( aDT ) + " " + + ScGlobal::pLocaleData->getTime( aDT, false ); SfxItemSet aSet( GetPool(), svl::Items<SID_ATTR_POSTIT_AUTHOR, SID_ATTR_POSTIT_TEXT>{}); diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index 9056118d7f40..226c862f379a 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -45,8 +45,7 @@ ScDocStatPage::ScDocStatPage(weld::Container* pPage, weld::DialogController* pCo if ( pDocSh ) pDocSh->GetDocStat( aDocStat ); - OUString aInfo = m_xFrame->get_label(); - aInfo += aDocStat.aDocName; + OUString aInfo = m_xFrame->get_label() + aDocStat.aDocName; m_xFrame->set_label(aInfo); m_xFtTables->set_label( OUString::number( aDocStat.nTableCount ) ); m_xFtCells->set_label( OUString::number( aDocStat.nCellCount ) ); diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 0d478d612ef0..34a3a7a35b2f 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -421,8 +421,8 @@ void ScConflictsDlg::SetActionString(const ScChangeAction* pAction, ScDocument* rTreeView.set_text(rEntry, aUser, 1); DateTime aDateTime = pAction->GetDateTime(); - OUString aString = ScGlobal::pLocaleData->getDate( aDateTime ) + " "; - aString += ScGlobal::pLocaleData->getTime( aDateTime, false ); + OUString aString = ScGlobal::pLocaleData->getDate( aDateTime ) + " " + + 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 abd37aad7b39..1da3d974a3b7 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -109,8 +109,8 @@ void ScRedComDialog::ReInit(ScChangeAction *pAction) OUString aAuthor = pChangeAction->GetUser(); DateTime aDT = pChangeAction->GetDateTime(); - OUString aDate = ScGlobal::pLocaleData->getDate( aDT ) + " "; - aDate += ScGlobal::pLocaleData->getTime( aDT, false ); + OUString aDate = ScGlobal::pLocaleData->getDate( aDT ) + " " + + ScGlobal::pLocaleData->getTime( aDT, false ); pDlg->ShowLastAuthor(aAuthor, aDate); pDlg->SetNote(aComment); diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index ad036ddd26e3..46631ba4d365 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -196,8 +196,8 @@ void ScShareDocumentDlg::UpdateView() util::DateTime uDT(xDocProps->getModificationDate()); DateTime aDateTime(uDT); - OUString aString = formatTime(aDateTime, *ScGlobal::pLocaleData) + " "; - aString += ScGlobal::pLocaleData->getTime( aDateTime, false ); + OUString aString = formatTime(aDateTime, *ScGlobal::pLocaleData) + " " + + ScGlobal::pLocaleData->getTime( aDateTime, false ); m_xLbUsers->append_text(aUser); m_xLbUsers->set_text(m_xLbUsers->n_children() - 1, aString, 1); diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 74519392bbe5..c6038662e754 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -650,8 +650,7 @@ void ScContentTree::Command( const CommandEvent& rCEvt ) // hidden document if ( !aHiddenTitle.isEmpty() ) { - OUString aEntry = aHiddenTitle; - aEntry += pParentWindow->aStrHidden; + OUString aEntry = aHiddenTitle + pParentWindow->aStrHidden; ++i; aDocMenu->InsertItem(i, aEntry, MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK, "document" + OString::number(i)); if (bHiddenDoc) diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index 9349cd8c50a1..14fd69866149 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -38,9 +38,8 @@ ScHFEditDlg::ScHFEditDlg(weld::Window* pParent, { eNumType = rCoreSet.Get(ATTR_PAGE).GetNumType(); - OUString aTmp = m_xDialog->get_title(); - - aTmp += " (" + ScResId( STR_PAGESTYLE ) + ": " + rPageStyle + ")"; + OUString aTmp = m_xDialog->get_title() + + " (" + ScResId( STR_PAGESTYLE ) + ": " + rPageStyle + ")"; m_xDialog->set_title(aTmp); } diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index c15cebe98098..cf1cd4656ed4 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -393,8 +393,7 @@ void ScViewFunc::DoThesaurus() if (eState == EESpellState::ErrorFound) // should happen later through Wrapper! { LanguageType eLnge = ScViewUtil::GetEffLanguage( &rDoc, ScAddress( nCol, nRow, nTab ) ); - OUString aErr = SvtLanguageTable::GetLanguageString(eLnge); - aErr += ScResId( STR_SPELLING_NO_LANG ); + OUString aErr = SvtLanguageTable::GetLanguageString(eLnge) + ScResId( STR_SPELLING_NO_LANG ); std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(GetViewData().GetDialogParent(), VclMessageType::Info, VclButtonsType::Ok, diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index a42c18b44d61..87a9cbb8d8ce 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -725,9 +725,7 @@ OUString ConvertFromDec( double fNum, double fMin, double fMax, sal_uInt16 nBase std::unique_ptr<sal_Char[]> p( new sal_Char[ nLeft + 1 ] ); memset( p.get(), bNeg ? GetMaxChar( nBase ) : '0', nLeft ); p[ nLeft ] = 0x00; - OUString aTmp( p.get(), nLeft, RTL_TEXTENCODING_MS_1252 ); - aTmp += aRet; - aRet = aTmp; + aRet = OUString( p.get(), nLeft, RTL_TEXTENCODING_MS_1252 ) + aRet; } } diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 5d4335a5c53d..5c31e8fd3614 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -353,8 +353,8 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage const * pPage, sal_uInt16 nPo { // update link page number number += nIncrement; - aURL = aURL.replaceAt(aHashSlide.getLength() + 1, aURL.getLength() - aHashSlide.getLength() - 1, ""); - aURL += OUString::number(number); + aURL = aURL.replaceAt(aHashSlide.getLength() + 1, aURL.getLength() - aHashSlide.getLength() - 1, "") + + OUString::number(number); if (bNotes) { aURL += " " + sNotes; diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 9d097c01f633..89db33f8a85d 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -401,8 +401,7 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const if (nPos >= 0) { OUString aNumStr(aStyleName.copy(aOutlineStr.getLength())); - aInternalName = OUString(STR_LAYOUT_OUTLINE); - aInternalName += aNumStr; + aInternalName = STR_LAYOUT_OUTLINE + aNumStr; } } diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index a6c88b85f367..751e5db0b63f 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -153,14 +153,14 @@ public: ButtonSetImpl::ButtonSetImpl() { - const OUString sSubPath( "/wizard/web/buttons" ); + static const char sSubPath[] = "/wizard/web/buttons" ; - OUString sSharePath( SvtPathOptions().GetConfigPath() ); - sSharePath += sSubPath; + OUString sSharePath = SvtPathOptions().GetConfigPath() + + sSubPath; scanForButtonSets( sSharePath ); - OUString sUserPath( SvtPathOptions().GetUserConfigPath() ); - sUserPath += sSubPath; + OUString sUserPath = SvtPathOptions().GetUserConfigPath() + + sSubPath; scanForButtonSets( sUserPath ); } diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 422cef0a55b5..ad8e2a97eae6 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -2652,8 +2652,7 @@ void HtmlExport::CreateBitmaps() if(!mbImpress && (nButton == BTN_TEXT || nButton == BTN_MORE || nButton == BTN_LESS )) continue; - OUString aFull(maExportPath); - aFull += GetButtonName(nButton); + OUString aFull = maExportPath + GetButtonName(nButton); mpButtonSet->exportButton( mnButtonThema, aFull, GetButtonName(nButton) ); } } diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index a2c111662c72..89af5b41019c 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -662,8 +662,8 @@ bool ImplSdPPTImport::Import() for ( nLevel = 0; nLevel < 9; nLevel++ ) { - OUString aName( pPage->GetLayoutName() ); - aName += " " + OUString::number( nLevel + 1 ); + OUString aName = pPage->GetLayoutName() + + " " + OUString::number( nLevel + 1 ); SfxStyleSheet* pOutlineSheet = static_cast<SfxStyleSheet*>( mpDoc->GetStyleSheetPool()->Find( aName, SfxStyleFamily::Page ) ); DBG_ASSERT( pOutlineSheet, "Template for outline object not found" ); if ( pOutlineSheet ) @@ -2229,8 +2229,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj { for ( sal_uInt16 nLevel = 9; nLevel; nLevel-- ) { - OUString aName( pPage->GetLayoutName() ); - aName += " " + OUString::number( nLevel ); + OUString aName = pPage->GetLayoutName() + " " + OUString::number( nLevel ); pSheet = static_cast<SfxStyleSheet*>(mpDoc->GetStyleSheetPool()->Find( aName, SfxStyleFamily::Page )); if ( pSheet ) pText->StartListening( *pSheet ); diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index e14f266d6c72..717232b014e2 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -914,8 +914,8 @@ void CustomAnimationList::update() { SvTreeListEntry* pLBoxEntry = new CustomAnimationListEntry; pLBoxEntry->AddItem(std::make_unique<SvLBoxContextBmp>(Image(), Image(), false)); - OUString aDescription = SdResId(STR_CUSTOMANIMATION_TRIGGER) + ": "; - aDescription += getShapeDescription( xShape, false ); + OUString aDescription = SdResId(STR_CUSTOMANIMATION_TRIGGER) + ": " + + getShapeDescription( xShape, false ); pLBoxEntry->AddItem(std::make_unique<CustomAnimationTriggerEntryItem>(aDescription)); Insert( pLBoxEntry ); SvViewDataEntry* pViewData = GetViewData( pLBoxEntry ); diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 512415465307..b3b81b8c37ae 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -550,9 +550,8 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest const & rReq ) if( sAuthor.isEmpty() ) sAuthor = SdResId( STR_ANNOTATION_NOAUTHOR ); - aStr = aStr.replaceFirst("%1", sAuthor); - - aStr += " (" + getAnnotationDateTimeString( xAnnotation ) + "): \""; + aStr = aStr.replaceFirst("%1", sAuthor) + + " (" + getAnnotationDateTimeString( xAnnotation ) + "): \""; OUString sQuote( pTextApi->GetText() ); diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index ea9d0f139b46..d0461367ca56 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -65,8 +65,8 @@ void FuCopy::DoExecute( SfxRequest& rReq ) return; // Undo - OUString aString( mpView->GetDescriptionOfMarkedObjects() ); - aString += " " + SdResId( STR_UNDO_COPYOBJECTS ); + OUString aString = mpView->GetDescriptionOfMarkedObjects() + + " " + SdResId( STR_UNDO_COPYOBJECTS ); mpView->BegUndo( aString ); const SfxItemSet* pArgs = rReq.GetArgs(); diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index b06f63fc7765..c8bfd0d26cb0 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -743,11 +743,11 @@ bool FuDraw::SetHelpText(const SdrObject* pObj, const Point& rPosPixel, const Sd INetURLObject::DecodeMechanism::WithCharset); else if (pIMapObj) { - aURL = pIMapObj->GetAltText(); - aURL += " (" - + INetURLObject::decode(pIMapObj->GetURL(), - INetURLObject::DecodeMechanism::WithCharset) - + ")"; + aURL = pIMapObj->GetAltText() + + " (" + + INetURLObject::decode(pIMapObj->GetURL(), + INetURLObject::DecodeMechanism::WithCharset) + + ")"; } else return false; diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 8f3f652a1bcd..932a942986e3 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -632,8 +632,8 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) { rDocliner.Insert( pOutliner->GetText(pSourcePara), nTargetPos, nDepth ); OUString aStyleSheetName( pStyleSheet->GetName() ); - aStyleSheetName = aStyleSheetName.copy( 0, aStyleSheetName.getLength()-1 ); - aStyleSheetName += OUString::number( nDepth <= 0 ? 1 : nDepth+1 ); + aStyleSheetName = aStyleSheetName.copy( 0, aStyleSheetName.getLength()-1 ) + + OUString::number( nDepth <= 0 ? 1 : nDepth+1 ); SfxStyleSheetBasePool* pStylePool = mpDoc->GetStyleSheetPool(); SfxStyleSheet* pOutlStyle = static_cast<SfxStyleSheet*>( pStylePool->Find( aStyleSheetName, pStyleSheet->GetFamily() ) ); rDocliner.SetStyleSheet( nTargetPos, pOutlStyle ); diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 72223999498a..de8dd06787f2 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -163,8 +163,8 @@ void FuMorph::DoExecute( SfxRequest& ) ImpMorphPolygons(aPolyPoly1, aPolyPoly2, pDlg->GetFadeSteps(), aPolyPolyList); - OUString aString(mpView->GetDescriptionOfMarkedObjects()); - aString += " " + SdResId(STR_UNDO_MORPHING); + OUString aString = mpView->GetDescriptionOfMarkedObjects() + + " " + SdResId(STR_UNDO_MORPHING); mpView->BegUndo(aString); ImpInsertPolygons(aPolyPolyList, pDlg->IsAttributeFade(), pObj1, pObj2); diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index 161fe7237266..96a805040cb9 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -51,8 +51,8 @@ namespace { void setUndo(::sd::View* pView, const SfxItemSet* pArgs) { // Undo - OUString aString(pView->GetDescriptionOfMarkedObjects()); - aString += " " + SdResId(STR_TRANSFORM); + OUString aString = pView->GetDescriptionOfMarkedObjects() + + " " + SdResId(STR_TRANSFORM); pView->BegUndo(aString); pView->SetGeoAttrToMarked(*pArgs); diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx index 000fee7014f7..64840810ca21 100644 --- a/sd/source/ui/func/fuvect.cxx +++ b/sd/source/ui/func/fuvect.cxx @@ -73,8 +73,8 @@ void FuVectorize::DoExecute( SfxRequest& ) if( pPageView && rMtf.GetActionSize() ) { SdrGrafObj* pVectObj = static_cast<SdrGrafObj*>( pObj->CloneSdrObject(pObj->getSdrModelFromSdrObject()) ); - OUString aStr( mpView->GetDescriptionOfMarkedObjects() ); - aStr += " " + SdResId( STR_UNDO_VECTORIZE ); + OUString aStr = mpView->GetDescriptionOfMarkedObjects() + + " " + SdResId( STR_UNDO_VECTORIZE ); mpView->BegUndo( aStr ); pVectObj->SetGraphic( rMtf ); mpView->ReplaceObjectAtView( pObj, *pPageView, pVectObj ); diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 98636860d1ab..3e75638bd920 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -78,8 +78,8 @@ void ToolTip::SetPage (const model::SharedPageDescriptor& rpDescriptor) } if (sHelpText.isEmpty()) { - sHelpText = SdResId(STR_PAGE); - sHelpText += OUString::number(mpDescriptor->GetPageIndex()+1); + sHelpText = SdResId(STR_PAGE) + + OUString::number(mpDescriptor->GetPageIndex()+1); } msCurrentHelpText = sHelpText; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index c7f8113a0513..6f7510488a30 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1562,9 +1562,7 @@ static void ImplPDFExportComments( const uno::Reference< drawing::XDrawPage >& x *(SD_MOD()->GetNumberFormatter()), eLanguage ); vcl::PDFNote aNote; - OUString sTitle( xAnnotation->getAuthor() ); - sTitle += ", " + aStr; - aNote.Title = sTitle; + aNote.Title = xAnnotation->getAuthor() + ", " + aStr; aNote.Contents = xText->getString(); rPDFExtOutDevData.CreateNote( ::tools::Rectangle( Point( static_cast< long >( aRealPoint2D.X * 100 ), static_cast< long >( aRealPoint2D.Y * 100 ) ), Size( 1000, 1000 ) ), aNote ); diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index f0eb22d9bf2b..ed2fadd7be78 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -2119,8 +2119,7 @@ OUString getPageApiNameFromUiName( const OUString& rUIName ) if( rUIName.startsWith( aDefPageName ) ) { - aApiName = sEmptyPageName; - aApiName += rUIName.copy( aDefPageName.getLength() ); + aApiName = sEmptyPageName + rUIName.copy( aDefPageName.getLength() ); } else { diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index 452f2585a40d..e64eb67edd1b 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -119,8 +119,8 @@ void GraphicObjectBar::ExecuteFilter( SfxRequest const & rReq ) if( pPageView ) { SdrGrafObj* pFilteredObj = static_cast<SdrGrafObj*>( pObj->CloneSdrObject(pObj->getSdrModelFromSdrObject()) ); - OUString aStr = mpView->GetDescriptionOfMarkedObjects(); - aStr += " " + SdResId(STR_UNDO_GRAFFILTER); + OUString aStr = mpView->GetDescriptionOfMarkedObjects() + + " " + SdResId(STR_UNDO_GRAFFILTER); mpView->BegUndo( aStr ); pFilteredObj->SetGraphicObject( aFilterObj ); ::sd::View* const pView = mpView; diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 28995b287b92..6d96270be42a 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -299,8 +299,8 @@ void DrawViewShell::ExecBmpMask( SfxRequest const & rReq ) xNewObj->SetEmptyPresObj(false); xNewObj->SetGraphic(pBmpMask->Mask(xNewObj->GetGraphic())); - OUString aStr( mpDrawView->GetDescriptionOfMarkedObjects() ); - aStr += " " + SdResId(STR_EYEDROPPER); + OUString aStr = mpDrawView->GetDescriptionOfMarkedObjects() + + " " + SdResId(STR_EYEDROPPER); mpDrawView->BegUndo( aStr ); mpDrawView->ReplaceObjectAtView(pObj, *pPV, xNewObj.release()); diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index bd30940d6d5d..9fc1ddfa47e0 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -153,8 +153,8 @@ void DrawViewShell::ExecGallery(SfxRequest const & rReq) pNewGrafObj->SetOutlinerParaObject(nullptr); pNewGrafObj->SetGraphic(aGraphic); - OUString aStr(mpDrawView->GetDescriptionOfMarkedObjects()); - aStr += " " + SdResId(STR_UNDO_REPLACE); + OUString aStr = mpDrawView->GetDescriptionOfMarkedObjects() + + " " + SdResId(STR_UNDO_REPLACE); mpDrawView->BegUndo(aStr); SdrPageView* pPV = mpDrawView->GetSdrPageView(); mpDrawView->ReplaceObjectAtView(pGrafObj, *pPV, pNewGrafObj); diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index cad902ed86db..7ebf88b446dd 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -111,8 +111,8 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) { // Set the necessary string like in // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1072 ff. - OUString aTmp(SvtResId(STR_UNDO)); - aTmp += pUndoManager->GetUndoActionComment(); + OUString aTmp = SvtResId(STR_UNDO) + + pUndoManager->GetUndoActionComment(); rSet.Put(SfxStringItem(SID_UNDO, aTmp)); } } @@ -142,8 +142,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) { // Set the necessary string like in // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1081 ff. - OUString aTmp(SvtResId(STR_REDO)); - aTmp += pUndoManager->GetRedoActionComment(); + OUString aTmp = SvtResId(STR_REDO) + pUndoManager->GetRedoActionComment(); rSet.Put(SfxStringItem(SID_REDO, aTmp)); } } diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 727c06d1e1bf..f828982f0726 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -414,8 +414,7 @@ IMPL_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, /*unused*/, vo int iFiles; for ( iFiles = 1; iFiles < nFiles; iFiles++ ) { - OUString aURL = aBaseDirURL; - aURL += sFiles[iFiles]; + OUString aURL = aBaseDirURL + sFiles[iFiles]; OpenURL( aURL, "_default", aArgs ); } } diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index 6c357ddcc6c8..691baa157d75 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -96,8 +96,8 @@ std::vector<OUString> SfxContentHelper::GetResultSet( const OUString& rURL ) OUString aRow = aTitle + "\t" + aType + - "\t"; - aRow += xContentAccess->queryContentIdentifierString(); + "\t" + + xContentAccess->queryContentIdentifierString(); aList.push_back( aRow ); } } @@ -156,9 +156,9 @@ std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUStrin { OUString aTitle( xRow->getString(1) ); bool bFolder = xRow->getBoolean(2); - OUString aRow = aTitle + "\t"; - aRow += xContentAccess->queryContentIdentifierString() + "\t"; - aRow += bFolder ? OUStringLiteral("1") : OUStringLiteral("0"); + OUString aRow = aTitle + "\t" + + xContentAccess->queryContentIdentifierString() + "\t" + + (bFolder ? OUStringLiteral("1") : OUStringLiteral("0")); aProperties.push_back( aRow ); } } diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index d58bd3986540..85d46610b73a 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -133,8 +133,7 @@ OUString CreateSizeText( sal_Int64 nSize ) } const SvtSysLocale aSysLocale; const LocaleDataWrapper& rLocaleWrapper = aSysLocale.GetLocaleData(); - OUString aSizeStr( rLocaleWrapper.getNum( nSize1, 0 ) ); - aSizeStr += aUnitStr; + OUString aSizeStr = rLocaleWrapper.getNum( nSize1, 0 ) + aUnitStr; if ( nSize1 < nSize2 ) { aSizeStr = ::rtl::math::doubleToUString( fSize, @@ -818,8 +817,8 @@ void SfxDocumentPage::ImplUpdateSignatures() else if ( aInfos.getLength() == 1 ) { const security::DocumentSignatureInformation& rInfo = aInfos[ 0 ]; - s = utl::GetDateTimeString( rInfo.SignatureDate, rInfo.SignatureTime ) + ", "; - s += comphelper::xmlsec::GetContentPart(rInfo.Signer->getSubjectName()); + s = utl::GetDateTimeString( rInfo.SignatureDate, rInfo.SignatureTime ) + ", " + + comphelper::xmlsec::GetContentPart(rInfo.Signer->getSubjectName()); } m_xSignedValFt->set_label(s); } @@ -1223,8 +1222,8 @@ void CustomPropertiesDurationField::set_visible(bool bVisible) void CustomPropertiesDurationField::SetDuration( const util::Duration& rDuration ) { m_aDuration = rDuration; - OUString sText(rDuration.Negative ? OUString('-') : OUString('+')); - sText += SfxResId(SFX_ST_DURATION_FORMAT); + OUString sText = (rDuration.Negative ? OUString('-') : OUString('+')) + + SfxResId(SFX_ST_DURATION_FORMAT); sText = sText.replaceFirst( "%1", OUString::number( rDuration.Years ) ); sText = sText.replaceFirst( "%2", OUString::number( rDuration.Months ) ); sText = sText.replaceFirst( "%3", OUString::number( rDuration.Days ) ); diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index edfbf407961d..a9e0cfe08809 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -95,11 +95,11 @@ void SearchDialog::SaveConfig() { sUserData += m_xSearchEdit->get_text(i) + "\t"; } - 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 ); + sUserData = comphelper::string::stripStart(sUserData, '\t') + ";" + + OUString::number( m_xWholeWordsBox->get_active() ? 1 : 0 ) + ";" + + OUString::number( m_xMatchCaseBox->get_active() ? 1 : 0 ) + ";" + + OUString::number( m_xWrapAroundBox->get_active() ? 1 : 0 ) + ";" + + OUString::number( m_xBackwardsBox->get_active() ? 1 : 0 ); Any aUserItem = makeAny( sUserData ); aViewOpt.SetUserItem( "UserItem", aUserItem ); diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 7ca803627124..22ef098bbbf4 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -1846,8 +1846,7 @@ void UCBStorage_Impl::SetProps( const Sequence < Sequence < PropertyValue > >& r pElement->m_xStorage->SetProps( rSequence, aPath ); else { - OUString aElementPath( aPath ); - aElementPath += pElement->m_aName; + OUString aElementPath = aPath + pElement->m_aName; pElement->SetContentType( Find_Impl( rSequence, aElementPath ) ); } } @@ -1899,8 +1898,7 @@ void UCBStorage_Impl::GetProps( sal_Int32& nProps, Sequence < Sequence < Propert else { // properties of streams - OUString aElementPath( aPath ); - aElementPath += pElement->m_aName; + OUString aElementPath = aPath + pElement->m_aName; aProps[0].Name = "MediaType"; aProps[0].Value <<= pElement->GetContentType(); aProps[1].Name = "FullPath"; @@ -1996,8 +1994,7 @@ sal_Int16 UCBStorage_Impl::Commit() if ( !pContent && pElement->IsModified() ) { // if the element has never been opened, no content has been created until now - OUString aName = m_aURL + "/"; - aName += pElement->m_aOriginalName; + OUString aName = m_aURL + "/" + pElement->m_aOriginalName; pContent = new ::ucbhelper::Content( aName, Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); xDeleteContent.reset(pContent); // delete it later on exit scope } diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 76917500dee0..f3c0ec3e99b8 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -501,9 +501,9 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols ) for (const SmSym& rSymbol : rNewSymbols) { OUString aNodeNameDelim = SYMBOL_LIST + + aDelim + + rSymbol.GetExportName() + aDelim; - aNodeNameDelim += rSymbol.GetExportName(); - aNodeNameDelim += aDelim; const OUString *pName = pNames; diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx index c7a1ba31e90e..2aae7adb555e 100644 --- a/starmath/source/cursor.cxx +++ b/starmath/source/cursor.cxx @@ -393,9 +393,7 @@ SmCaretPos SmCursor::PatchLineList(SmNodeList* pLineList, SmNodeList::iterator a SmTextNode *pText = static_cast<SmTextNode*>(prev), *pOldN = static_cast<SmTextNode*>(next); SmCaretPos retval(pText, pText->GetText().getLength()); - OUString newText; - newText += pText->GetText(); - newText += pOldN->GetText(); + OUString newText = pText->GetText() + pOldN->GetText(); pText->ChangeText(newText); delete pOldN; pLineList->erase(aIter); diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx index 63f20c006263..5e6a6486a337 100644 --- a/starmath/source/symbol.cxx +++ b/starmath/source/symbol.cxx @@ -237,8 +237,7 @@ void SmSymbolManager::Load() vcl::Font aFont( rSym.GetFace() ); OSL_ENSURE( aFont.GetItalic() == ITALIC_NONE, "expected Font with ITALIC_NONE, failed." ); aFont.SetItalic( ITALIC_NORMAL ); - OUString aSymbolName('i'); - aSymbolName += rSym.GetName(); + OUString aSymbolName = "i" + rSym.GetName(); SmSym aSymbol( aSymbolName, aFont, rSym.GetCharacter(), aSymbolSetName, true /*bIsPredefined*/ ); @@ -254,8 +253,8 @@ void SmSymbolManager::Save() SmMathConfig &rCfg = *SM_MOD()->GetConfig(); // prepare to skip symbols from iGreek on saving - OUString aSymbolSetName('i'); - aSymbolSetName += SmLocalizedSymbolData::GetUiSymbolSetName("Greek"); + OUString aSymbolSetName = "i" + + SmLocalizedSymbolData::GetUiSymbolSetName("Greek"); SymbolPtrVec_t aTmp( GetSymbols() ); std::vector< SmSym > aSymbols; diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 1ce2d39f5d6d..8b74b76a3ca7 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -739,9 +739,8 @@ void DbGridControl::NavigationBar::SetState(DbGridControlNavigationBarState nWhi // add the number of selected rows, if applicable if (pParent->GetSelectRowCount()) { - OUString aExtendedInfo = aText + - " ("; - aExtendedInfo += m_aAbsolute->CreateFieldText(pParent->GetSelectRowCount()) + ")"; + OUString aExtendedInfo = aText + " (" + + m_aAbsolute->CreateFieldText(pParent->GetSelectRowCount()) + ")"; pWnd->SetText(aExtendedInfo); } else diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index c39630ea3dd4..a409731f18c0 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -814,8 +814,8 @@ namespace svxform m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry ); // Method _rEntry->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp; - sEntry = SvxResId( RID_STR_DATANAV_SUBM_METHOD ); - sEntry += m_aMethodString.toUI( sTemp ); + sEntry = SvxResId( RID_STR_DATANAV_SUBM_METHOD ) + + m_aMethodString.toUI( sTemp ); m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry ); // Ref _rEntry->getPropertyValue( PN_SUBMISSION_REF ) >>= sTemp; @@ -827,8 +827,8 @@ namespace svxform m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry ); // Replace _rEntry->getPropertyValue( PN_SUBMISSION_REPLACE ) >>= sTemp; - sEntry = SvxResId( RID_STR_DATANAV_SUBM_REPLACE ); - sEntry += m_aReplaceString.toUI( sTemp ); + sEntry = SvxResId( RID_STR_DATANAV_SUBM_REPLACE ) + + m_aReplaceString.toUI( sTemp ); m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry ); } catch ( Exception const & ) @@ -893,13 +893,13 @@ namespace svxform pChild = m_pItemList->GetEntry( pEntry, nPos++ ); m_pItemList->SetEntryText( pChild, sEntry ); _rEntry->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp; - sEntry = SvxResId( RID_STR_DATANAV_SUBM_METHOD ); - sEntry += m_aMethodString.toUI( sTemp ); + sEntry = SvxResId( RID_STR_DATANAV_SUBM_METHOD ) + + m_aMethodString.toUI( sTemp ); pChild = m_pItemList->GetEntry( pEntry, nPos++ ); m_pItemList->SetEntryText( pChild, sEntry ); _rEntry->getPropertyValue( PN_SUBMISSION_REPLACE ) >>= sTemp; - sEntry = SvxResId( RID_STR_DATANAV_SUBM_REPLACE ); - sEntry += m_aReplaceString.toUI( sTemp ); + sEntry = SvxResId( RID_STR_DATANAV_SUBM_REPLACE ) + + m_aReplaceString.toUI( sTemp ); pChild = m_pItemList->GetEntry( pEntry, nPos++ ); m_pItemList->SetEntryText( pChild, sEntry ); } diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 3dec43d293f9..61f9c7468f54 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -429,8 +429,8 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection ) sal_Int16 nClassID = FormComponentType::CONTROL; xSingleSelection->getPropertyValue( FM_PROP_CLASSID ) >>= nClassID; - sTitle = SvxResId(RID_STR_PROPERTIES_CONTROL); - sTitle += GetUIHeadlineName(nClassID, makeAny(xSingleSelection)); + sTitle = SvxResId(RID_STR_PROPERTIES_CONTROL) + + GetUIHeadlineName(nClassID, makeAny(xSingleSelection)); } else if ( Reference< XForm >( xSingleSelection, UNO_QUERY ).is() ) sTitle = SvxResId(RID_STR_PROPERTIES_FORM); diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index ebf593635f49..0a1aa102d718 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3096,10 +3096,10 @@ 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] + " "; OString aVal = m_pParser->getContext().getIntlKeywordAscii(IParseContext::InternationalKeyCode::And); - aCompText += OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US) + " "; - aCompText += ::comphelper::getString(rRefValue.Value); + OUString aCompText = aRow[rFieldInfo.xText] + " " + + OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US) + " " + + ::comphelper::getString(rRefValue.Value); aRow[rFieldInfo.xText] = aCompText; } else diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 1e0c63c06a24..c79a778459a2 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -407,8 +407,8 @@ 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 += GetMetricStr_Impl( pImpl->aPos.Y()); + OUString aStr = GetMetricStr_Impl( pImpl->aPos.X()) + " / " + + GetMetricStr_Impl( pImpl->aPos.Y()); tools::Rectangle aRect(aPnt, Point(nSizePosX, rRect.Bottom())); pDev->DrawRect(aRect); vcl::Region aOrigRegion(pDev->GetClipRegion()); @@ -425,8 +425,8 @@ 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() ) + " x "; - aStr += GetMetricStr_Impl( pImpl->aSize.Height() ); + aStr = GetMetricStr_Impl( pImpl->aSize.Width() ) + " x " + + GetMetricStr_Impl( pImpl->aSize.Height() ); aRect = tools::Rectangle(aDrwPnt, rRect.BottomRight()); pDev->DrawRect(aRect); aOrigRegion = pDev->GetClipRegion(); @@ -463,14 +463,14 @@ void SvxPosSizeStatusBarControl::ImplUpdateItemText() int nCharsWidth = -1; if ( pImpl->bPos || pImpl->bSize ) { - aText = GetMetricStr_Impl( pImpl->aPos.X()) + " / "; - aText += GetMetricStr_Impl( pImpl->aPos.Y()); + aText = GetMetricStr_Impl( pImpl->aPos.X()) + " / " + + 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 += " " + GetMetricStr_Impl( pImpl->aSize.Width() ) + " x "; - aText += GetMetricStr_Impl( pImpl->aSize.Height() ); + aText += " " + GetMetricStr_Impl( pImpl->aSize.Width() ) + " x " + + 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 26da3cef6f65..a19219d6f7cb 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -497,11 +497,11 @@ bool SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos) pEditControl->SetSelection(Selection(SELECTION_MIN,SELECTION_MAX)); vcl::Window* pParent=GetParent(); aWNameMemorized=pParent->GetText(); - OUString aNewName = aWNameMemorized + " "; - aNewName += pEntry->GetItemTypeStr(); + OUString aNewName = aWNameMemorized + " " + + pEntry->GetItemTypeStr(); if (pEntry->bCanNum) { - aNewName += ": " + OUString::number(pEntry->nMin); - aNewName += ".." + OUString::number(pEntry->nMax); + aNewName += ": " + OUString::number(pEntry->nMin) + + ".." + OUString::number(pEntry->nMax); } aNewName += " - Type 'del' to reset to default."; pParent->SetText(aNewName); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 56a1ef2b91a6..332ef71b1bb9 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -978,8 +978,8 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell) } } } - sSelectionText = aSelection.toString(); - sSelectionText += OStringLiteral(", ") + OString::number(nRotAngle); + sSelectionText = aSelection.toString() + + ", " + OString::number(nRotAngle); if (!aExtraInfo.isEmpty()) { sSelectionText += ", " + aExtraInfo.makeStringAndClear(); diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 92b7fdb3bdd2..dc69da0ee4ec 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -129,12 +129,10 @@ ErrCode XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileName, // calculate correct file name if( !( nFlags & XOutFlags::DontExpandFilename ) ) { - OUString aName( aURL.getBase() + "_" ); - aName += aURL.getExtension() + "_"; OUString aStr( OUString::number( rGraphic.GetChecksum(), 16 ) ); if ( aStr[0] == '-' ) aStr = "m" + aStr.copy(1); - aName += aStr; + OUString aName = aURL.getBase() + "_" + aURL.getExtension() + "_" + aStr; aURL.setBase( aName ); } diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index f89541b1c09c..d62e1878582b 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -541,8 +541,8 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes() sValue = "page-name:" + sDisplay + ";page-number:" + OUString::number( nPage ) + - ";total-pages:"; - sValue += OUString::number( pCursorShell->GetPageCnt() ) + ";"; + ";total-pages:" + + OUString::number( pCursorShell->GetPageCnt() ) + ";"; SwContentFrame* pCurrFrame = pCursorShell->GetCurrFrame(); SwPageFrame* pCurrPage=static_cast<SwFrame*>(pCurrFrame)->FindPageFrame(); diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index a4a6d8e25794..0b6f282caa89 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -395,8 +395,8 @@ static OUString lcl_dbg_out(const SwFrameFormat & rFrameFormat) OUString aResult = "[ " + OUString(sBuffer, strlen(sBuffer), RTL_TEXTENCODING_ASCII_US) + - "("; - aResult += rFrameFormat.GetName() + ")"; + "(" + + rFrameFormat.GetName() + ")"; if (rFrameFormat.IsAuto()) aResult += "*"; @@ -710,11 +710,8 @@ const char * dbg_out(const SwNumRule & rRule) static OUString lcl_dbg_out(const SwTextFormatColl & rFormat) { - OUString aResult(rFormat.GetName() + "("); - - aResult += OUString::number(rFormat.GetAttrOutlineLevel()) + ")"; - - return aResult; + return rFormat.GetName() + "(" + + OUString::number(rFormat.GetAttrOutlineLevel()) + ")"; } const char * dbg_out(const SwTextFormatColl & rFormat) diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx index c5173a496454..0fc1ee2d3100 100644 --- a/sw/source/core/undo/unovwr.cxx +++ b/sw/source/core/undo/unovwr.cxx @@ -312,10 +312,9 @@ SwRewriter SwUndoOverwrite::GetRewriter() const { SwRewriter aResult; - OUString aString = SwResId(STR_START_QUOTE); - aString += ShortenString(aInsStr, nUndoStringLength, - SwResId(STR_LDOTS)); - aString += SwResId(STR_END_QUOTE); + OUString aString = SwResId(STR_START_QUOTE) + + ShortenString(aInsStr, nUndoStringLength, SwResId(STR_LDOTS)) + + SwResId(STR_END_QUOTE); aResult.AddRule(UndoArg1, aString); diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 90ae515291c3..61a255d633a3 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -1878,9 +1878,9 @@ static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt, const SwFrameFormat& rF if (rHTMLWrt.GetOrigFileName()) aFileName = *rHTMLWrt.GetOrigFileName(); INetURLObject aURL(aFileName); - OUString aName(aURL.getBase() + "_"); - aName += aURL.getExtension() + "_"; - aName += OUString::number(aGraphic.GetChecksum(), 16); + OUString aName = aURL.getBase() + "_" + + aURL.getExtension() + "_" + + OUString::number(aGraphic.GetChecksum(), 16); aURL.setBase(aName); aURL.setExtension("ole"); aFileName = aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE); diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 9e87beb61706..a0da671de733 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -150,9 +150,9 @@ OUString lcl_CalculateFileName(const OUString* pOrigFileName, const Graphic& rGr if (pOrigFileName) aFileName = *pOrigFileName; INetURLObject aURL(aFileName); - OUString aName(aURL.getBase() + "_"); - aName += aURL.getExtension() + "_"; - aName += OUString::number(rGraphic.GetChecksum(), 16); + OUString aName = aURL.getBase() + "_" + + aURL.getExtension() + "_" + + OUString::number(rGraphic.GetChecksum(), 16); aURL.setBase(aName); aURL.setExtension(rExtension); aFileName = aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE); diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 49095288a18a..fa56eb08f519 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -331,8 +331,7 @@ bool Writer::CopyLocalFileToINet( OUString& rFileNm ) } OUString aSrc = rFileNm; - OUString aDest = aTargetUrl.GetPartBeforeLastName(); - aDest += aFileUrl.GetLastName(); + OUString aDest = aTargetUrl.GetPartBeforeLastName() + aFileUrl.GetLastName(); SfxMedium aSrcFile( aSrc, StreamMode::READ ); SfxMedium aDstFile( aDest, StreamMode::WRITE | StreamMode::SHARE_DENYNONE ); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 872b693a1431..60b5c7cc6f24 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -7236,8 +7236,8 @@ void DocxAttributeOutput::RefField( const SwField& rField, const OUString& rRef SwFieldIds nType = rField.GetTyp( )->Which( ); if ( nType == SwFieldIds::GetExp ) { - OUString sCmd = FieldString( ww::eREF ); - sCmd += "\"" + rRef + "\" "; + OUString sCmd = FieldString( ww::eREF ) + + "\"" + rRef + "\" "; m_rExport.OutputField( &rField, ww::eREF, sCmd ); } diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index b1689bacde4f..dbfa676e93f1 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -664,8 +664,8 @@ sal_uInt16 SwWW8ImplReader::End_Field() if ( m_aFieldStack.back().mnObjLocFc > 0 ) { // Store the OLE object as an internal link - OUString sOleId('_'); - sOleId += OUString::number( m_aFieldStack.back().mnObjLocFc ); + OUString sOleId = "_" + + OUString::number( m_aFieldStack.back().mnObjLocFc ); tools::SvRef<SotStorage> xSrc0 = m_pStg->OpenSotStorage(SL::aObjectPool); tools::SvRef<SotStorage> xSrc1 = xSrc0->OpenSotStorage( sOleId, StreamMode::READ ); diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index b9cb3b89f82a..64d93fb6112e 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -63,8 +63,8 @@ sw::DropDownFieldDialog::DropDownFieldDialog(weld::Widget *pParent, SwWrtShell & { m_pDropField = static_cast<SwDropDownField*>(pField); - OUString sTitle = m_xDialog->get_title(); - sTitle += m_pDropField->GetPar2(); + OUString sTitle = m_xDialog->get_title() + + m_pDropField->GetPar2(); m_xDialog->set_title(sTitle); const uno::Sequence< OUString > aItems = m_pDropField->GetItemSequence(); for (const OUString& rItem : aItems) diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index aedbb4bccf51..9f8d1e64898b 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -265,8 +265,8 @@ 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() + "\n"; + OUString aMessage = m_aStrDelMsg + "\n\n" + + 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/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index 5de37c41b4a0..1bcd43c41520 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -162,8 +162,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) pNewView->AttrChangedNotify(nullptr); // so that SelectShell is being called pSh = pNewView->GetWrtShellPtr(); - OUString aTmp( SwResId(STR_ENV_TITLE) ); - aTmp += OUString::number( ++nTitleNo ); + OUString aTmp = SwResId(STR_ENV_TITLE) + OUString::number( ++nTitleNo ); xDocSh->SetTitle( aTmp ); // if applicable, copy the old Collections "Sender" and "Receiver" to diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index 8d6c5f230a17..cf07dc9728c3 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -205,13 +205,13 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel) OUString aTmp; if(bLabel) { - aTmp = SwResId( STR_LAB_TITLE); - aTmp += OUString::number(++nLabelTitleNo ); + aTmp = SwResId( STR_LAB_TITLE) + + OUString::number(++nLabelTitleNo ); } else { - aTmp = pDlg->GetBusinessCardStr(); - aTmp += OUString::number( ++nBCTitleNo ); + aTmp = pDlg->GetBusinessCardStr() + + OUString::number( ++nBCTitleNo ); } xDocSh->SetTitle( aTmp ); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 1b1c83f366f9..c69b3e2d889f 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -822,8 +822,7 @@ void SwDocShell::Execute(SfxRequest& rReq) SwView *pCurrView = static_cast<SwView*>( pFrame->GetViewShell()); // Set document's title - OUString aTmp( SwResId(STR_ABSTRACT_TITLE) ); - aTmp += GetTitle(); + OUString aTmp = SwResId(STR_ABSTRACT_TITLE) + GetTitle(); xDocSh->SetTitle( aTmp ); pCurrView->GetWrtShell().SetNewDoc(); pFrame->Show(); diff --git a/sw/source/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx index b2b7d743a7da..dcf07ab3efa5 100644 --- a/sw/source/uibase/envelp/labelcfg.cxx +++ b/sw/source/uibase/envelp/labelcfg.cxx @@ -321,8 +321,8 @@ void SwLabelConfig::SaveLabel( const OUString& rManufacturer, } } - OUString sPrefix( wrapConfigurationElementName( rManufacturer ) ); - sPrefix += "/" + sFoundNode + "/"; + OUString sPrefix = wrapConfigurationElementName( rManufacturer ) + + "/" + sFoundNode + "/"; Sequence<OUString> aPropNames = lcl_CreatePropertyNames( sPrefix ); OUString sMeasure; Sequence<PropertyValue> aPropValues = lcl_CreateProperties( aPropNames, sMeasure, rRec ); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 47a6852df369..21b72b3a9bcd 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1263,8 +1263,8 @@ VclPtr<PopupMenu> SwContentTree::CreateContextMenu() pSubPop3->InsertItem(nId++, m_aContextStrings[IDX_STR_ACTIVE_VIEW], MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK); if(m_pHiddenShell) { - OUString sHiddenEntry = m_pHiddenShell->GetView().GetDocShell()->GetTitle(); - sHiddenEntry += " ( " + + OUString sHiddenEntry = m_pHiddenShell->GetView().GetDocShell()->GetTitle() + + " ( " + m_aContextStrings[IDX_STR_HIDDEN] + " )"; pSubPop3->InsertItem(nId, sHiddenEntry, MenuItemBits::AUTOCHECK | MenuItemBits::RADIOCHECK); @@ -3202,10 +3202,10 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) else { const size_t nMemberCount = static_cast<SwContentType*>(pUserData)->GetMemberCount(); - sEntry = OUString::number(nMemberCount) + " "; - sEntry += nMemberCount == 1 + sEntry = OUString::number(nMemberCount) + " " + + (nMemberCount == 1 ? static_cast<SwContentType*>(pUserData)->GetSingleName() - : static_cast<SwContentType*>(pUserData)->GetName(); + : static_cast<SwContentType*>(pUserData)->GetName()); bRet = true; } if(bRet) diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index f6155e16d80f..e016ab69910f 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -989,8 +989,8 @@ void SwNavigationPI::UpdateListBox() if(m_aContentTree->GetHiddenWrtShell()) { OUString sEntry = m_aContentTree->GetHiddenWrtShell()->GetView(). - GetDocShell()->GetTitle(); - sEntry += " (" + + GetDocShell()->GetTitle() + + " (" + m_aStatusArr[IDX_STR_HIDDEN] + ")"; m_aDocListBox->InsertEntry(sEntry); diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 8dbde3081590..1f06646b94a6 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1644,12 +1644,12 @@ void SwWrtShell::AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar ) // is already clipped to the editshell StartAllAction(); - OUString aTmpStr1 = SwResId(STR_START_QUOTE); - aTmpStr1 += GetSelText(); - aTmpStr1 += SwResId(STR_END_QUOTE); - OUString aTmpStr3 = SwResId(STR_START_QUOTE); - aTmpStr3 += OUStringChar(cChar); - aTmpStr3 += SwResId(STR_END_QUOTE); + OUString aTmpStr1 = SwResId(STR_START_QUOTE) + + GetSelText() + + SwResId(STR_END_QUOTE); + OUString aTmpStr3 = SwResId(STR_START_QUOTE) + + OUStringChar(cChar) + + SwResId(STR_END_QUOTE); aRewriter.AddRule( UndoArg1, aTmpStr1 ); aRewriter.AddRule( UndoArg2, SwResId(STR_YIELDS) ); aRewriter.AddRule( UndoArg3, aTmpStr3 ); diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 7b6c75953e93..053f30fec50a 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -757,8 +757,8 @@ css::uno::Sequence< css::uno::Any > Content::setPropertyValues( { if (nTitlePos > -1) { - OUString aNewURL = getParentURL(); - aNewURL += OUString( newName, strlen(newName), RTL_TEXTENCODING_UTF8 ); + OUString aNewURL = getParentURL() + + OUString( newName, strlen(newName), RTL_TEXTENCODING_UTF8 ); css::uno::Reference< css::ucb::XContentIdentifier > xNewId = new ::ucbhelper::ContentIdentifier( aNewURL ); diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx index ab8740d3ee64..71d58c777bb4 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.cxx +++ b/ucb/source/ucp/package/pkgdatasupplier.cxx @@ -432,8 +432,8 @@ OUString DataSupplier::assembleChildURL( const OUString& aName ) if ( nPackageUrlEnd != aURL.getLength() - 1 ) aURL += "/"; - aURL += ::ucb_impl::urihelper::encodeSegment( aName ); - aURL += aContURL.copy( nParam ); + aURL += ::ucb_impl::urihelper::encodeSegment( aName ) + + aContURL.copy( nParam ); } else { diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx index 715923e92303..aa18d1b0dc49 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx @@ -238,10 +238,9 @@ sal_Int32 VbaCommandBarHelper::findControlByName( const css::uno::Reference< css OUString VbaCommandBarHelper::generateCustomURL() { - OUString url = OUStringLiteral(ITEM_TOOLBAR_URL) + CUSTOM_TOOLBAR_STR; - // use a random number to minimize possible clash with existing custom toolbars - url += OUString::number(comphelper::rng::uniform_int_distribution(0, std::numeric_limits<int>::max()), 16); - return url; + return OUStringLiteral(ITEM_TOOLBAR_URL) + CUSTOM_TOOLBAR_STR + + // use a random number to minimize possible clash with existing custom toolbars + OUString::number(comphelper::rng::uniform_int_distribution(0, std::numeric_limits<int>::max()), 16); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx index 4dce3f7756f9..84d85883b1cf 100644 --- a/vcl/source/app/IconThemeInfo.cxx +++ b/vcl/source/app/IconThemeInfo.cxx @@ -136,9 +136,7 @@ IconThemeInfo::ThemeIdToDisplayName(const OUString& themeId) sal_Unicode firstLetter = aDisplayName[0]; if (rtl::isAsciiLowerCase(firstLetter)) { - OUString aUpper(sal_Unicode(rtl::toAsciiUpperCase(firstLetter))); - aUpper += aDisplayName.copy(1); - aDisplayName = aUpper; + aDisplayName = OUStringChar(sal_Unicode(rtl::toAsciiUpperCase(firstLetter))) + aDisplayName.copy(1); } } diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 8ab88f04b9c4..4b19c42ad5c4 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -396,8 +396,8 @@ IMPL_LINK_NOARG(ComboBox::Impl, ImplSelectHdl, LinkParamNone*, void) aText += OUStringChar(m_cMultiSep); if ( !aText.isEmpty() ) aText += " "; // slightly loosen - aText += m_pImplLB->GetEntryList()->GetEntryText( nP ); - aText += OUStringChar(m_cMultiSep); + aText += m_pImplLB->GetEntryList()->GetEntryText( nP ) + + OUStringChar(m_cMultiSep); } } aText = comphelper::string::stripEnd( aText, m_cMultiSep ); diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 6d00e2898f04..7652af9dd165 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -2402,8 +2402,7 @@ OUString TimeFormatter::FormatTime(const tools::Time& rNewTime, TimeFieldFormat sal_uLong n = rNewTime.GetHour() * 3600L; n += rNewTime.GetMin() * 60L; n += rNewTime.GetSec(); - aStr = OUString::number( n ); - aStr += rLocaleData.getTime100SecSep(); + aStr = OUString::number( n ) + rLocaleData.getTime100SecSep(); std::ostringstream ostr; ostr.fill('0'); ostr.width(9); diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 730b8922dccf..13e7c4fb7615 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -306,9 +306,8 @@ namespace const OUString& rGeometryShaderName, const OString& rDigest ) { - OString aFileName; - aFileName += getCacheFolder(); - aFileName += OUStringToOString( rVertexShaderName, RTL_TEXTENCODING_UTF8 ) + "-" + + OString aFileName = getCacheFolder() + + OUStringToOString( rVertexShaderName, RTL_TEXTENCODING_UTF8 ) + "-" + OUStringToOString( rFragmentShaderName, RTL_TEXTENCODING_UTF8 ) + "-"; if (!rGeometryShaderName.isEmpty()) aFileName += OUStringToOString( rGeometryShaderName, RTL_TEXTENCODING_UTF8 ) + "-"; diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 6c6ea0c6563d..75343a41b771 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -254,9 +254,9 @@ namespace * language-territory stuff needs to be changed! */ SAL_INFO_IF( !rLangTag.isIsoLocale(), "vcl.fonts", "localizedsorter::bestname - not an ISO locale"); OString sLangMatch(OUStringToOString(rLangTag.getLanguage().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8)); - OString sFullMatch = sLangMatch; - sFullMatch += OString('-'); - sFullMatch += OUStringToOString(rLangTag.getCountry().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8); + OString sFullMatch = sLangMatch + + "-" + + OUStringToOString(rLangTag.getCountry().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8); bool alreadyclosematch = false; bool found_fallback_englishname = false; diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 50c546a31e0f..23fd1683b8ef 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -2710,8 +2710,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) // remove the dummy char xHackRange->setString(""); - OUString sLabel = xFootnote->getLabel(); - sLabel += OUStringChar(aSymbolData.cSymbol); + OUString sLabel = xFootnote->getLabel() + OUStringChar(aSymbolData.cSymbol); xFootnote->setLabel(sLabel); } } diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index d5b7d906ecfc..44c9afee02fd 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -690,8 +690,8 @@ bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, OUStr pNew = new ImpXMLAutoLayoutInfo(nType, pInfo); mvAutoLayoutInfoList.emplace_back( pNew ); OUString sNewName = - "AL" + OUString::number(mvAutoLayoutInfoList.size() - 1); - sNewName += "T" + OUString::number(nType); + "AL" + OUString::number(mvAutoLayoutInfoList.size() - 1) + + "T" + OUString::number(nType); pNew->SetLayoutName(sNewName); } diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 9baf64552411..80955168676d 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -1205,13 +1205,13 @@ void XMLEnhancedCustomShapeContext::EndElement() if ( GetEquationName( rEquation, nIndexOf + 1, aEquationName ) ) { // copying first characters inclusive '?' - OUString aNew( rEquation.copy( 0, nIndexOf + 1 ) ); sal_Int32 nIndex = 0; EquationHashMap::iterator aHashIter( pH->find( aEquationName ) ); if ( aHashIter != pH->end() ) nIndex = (*aHashIter).second; - aNew += OUString::number( nIndex ); - aNew += rEquation.copy( nIndexOf + aEquationName.getLength() + 1 ); + OUString aNew = rEquation.copy( 0, nIndexOf + 1 ) + + OUString::number( nIndex ) + + rEquation.copy( nIndexOf + aEquationName.getLength() + 1 ); rEquation = aNew; } nIndexOf++; diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index 945280d8b55d..7356de79a5d4 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -897,9 +897,7 @@ cssu::Reference< cssxs::XDocumentHandler > SAL_CALL SAXEventKeeperImpl::setNextH OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree() { - OUString rc; - - rc += "ElementMarkBuffers: size = " + OUString rc = "ElementMarkBuffers: size = " + OUString::number(m_vElementMarkBuffers.size()) + "\nCurrentBufferNode: " + m_xXMLDocument->getNodeName(m_pCurrentBufferNode->getXMLElement()) |