ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

simplify "a = a +" to "a +="

Browse Source 
mostly so that my stringadd loplugin can point out places to improve

Change-Id: I9920ee1c99cdb6b811ba67ff9d8e32aa261884b5
Reviewed-on: https://gerrit.libreoffice.org/80618
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2019-10-11 07:18:11 +02:00
parent cfd06eb99b
commit cdbac696fb
58 changed files with 184 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accessibility/source/standard/accessiblemenuitemcomponent.cxx
+1 -1
View File
@@ -189,7 +189,7 @@ OUString OAccessibleMenuItemComponent::GetAccessibleName()
sName = OutputDevice::GetNonMnemonicString( sName );
#if defined(_WIN32)
if ( m_pParent->GetAccelKey( nItemId ).GetName().getLength() )
sName = sName + "\t" + m_pParent->GetAccelKey(nItemId).GetName();
sName += "\t" + m_pParent->GetAccelKey(nItemId).GetName();
#endif
}
basic/source/classes/sbxmod.cxx
+1 -1
View File
@@ -2565,7 +2565,7 @@ void SbUserFormModule::InitObject()
}
catch(const Exception& ) {}
sDialogUrl = sDialogUrl + sProjectName + "." + GetName() + "?location=document";
sDialogUrl += sProjectName + "." + GetName() + "?location=document";
uno::Reference< awt::XDialogProvider > xProvider = awt::DialogProvider::createWithModel( xContext, m_xModel );
m_xDialog = xProvider->createDialog( sDialogUrl );
basic/source/runtime/iosys.cxx
+3 -3
View File
@@ -535,7 +535,7 @@ ErrCode const & SbiStream::Read( char& ch )
if (aLine.isEmpty())
{
Read( aLine );
aLine = aLine + OString('\n');
aLine += OString('\n');
}
ch = aLine[0];
aLine = aLine.copy(1);
@@ -582,7 +582,7 @@ ErrCode SbiStream::Write( const OString& rBuf )
}
if( IsText() )
{
aLine = aLine + rBuf;
aLine += rBuf;
// Get it out, if the end is an LF, but strip CRLF before,
// because the SvStream adds a CRLF!
sal_Int32 nLineLen = aLine.getLength();
@@ -729,7 +729,7 @@ char SbiIoSystem::Read()
if( aIn.isEmpty() )
{
ReadCon( aIn );
aIn = aIn + OString('\n');
aIn += OString('\n');
}
ch = aIn[0];
aIn = aIn.copy(1);
chart2/source/view/main/VLegend.cxx
+1 -1
View File
@@ -167,7 +167,7 @@ awt::Size lcl_createTextShapes(
if( i == 1 )
break;
aLabelString = aLabelString + aLabelSeq[i]->getString();
aLabelString += aLabelSeq[i]->getString();
// workaround for Issue #i67540#
if( aLabelString.isEmpty())
aLabelString = " ";
connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+1 -1
View File
@@ -916,7 +916,7 @@ OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( )
WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(aRecordset.GetFields());
WpADOField aField(aFields.GetItem(0));
aField.get_Value(aValue);
aRet = aRet + aValue.getString() + ",";
aRet += aValue.getString() + ",";
aRecordset.MoveNext();
}
aRecordset.Close();
connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+2 -2
View File
@@ -1502,9 +1502,9 @@ uno::Reference< XResultSet > ODatabaseMetaData::lcl_getKeys(const bool& bIsImpor
"ON FOREI.RDB$INDEX_NAME = FOREIGN_INDEX.RDB$INDEX_NAME "
"WHERE FOREI.RDB$CONSTRAINT_TYPE = 'FOREIGN KEY' ";
if (bIsImport)
sSQL = sSQL + "AND FOREI.RDB$RELATION_NAME = '"+ table +"'";
sSQL += "AND FOREI.RDB$RELATION_NAME = '"+ table +"'";
else
sSQL = sSQL + "AND PRIM.RDB$RELATION_NAME = '"+ table +"'";
sSQL += "AND PRIM.RDB$RELATION_NAME = '"+ table +"'";
uno::Reference< XResultSet > rs = statement->executeQuery(sSQL);
uno::Reference< XRow > xRow( rs, UNO_QUERY_THROW );
connectivity/source/drivers/odbc/OConnection.cxx
+2 -2
View File
@@ -224,13 +224,13 @@ SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyVal
{
if( ! (pBegin->Value >>= aUID) )
SAL_WARN("connectivity.odbc", "Construct: unable to get property user");
aDSN = aDSN + ";UID=" + aUID;
aDSN += ";UID=" + aUID;
}
else if( pBegin->Name == "password")
{
if( ! (pBegin->Value >>= aPWD) )
SAL_WARN("connectivity.odbc", "Construct: unable to get property password");
aDSN = aDSN + ";PWD=" + aPWD;
aDSN += ";PWD=" + aPWD;
}
else if( pBegin->Name == "UseCatalog")
{
dbaccess/source/ui/dlg/DbAdminImpl.cxx
+1 -1
View File
@@ -124,7 +124,7 @@ namespace
if ( _pPortNumber )
{
sNewUrl = sNewUrl + ":" + OUString::number(_pPortNumber->GetValue());
sNewUrl += ":" + OUString::number(_pPortNumber->GetValue());
}
return sNewUrl;
dbaccess/source/ui/misc/TokenWriter.cxx
+43 -44
View File
@@ -690,11 +690,11 @@ void OHTMLImportExport::WriteBody()
void OHTMLImportExport::WriteTables()
{
OString aStrOut = OOO_STRING_SVTOOLS_HTML_table;
aStrOut = aStrOut + " ";
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_frame;
aStrOut = aStrOut + "=";
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_TF_void;
OString aStrOut = OOO_STRING_SVTOOLS_HTML_table
" "
OOO_STRING_SVTOOLS_HTML_frame
"="
OOO_STRING_SVTOOLS_HTML_TF_void;
Sequence< OUString> aNames;
Reference<XNameAccess> xColumns;
@@ -714,21 +714,21 @@ void OHTMLImportExport::WriteTables()
}
}
aStrOut = aStrOut + " ";
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_align;
aStrOut = aStrOut + "=";
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_AL_left;
aStrOut = aStrOut + " ";
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cellspacing;
aStrOut = aStrOut + "=";
aStrOut = aStrOut + OString::number(nCellSpacing);
aStrOut = aStrOut + " ";
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_cols;
aStrOut = aStrOut + "=";
aStrOut = aStrOut + OString::number(aNames.getLength());
aStrOut = aStrOut + " ";
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_border;
aStrOut = aStrOut + "=1";
aStrOut += " "
OOO_STRING_SVTOOLS_HTML_O_align
"="
OOO_STRING_SVTOOLS_HTML_AL_left
" "
OOO_STRING_SVTOOLS_HTML_O_cellspacing
"=" +
OString::number(nCellSpacing) +
" "
OOO_STRING_SVTOOLS_HTML_O_cols
"=" +
OString::number(aNames.getLength()) +
" "
OOO_STRING_SVTOOLS_HTML_O_border
"=1";
IncIndent(1);
TAG_ON( aStrOut.getStr() );
@@ -861,20 +861,19 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat, sal_Int32 nWidthPixel, sal
// despite the <TABLE COLS=n> and <COL WIDTH=x> designation necessary,
// as Netscape is not paying attention to them.
// column width
aStrTD = aStrTD + " ";
aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_width;
aStrTD = aStrTD + "=";
aStrTD = aStrTD + OString::number(nWidthPixel);
aStrTD += " "
OOO_STRING_SVTOOLS_HTML_O_width
"=" +
OString::number(nWidthPixel) +
// line height
aStrTD = aStrTD + " ";
aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_height;
aStrTD = aStrTD + "=";
aStrTD = aStrTD + OString::number(nHeightPixel);
aStrTD = aStrTD + " ";
aStrTD = aStrTD + OOO_STRING_SVTOOLS_HTML_O_align;
aStrTD = aStrTD + "=";
aStrTD = aStrTD + pChar;
" "
OOO_STRING_SVTOOLS_HTML_O_height
"=" +
OString::number(nHeightPixel) +
" "
OOO_STRING_SVTOOLS_HTML_O_align
"=" +
pChar;
SvNumberFormatsSupplierObj* pSupplierImpl = m_xFormatter.is() ? comphelper::getUnoTunnelImplementation<SvNumberFormatsSupplierObj>(m_xFormatter->getNumberFormatsSupplier()) : nullptr;
SvNumberFormatter* pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() : nullptr;
@@ -929,18 +928,18 @@ void OHTMLImportExport::FontOn()
#endif
// <FONT FACE="xxx">
OString aStrOut = "<";
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_font;
aStrOut = aStrOut + " ";
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_face;
aStrOut = aStrOut + "=";
aStrOut = aStrOut + "\"";
aStrOut = aStrOut + OUStringToOString(m_aFont.Name,osl_getThreadTextEncoding());
OString aStrOut = "<"
OOO_STRING_SVTOOLS_HTML_font
" "
OOO_STRING_SVTOOLS_HTML_O_face
"="
"\"" +
OUStringToOString(m_aFont.Name,osl_getThreadTextEncoding()) +
// TODO : think about the encoding of the font name
aStrOut = aStrOut + "\"";
aStrOut = aStrOut + " ";
aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_O_color;
aStrOut = aStrOut + "=";
"\""
" "
OOO_STRING_SVTOOLS_HTML_O_color
"=";
m_pStream->WriteOString( aStrOut );
sal_Int32 nColor = 0;
editeng/source/items/frmitems.cxx
+22 -36
View File
@@ -556,8 +556,7 @@ bool SvxLRSpaceItem::GetPresentation
Application::GetSettings().GetUILanguageTag());
else
{
rText = rText +
GetMetricText( nLeftMargin, eCoreUnit, ePresUnit, &rIntl ) +
rText += GetMetricText( nLeftMargin, eCoreUnit, ePresUnit, &rIntl ) +
" " + EditResId(GetMetricId(ePresUnit));
}
rText += OUString(cpDelim);
@@ -565,12 +564,11 @@ bool SvxLRSpaceItem::GetPresentation
{
rText += EditResId(RID_SVXITEMS_LRSPACE_FLINE);
if ( 100 != nPropFirstLineOfst )
rText = rText + unicode::formatPercent(nPropFirstLineOfst,
Application::GetSettings().GetUILanguageTag());
rText += unicode::formatPercent(nPropFirstLineOfst,
Application::GetSettings().GetUILanguageTag());
else
{
rText = rText +
GetMetricText( static_cast<long>(nFirstLineOfst),
rText += GetMetricText( static_cast<long>(nFirstLineOfst),
eCoreUnit, ePresUnit, &rIntl ) +
" " + EditResId(GetMetricId(ePresUnit));
}
@@ -578,12 +576,11 @@ bool SvxLRSpaceItem::GetPresentation
}
rText += EditResId(RID_SVXITEMS_LRSPACE_RIGHT);
if ( 100 != nPropRightMargin )
rText = rText + unicode::formatPercent(nPropRightMargin,
rText += unicode::formatPercent(nPropRightMargin,
Application::GetSettings().GetUILanguageTag());
else
{
rText = rText +
GetMetricText( nRightMargin,
rText += GetMetricText( nRightMargin,
eCoreUnit, ePresUnit, &rIntl ) +
" " + EditResId(GetMetricId(ePresUnit));
}
@@ -799,11 +796,10 @@ bool SvxULSpaceItem::GetPresentation
}
else
{
rText = rText +
GetMetricText( static_cast<long>(nUpper), eCoreUnit, ePresUnit, &rIntl ) +
rText += GetMetricText( static_cast<long>(nUpper), eCoreUnit, ePresUnit, &rIntl ) +
" " + EditResId(GetMetricId(ePresUnit));
}
rText = rText + OUString(cpDelim) + EditResId(RID_SVXITEMS_ULSPACE_LOWER);
rText += OUString(cpDelim) + EditResId(RID_SVXITEMS_ULSPACE_LOWER);
if ( 100 != nPropLower )
{
rText += unicode::formatPercent(nPropLower,
@@ -811,8 +807,7 @@ bool SvxULSpaceItem::GetPresentation
}
else
{
rText = rText +
GetMetricText( static_cast<long>(nLower), eCoreUnit, ePresUnit, &rIntl ) +
rText += GetMetricText( static_cast<long>(nLower), eCoreUnit, ePresUnit, &rIntl ) +
" " + EditResId(GetMetricId(ePresUnit));
}
return true;
@@ -965,7 +960,7 @@ bool SvxProtectItem::GetPresentation
if ( bSize )
pId = RID_SVXITEMS_PROT_SIZE_TRUE;
rText = rText + EditResId(pId) + OUString(cpDelim);
rText += EditResId(pId) + OUString(cpDelim);
pId = RID_SVXITEMS_PROT_POS_FALSE;
if ( bPos )
@@ -1176,8 +1171,7 @@ bool SvxShadowItem::GetPresentation
if ( aShadowColor.GetTransparency() )
pId = RID_SVXITEMS_TRANSPARENT_TRUE;
rText = rText +
EditResId(pId) +
rText += EditResId(pId) +
OUString(cpDelim) +
GetMetricText( static_cast<long>(nWidth), eCoreUnit, ePresUnit, &rIntl ) +
OUString(cpDelim) +
@@ -1193,8 +1187,7 @@ bool SvxShadowItem::GetPresentation
const char* pId = RID_SVXITEMS_TRANSPARENT_FALSE;
if ( aShadowColor.GetTransparency() )
pId = RID_SVXITEMS_TRANSPARENT_TRUE;
rText = rText +
EditResId(pId) +
rText += EditResId(pId) +
OUString(cpDelim) +
GetMetricText( static_cast<long>(nWidth), eCoreUnit, ePresUnit, &rIntl ) +
" " + EditResId(GetMetricId(ePresUnit)) +
@@ -1722,23 +1715,22 @@ bool SvxBoxItem::GetPresentation
{
if ( pBottom )
{
rText = rText + pBottom->GetValueString( eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp;
rText += pBottom->GetValueString( eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp;
}
if ( pLeft )
{
rText = rText + pLeft->GetValueString( eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp;
rText += pLeft->GetValueString( eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp;
}
if ( pRight )
{
rText = rText + pRight->GetValueString( eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp;
rText += pRight->GetValueString( eCoreUnit, ePresUnit, &rIntl ) + cpDelimTmp;
}
}
rText += GetMetricText( static_cast<long>(nTopDist), eCoreUnit, ePresUnit, &rIntl );
if( nTopDist != nBottomDist || nTopDist != nLeftDist ||
nTopDist != nRightDist )
{
rText = rText +
cpDelimTmp +
rText += cpDelimTmp +
GetMetricText( static_cast<long>(nBottomDist), eCoreUnit,
ePresUnit, &rIntl ) +
cpDelimTmp +
@@ -1767,29 +1759,25 @@ bool SvxBoxItem::GetPresentation
{
if ( pTop )
{
rText = rText +
EditResId(RID_SVXITEMS_BORDER_TOP) +
rText += EditResId(RID_SVXITEMS_BORDER_TOP) +
pTop->GetValueString( eCoreUnit, ePresUnit, &rIntl, true ) +
cpDelimTmp;
}
if ( pBottom )
{
rText = rText +
EditResId(RID_SVXITEMS_BORDER_BOTTOM) +
rText += EditResId(RID_SVXITEMS_BORDER_BOTTOM) +
pBottom->GetValueString( eCoreUnit, ePresUnit, &rIntl, true ) +
cpDelimTmp;
}
if ( pLeft )
{
rText = rText +
EditResId(RID_SVXITEMS_BORDER_LEFT) +
rText += EditResId(RID_SVXITEMS_BORDER_LEFT) +
pLeft->GetValueString( eCoreUnit, ePresUnit, &rIntl, true ) +
cpDelimTmp;
}
if ( pRight )
{
rText = rText +
EditResId(RID_SVXITEMS_BORDER_RIGHT) +
rText += EditResId(RID_SVXITEMS_BORDER_RIGHT) +
pRight->GetValueString( eCoreUnit, ePresUnit, &rIntl, true ) +
cpDelimTmp;
}
@@ -1800,15 +1788,13 @@ bool SvxBoxItem::GetPresentation
if( nTopDist == nBottomDist && nTopDist == nLeftDist &&
nTopDist == nRightDist )
{
rText = rText +
GetMetricText( static_cast<long>(nTopDist), eCoreUnit,
rText += GetMetricText( static_cast<long>(nTopDist), eCoreUnit,
ePresUnit, &rIntl ) +
" " + EditResId(GetMetricId(ePresUnit));
}
else
{
rText = rText +
EditResId(RID_SVXITEMS_BORDER_TOP) +
rText += EditResId(RID_SVXITEMS_BORDER_TOP) +
GetMetricText( static_cast<long>(nTopDist), eCoreUnit,
ePresUnit, &rIntl ) +
" " + EditResId(GetMetricId(ePresUnit)) +
editeng/source/items/optitems.cxx
+1 -2
View File
@@ -56,8 +56,7 @@ bool SfxHyphenRegionItem::GetPresentation
const IntlWrapper&
) const
{
rText = rText +
EditResId(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) +
rText += EditResId(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) +
"," +
EditResId(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail));
return true;
editeng/source/items/paraitem.cxx
+2 -3
View File
@@ -660,7 +660,7 @@ bool SvxHyphenZoneItem::GetPresentation
if ( bPageEnd )
pId = RID_SVXITEMS_PAGE_END_TRUE;
rText = rText + EditResId(pId) + cpDelimTmp +
rText += EditResId(pId) + cpDelimTmp +
OUString::number( nMinLead ) + cpDelimTmp +
OUString::number( nMinTrail ) + cpDelimTmp +
OUString::number( nMaxHyphens );
@@ -677,8 +677,7 @@ bool SvxHyphenZoneItem::GetPresentation
if ( bPageEnd )
pId = RID_SVXITEMS_PAGE_END_TRUE;
rText = rText +
EditResId(pId) +
rText += EditResId(pId) +
cpDelimTmp +
EditResId(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) +
cpDelimTmp +
editeng/source/items/textitem.cxx
+3 -4
View File
@@ -965,7 +965,7 @@ bool SvxTextLineItem::GetPresentation
{
rText = GetValueTextByPos( GetValue() );
if( !mColor.GetTransparency() )
rText = rText + OUString(cpDelim) + ::GetColorString( mColor );
rText += OUString(cpDelim) + ::GetColorString( mColor );
return true;
}
@@ -1540,8 +1540,7 @@ bool SvxKerningItem::GetPresentation
if (pId)
rText += EditResId(pId);
rText = rText +
GetMetricText( static_cast<long>(GetValue()), eCoreUnit, MapUnit::MapPoint, &rIntl ) +
rText += GetMetricText( static_cast<long>(GetValue()), eCoreUnit, MapUnit::MapPoint, &rIntl ) +
" " + EditResId(GetMetricId(MapUnit::MapPoint));
return true;
}
@@ -1721,7 +1720,7 @@ bool SvxEscapementItem::GetPresentation
if( DFLT_ESC_AUTO_SUPER == nEsc || DFLT_ESC_AUTO_SUB == nEsc )
rText += EditResId(RID_SVXITEMS_ESCAPEMENT_AUTO);
else
rText = rText + OUString::number( nEsc ) + "%";
rText += OUString::number( nEsc ) + "%";
}
return true;
}
editeng/source/rtf/svxrtf.cxx
+1 -1
View File
@@ -559,7 +559,7 @@ void SvxRTFParser::ReadFontTable()
{
// All data from the font is available, so off to the table
if (!sAltNm.isEmpty())
sFntNm = sFntNm + ";" + sAltNm;
sFntNm += ";" + sAltNm;
pFont->SetFamilyName( sFntNm );
m_FontTable.insert(std::make_pair(nInsFontNo, std::move(pFont)));
helpcompiler/inc/HelpCompiler.hxx
+1 -1
View File
@@ -108,7 +108,7 @@ namespace fs
{
OString tmp(in);
OUString ustrSystemPath(OStringToOUString(tmp, getThreadTextEncoding()));
data = data + ustrSystemPath;
data += ustrSystemPath;
}
void append(const std::string &in) { append(in.c_str()); }
};
include/vcl/weld.hxx
+1 -1
View File
@@ -1857,7 +1857,7 @@ public:
sal_Int32 nIdx = m_sHelpRoot.lastIndexOf('.');
if (nIdx != -1)
m_sHelpRoot = m_sHelpRoot.copy(0, nIdx);
m_sHelpRoot = m_sHelpRoot + OString('/');
m_sHelpRoot += OString('/');
}
virtual std::unique_ptr<MessageDialog> weld_message_dialog(const OString& id,
bool bTakeOwnership = true)
lotuswordpro/source/filter/xfilter/xfstylecont.cxx
+1 -1
View File
@@ -113,7 +113,7 @@ IXFStyleRet XFStyleContainer::AddStyle(std::unique_ptr<IXFStyle> pStyle)
//for name conflict
if(FindStyle( name))
{
name = name + OUString::number(m_aStyles.size()+1);
name += OUString::number(m_aStyles.size()+1);
pStyle->SetStyleName(name);
}
}
odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
+2 -2
View File
@@ -109,12 +109,12 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
else if(pBegin->Name.equalsAscii(pUser))
{
pBegin->Value >>= aUID;
aDSN = aDSN + ";UID=" + aUID;
aDSN += ";UID=" + aUID;
}
else if(pBegin->Name.equalsAscii(pPwd))
{
pBegin->Value >>= aPWD;
aDSN = aDSN + ";PWD=" + aPWD;
aDSN += ";PWD=" + aPWD;
}
else if(pBegin->Name.equalsAscii(pUseCatalog))
{
reportdesign/source/filter/xml/xmlExport.cxx
+1 -1
View File
@@ -1535,7 +1535,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
// so we need to expand the formula of sCountName
sPrefix = " + 1) / " + OUString::number(xGroup->getGroupInterval());
sFunctionName = sFunction + "_" + sExpression;
sFunction = sFunction + "(";
sFunction += "(";
sInitialFormula = "rpt:0";
}
break;
sax/qa/cppunit/xmlimport.cxx
+6 -6
View File
@@ -156,15 +156,15 @@ void SAL_CALL TestDocumentHandler::startElement( const OUString& aName, const Re
OUString sAttrValue = xAttribs->getValueByIndex(i);
OUString sAttrName = canonicalform(xAttribs->getNameByIndex(i), sAttrValue, false);
if (!sAttrName.isEmpty())
sAttributes = sAttributes + sAttrName + sAttrValue;
sAttributes += sAttrName + sAttrValue;
}
m_aStr = m_aStr + canonicalform(aName, "", true) + sAttributes;
m_aStr += canonicalform(aName, "", true) + sAttributes;
}
void SAL_CALL TestDocumentHandler::endElement( const OUString& aName )
{
m_aStr = m_aStr + canonicalform(aName, "", true);
m_aStr += canonicalform(aName, "", true);
sal_uInt16 nPopQty = m_aCountStack.top();
for (sal_uInt16 i=0; i<nPopQty; i++)
m_aNamespaceStack.pop_back();
@@ -174,19 +174,19 @@ void SAL_CALL TestDocumentHandler::endElement( const OUString& aName )
void SAL_CALL TestDocumentHandler::characters( const OUString& aChars )
{
m_aStr = m_aStr + aChars;
m_aStr += aChars;
}
void SAL_CALL TestDocumentHandler::ignorableWhitespace( const OUString& aWhitespaces )
{
m_aStr = m_aStr + aWhitespaces;
m_aStr += aWhitespaces;
}
void SAL_CALL TestDocumentHandler::processingInstruction( const OUString& aTarget, const OUString& aData )
{
m_aStr = m_aStr + aTarget + aData;
m_aStr += aTarget + aData;
}
sc/source/core/data/attrib.cxx
+1 -1
View File
@@ -610,7 +610,7 @@ bool ScPageScaleToItem::GetPresentation(
OUString aName( ScResId( STR_SCATTR_PAGE_SCALETO ) );
OUString aValue( ScResId( STR_SCATTR_PAGE_SCALE_WIDTH ) );
lclAppendScalePageCount( aValue, mnWidth );
aValue = aValue + ", " + ScResId( STR_SCATTR_PAGE_SCALE_HEIGHT );
aValue += ", " + ScResId( STR_SCATTR_PAGE_SCALE_HEIGHT );
lclAppendScalePageCount( aValue, mnHeight );
switch( ePres )
sc/source/core/data/docpool.cxx
+4 -4
View File
@@ -429,7 +429,7 @@ static bool lcl_HFPresentation
aText = EditResId(RID_SVXITEMS_LRSPACE_LEFT);
if ( 100 != nPropLeftMargin )
{
aText = aText + unicode::formatPercent(nPropLeftMargin,
aText += unicode::formatPercent(nPropLeftMargin,
Application::GetSettings().GetUILanguageTag());
}
else
@@ -443,7 +443,7 @@ static bool lcl_HFPresentation
EditResId(RID_SVXITEMS_LRSPACE_RIGHT);
if ( 100 != nPropRightMargin )
{
aText = aText + unicode::formatPercent(nPropLeftMargin,
aText += unicode::formatPercent(nPropLeftMargin,
Application::GetSettings().GetUILanguageTag());
}
else
@@ -462,7 +462,7 @@ static bool lcl_HFPresentation
if ( aText.getLength() )
{
rText = rText + aText + " + ";
rText += aText + " + ";
}
}
@@ -559,7 +559,7 @@ bool ScDocumentPool::GetPresentation(
if( nPercent )
{
rText = ScResId(STR_SCATTR_PAGE_SCALE) + aStrSep;
rText = rText + unicode::formatPercent(nPercent,
rText += unicode::formatPercent(nPercent,
Application::GetSettings().GetUILanguageTag());
}
else
sc/source/core/opencl/formulagroupcl.cxx
+1 -1
View File
@@ -2583,7 +2583,7 @@ public:
{
std::string t = "_" + mpCodeGen->BinFuncName();
for (const auto & rSubArgument : mvSubArguments)
t = t + rSubArgument->DumpOpName();
t += rSubArgument->DumpOpName();
return t;
}
virtual void DumpInlineFun( std::set<std::string>& decls,
sc/source/filter/excel/xecontent.cxx
+1 -1
View File
@@ -1255,7 +1255,7 @@ OString createHexStringFromDigit(sal_uInt8 nDigit)
{
OString aString = OString::number( nDigit, 16 );
if(aString.getLength() == 1)
aString = aString + OString::number(0);
aString += OString::number(0);
return aString;
}
sc/source/ui/app/inputhdl.cxx
+1 -1
View File
@@ -1592,7 +1592,7 @@ static OUString lcl_Calculate( const OUString& rFormula, ScDocument* pDoc, const
ScRange aTestRange;
if ( bColRowName || (aTestRange.Parse(rFormula) & ScRefFlags::VALID) )
aValue = aValue + " ...";
aValue += " ...";
return aValue;
}
sc/source/ui/view/gridwin.cxx
+1 -1
View File
@@ -2282,7 +2282,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
if ( aScRange.aStart == aScRange.aEnd )
{
// make sure there is a range selection string even for a single cell
aAddr = aAddr + ":" + aAddr;
aAddr += ":" + aAddr;
}
//! SID_MARKAREA does not exist anymore ???
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+1 -1
View File
@@ -691,7 +691,7 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
if (!layerAltText.isEmpty())
{
sName = " ";
sDisplay = sDisplay + sName + layerAltText;
sDisplay += sName + layerAltText;
}
}
}
sd/source/ui/annotations/annotationmanager.cxx
+1 -1
View File
@@ -155,7 +155,7 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio
::tools::Time aTime( aDateTime );
if(aTime.GetTime() != 0)
sRet = sRet + " " + rLocalData.getTime( aTime,false );
sRet += " " + rLocalData.getTime( aTime,false );
}
return sRet;
}
sd/source/ui/dlg/custsdlg.cxx
+2 -2
View File
@@ -182,14 +182,14 @@ void SdCustomShowDlg::SelectHdl(void const *p)
sal_Int32 nNum = 1;
if( nStrPos < 0 )
{
aStr = aStr + " (" + aStrCopy + OUString::number( nNum ) + ")";
aStr += " (" + aStrCopy + OUString::number( nNum ) + ")";
nStrPos = aStr.indexOf( aStrCopy );
}
nStrPos = nStrPos + aStrCopy.getLength();
// that we do not access into the nirvana (--> endless loop)
if( nStrPos >= aStr.getLength() )
{
aStr = aStr + " " + OUString::number( nNum );
aStr += " " + OUString::number( nNum );
}
// check name...
setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
+1 -1
View File
@@ -104,7 +104,7 @@ extern "C" __declspec(dllexport) UINT __stdcall CompleteInstallPath( MSIHANDLE h
if ( oldVersionExists )
{
// Adding the new path content sOfficeDirHostname
sInstallLocation = sInstallLocation + sOfficeDirHostname;
sInstallLocation += sOfficeDirHostname;
// Setting the new property value
MsiSetPropertyW(handle, L"INSTALLLOCATION", sInstallLocation.c_str());
}
sfx2/source/dialog/mailmodel.cxx
+1 -1
View File
@@ -849,7 +849,7 @@ bool CreateFromAddress_Impl( OUString& rFrom )
{
if ( !rFrom.isEmpty() )
rFrom += " ";
rFrom = rFrom + "<" + comphelper::string::strip(aEmailName, ' ') + ">";
rFrom += "<" + comphelper::string::strip(aEmailName, ' ') + ">";
}
else
rFrom.clear();
sfx2/source/dialog/versdlg.cxx
+4 -4
View File
@@ -181,8 +181,8 @@ SfxVersionDialog::SfxVersionDialog(weld::Window* pParent, SfxViewFrame* pVwFrame
m_xVersionBox->grab_focus();
// set dialog title (filename or docinfo title)
OUString sText = m_xDialog->get_title();
sText = sText + " " + m_pViewFrame->GetObjectShell()->GetTitle();
OUString sText = m_xDialog->get_title() +
" " + m_pViewFrame->GetObjectShell()->GetTitle();
m_xDialog->set_title(sText);
Init_Impl();
@@ -441,8 +441,8 @@ SfxCmisVersionsDialog::SfxCmisVersionsDialog(weld::Window* pParent, SfxViewFrame
m_xVersionBox->grab_focus();
OUString sText = m_xDialog->get_title();
sText = sText + " " + m_pViewFrame->GetObjectShell()->GetTitle();
OUString sText = m_xDialog->get_title() +
" " + m_pViewFrame->GetObjectShell()->GetTitle();
m_xDialog->set_title(sText);
LoadVersions();
sfx2/source/doc/DocumentMetadataAccess.cxx
+1 -1
View File
@@ -150,7 +150,7 @@ uno::Reference<rdf::XURI> createBaseURI(
assert(!pkgURI.isEmpty());
if (!pkgURI.isEmpty() && !pkgURI.endsWith("/"))
{
pkgURI = pkgURI + "/";
pkgURI += "/";
}
}
sfx2/source/doc/sfxbasemodel.cxx
+1 -1
View File
@@ -295,7 +295,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument
OSL_ENSURE(!uri.isEmpty(), "GetDMA: empty uri?");
if (!uri.isEmpty() && !uri.endsWith("/"))
{
uri = uri + "/";
uri += "/";
}
m_xDocumentMetadata = new ::sfx2::DocumentMetadataAccess(
sfx2/source/doc/templatedlg.cxx
+3 -3
View File
@@ -914,7 +914,7 @@ void SfxTemplateManagerDlg::OnTemplateImportCategory(const OUString& sCategory)
if (aTemplateList.isEmpty())
aTemplateList = rFile;
else
aTemplateList = aTemplateList + "\n" + rFile;
aTemplateList += "\n" + rFile;
}
}
@@ -968,7 +968,7 @@ void SfxTemplateManagerDlg::OnTemplateExport()
if (aTemplateList.isEmpty())
aTemplateList = pItem->maTitle;
else
aTemplateList = aTemplateList + "\n" + pItem->maTitle;
aTemplateList += "\n" + pItem->maTitle;
}
++i;
}
@@ -1001,7 +1001,7 @@ void SfxTemplateManagerDlg::OnTemplateExport()
if (aTemplateList.isEmpty())
aTemplateList = pItem->maTitle;
else
aTemplateList = aTemplateList + "\n" + pItem->maTitle;
aTemplateList += "\n" + pItem->maTitle;
}
++i;
}
stoc/source/defaultregistry/defaultregistry.cxx
+3 -3
View File
@@ -827,7 +827,7 @@ sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OU
throw InvalidRegistryException();
}
resolvedName = resolvedName + aLinkName.copy(lastIndex);
resolvedName += aLinkName.copy(lastIndex);
}
else
{
@@ -882,7 +882,7 @@ void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName )
throw InvalidRegistryException();
}
resolvedName = resolvedName + rLinkName.copy(lastIndex);
resolvedName += rLinkName.copy(lastIndex);
}
else
{
@@ -925,7 +925,7 @@ OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName )
throw InvalidRegistryException();
}
resolvedName = resolvedName + rLinkName.copy(lastIndex);
resolvedName += rLinkName.copy(lastIndex);
}
else
{
stoc/source/implementationregistration/implreg.cxx
+2 -2
View File
@@ -194,7 +194,7 @@ void prepareLink( const Reference < XSimpleRegistry > & xDest,
if (pShortName)
{
linkRefName = linkRefName + link.copy(pShortName - pTmpName + 1);
linkRefName += link.copy(pShortName - pTmpName + 1);
linkName = link.copy(0, pShortName - pTmpName);
}
@@ -515,7 +515,7 @@ void prepareUserKeys(const Reference < XSimpleRegistry >& xDest,
OUString linkTarget = xKey->getLinkTarget(relativKey);
OUString linkName(xKey->getKeyName().copy(xUnoKey->getKeyName().getLength()));
linkName = linkName + "/" + relativKey;
linkName += "/" + relativKey;
if (bRegister)
{
stoc/source/javavm/javavm.cxx
+3 -4
View File
@@ -473,8 +473,7 @@ void getJavaPropsFromSafetySettings(
case 3: sVal = "none";
break;
}
OUString sProperty("appletviewer.security.mode=");
sProperty= sProperty + sVal;
OUString sProperty = "appletviewer.security.mode=" + sVal;
pjvm->pushProp(sProperty);
}
css::uno::Reference<css::registry::XRegistryKey> key_CheckSecurity= xRegistryRootKey->openKey(
@@ -484,9 +483,9 @@ void getJavaPropsFromSafetySettings(
bool val = static_cast<bool>(key_CheckSecurity->getLongValue());
OUString sProperty("stardiv.security.disableSecurity=");
if( val)
sProperty= sProperty + "false";
sProperty += "false";
else
sProperty= sProperty + "true";
sProperty += "true";
pjvm->pushProp( sProperty);
}
}
svx/qa/unit/customshapes.cxx
+6 -8
View File
@@ -380,14 +380,12 @@ CPPUNIT_TEST_FIXTURE(CustomshapesTest, testTdf115813_OOXML_XY_handle)
|| (abs(nDesiredX - nObservedX) == 100 && abs(nDesiredY - nObservedY) <= 1)
|| (abs(nDesiredX - nObservedX) <= 1 && abs(nDesiredY - nObservedY) <= 1)))
{
sErrors += "\n";
//sErrors += OUString(sal_Unicode(10));
sErrors
= sErrors + OUString::number(i) + " " + sShapeType + ": " + OUString::number(j);
sErrors = sErrors + " X " + OUString::number(nDesiredX) + "|"
+ OUString::number(nObservedX);
sErrors = sErrors + " Y " + OUString::number(nDesiredY) + "|"
+ OUString::number(nObservedY);
sErrors += "\n" +
//sErrors += OUString(sal_Unicode(10));
OUString::number(i) + " " + sShapeType + ": " + OUString::number(j)
+ " X " + OUString::number(nDesiredX) + "|"
+ OUString::number(nObservedX) + " Y " + OUString::number(nDesiredY)
+ "|" + OUString::number(nObservedY);
}
}
}
svx/source/form/fmshimp.cxx
+4 -4
View File
@@ -2401,9 +2401,9 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest_Lock, FmSearchContext&, rfmscCont
// the cursor has a field matching the control source ?
if (xValidFormFields->hasByName(aName))
{
strFieldList = strFieldList + aName + ";";
strFieldList += aName + ";";
sFieldDisplayNames = sFieldDisplayNames +
sFieldDisplayNames +=
::comphelper::getString(xCurrentColModel->getPropertyValue(FM_PROP_LABEL)) +
";";
@@ -2431,10 +2431,10 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest_Lock, FmSearchContext&, rfmscCont
if (IsSearchableControl(xControl))
{
// all tests passed -> take along in the list
strFieldList = strFieldList + sControlSource + ";";
strFieldList += sControlSource + ";";
// the label which should appear for the control :
sFieldDisplayNames = sFieldDisplayNames +
sFieldDisplayNames +=
getLabelName(Reference< XPropertySet>(xControlModel, UNO_QUERY)) +
";";
svx/source/form/fmsrcimp.cxx
+1 -1
View File
@@ -805,7 +805,7 @@ void FmSearchEngine::SearchNextImpl()
strSearchExpression = "*" + strSearchExpression + "*";
break;
case MATCHING_BEGINNING :
strSearchExpression = strSearchExpression + "*";
strSearchExpression += "*";
break;
case MATCHING_END :
strSearchExpression = "*" + strSearchExpression;
svx/source/svdraw/presetooxhandleadjustmentrelations.cxx
+1 -1
View File
@@ -316,7 +316,7 @@ void PresetOOXHandleAdj::GetOOXHandleAdjRelation(
rSecondAdjValueIndex = -1;
if (sFullOOXShapeName.startsWith("ooxml-", &sKey))
{
sKey = sKey + "_" + OUString::number(nHandleIndex);
sKey += "_" + OUString::number(nHandleIndex);
HandleAdjRelHashMap::const_iterator aHashIter(s_HashMap.find(sKey));
if (aHashIter != s_HashMap.end())
sValue = (*aHashIter).second;
svx/source/svdraw/svdattr.cxx
+1 -1
View File
@@ -633,7 +633,7 @@ bool SdrFractionItem::GetPresentation(
if(nDiv != 1)
{
rText = rText + "/" + OUString::number(nDiv);
rText += "/" + OUString::number(nDiv);
}
}
else
sw/qa/extras/globalfilter/globalfilter.cxx
+2 -2
View File
@@ -780,7 +780,7 @@ void Test::testSkipImages()
for (auto const & rFilterNamePair : aFilterNames)
{
bool bSkipImages = !rFilterNamePair.second.isEmpty();
OString sFailedMessage = OString("Failed on filter: ") + rFilterNamePair.first.toUtf8();
OString sFailedMessage = OStringLiteral("Failed on filter: ") + rFilterNamePair.first.toUtf8();
if (mxComponent.is())
mxComponent->dispose();
@@ -792,7 +792,7 @@ void Test::testSkipImages()
{ "FilterOptions", uno::Any(rFilterNamePair.second) }
}));
mxComponent = loadFromDesktop(m_directories.getURLFromSrc(rFilterNamePair.first), "com.sun.star.text.TextDocument", args);
sFailedMessage = sFailedMessage + " - " + rFilterNamePair.second.toUtf8();
sFailedMessage += " - " + rFilterNamePair.second.toUtf8();
}
else
{
sw/source/core/access/acctable.cxx
+2 -2
View File
@@ -845,7 +845,7 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleRowDescription(
uno::Reference< XAccessibleText > xChildText( xChild, uno::UNO_QUERY );
if ( xChildText.is() )
{
sRowDesc = sRowDesc + xChildText->getText();
sRowDesc += xChildText->getText();
}
}
}
@@ -878,7 +878,7 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleColumnDescription(
uno::Reference< XAccessibleText > xChildText( xChild, uno::UNO_QUERY );
if ( xChildText.is() )
{
sColumnDesc = sColumnDesc + xChildText->getText();
sColumnDesc += xChildText->getText();
}
}
}
sw/source/filter/ww8/ww8par5.cxx
+1 -1
View File
@@ -3521,7 +3521,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, OUString& rStr
OSL_ENSURE(!sURL.isEmpty() || !sMark.isEmpty(), "WW8: Empty URL");
if( !sMark.isEmpty() )
sURL = sURL + "#" + sMark;
sURL += "#" + sMark;
SwFormatINetFormat aURL(sURL, sTarget);
// If on loading TOC field, change the default style into the "index link"
sw/source/uibase/utlui/attrdesc.cxx
+21 -23
View File
@@ -99,9 +99,8 @@ bool SwFormatCharFormat::GetPresentation
if ( pCharFormat )
{
OUString aStr;
rText = SwResId( STR_CHARFMT );
pCharFormat->GetPresentation( ePres, eCoreUnit, ePresUnit, aStr );
rText = rText + "(" + aStr + ")";
rText = SwResId( STR_CHARFMT ) + "(" + aStr + ")";
}
else
rText = SwResId( STR_NO_CHARFMT );
@@ -158,8 +157,7 @@ bool SwFormatDrop::GetPresentation
{
rText = OUString::number( GetChars() ) + " ";
}
rText = rText +
SwResId( STR_DROP_OVER ) +
rText += SwResId( STR_DROP_OVER ) +
" " +
OUString::number( GetLines() ) +
" " +
@@ -229,22 +227,22 @@ bool SwFormatFrameSize::GetPresentation
rText = SwResId( STR_FRM_WIDTH ) + " ";
if ( GetWidthPercent() )
{
rText = rText + unicode::formatPercent(GetWidthPercent(),
rText += unicode::formatPercent(GetWidthPercent(),
Application::GetSettings().GetUILanguageTag());
}
else
{
rText = rText + ::GetMetricText( GetWidth(), eCoreUnit, ePresUnit, &rIntl ) +
rText += ::GetMetricText( GetWidth(), eCoreUnit, ePresUnit, &rIntl ) +
" " + ::EditResId( ::GetMetricId( ePresUnit ) );
}
if ( ATT_VAR_SIZE != GetHeightSizeType() )
{
const char* pId = ATT_FIX_SIZE == m_eFrameHeightType ?
STR_FRM_FIXEDHEIGHT : STR_FRM_MINHEIGHT;
rText = rText + ", " + SwResId(pId) + " ";
rText += ", " + SwResId(pId) + " ";
if ( GetHeightPercent() )
{
rText = rText + unicode::formatPercent(GetHeightPercent(),
rText += unicode::formatPercent(GetHeightPercent(),
Application::GetSettings().GetUILanguageTag());
}
else
@@ -327,7 +325,7 @@ bool SwFormatSurround::GetPresentation
if ( IsAnchorOnly() )
{
rText = rText + " " + SwResId( STR_SURROUND_ANCHORONLY );
rText += " " + SwResId( STR_SURROUND_ANCHORONLY );
}
return true;
}
@@ -348,7 +346,7 @@ bool SwFormatVertOrient::GetPresentation
{
case text::VertOrientation::NONE:
{
rText = rText + SwResId( STR_POS_Y ) + " " +
rText += SwResId( STR_POS_Y ) + " " +
::GetMetricText( GetPos(), eCoreUnit, ePresUnit, &rIntl ) +
" " + EditResId( ::GetMetricId( ePresUnit ) );
}
@@ -394,7 +392,7 @@ bool SwFormatHoriOrient::GetPresentation
{
case text::HoriOrientation::NONE:
{
rText = rText + SwResId( STR_POS_X ) + " " +
rText += SwResId( STR_POS_X ) + " " +
::GetMetricText( GetPos(), eCoreUnit, ePresUnit, &rIntl ) +
" " + EditResId( ::GetMetricId( ePresUnit ) );
}
@@ -489,7 +487,7 @@ bool SwFormatCol::GetPresentation
if ( COLADJ_NONE != GetLineAdj() )
{
const long nWdth = static_cast<long>(GetLineWidth());
rText = rText + " " + SwResId( STR_LINE_WIDTH ) + " " +
rText += " " + SwResId( STR_LINE_WIDTH ) + " " +
::GetMetricText( nWdth, eCoreUnit,
MapUnit::MapPoint, &rIntl );
}
@@ -517,13 +515,13 @@ bool SwFormatURL::GetPresentation
{
if ( m_pMap )
rText += " - ";
rText = rText + "URL: " + m_sURL;
rText += "URL: " + m_sURL;
if ( m_bIsServerMap )
rText += " (Server-Map)";
}
if ( !m_sTargetFrameName.isEmpty() )
{
rText = rText + ", Target: " + m_sTargetFrameName;
rText += ", Target: " + m_sTargetFrameName;
}
return true;
}
@@ -628,7 +626,7 @@ bool SwFormatLineNumber::GetPresentation
rText += SwResId(STR_DONTLINECOUNT);
if ( GetStartValue() )
{
rText = rText + " " + SwResId(STR_LINCOUNT_START) +
rText += " " + SwResId(STR_LINCOUNT_START) +
OUString::number( GetStartValue() );
}
return true;
@@ -706,7 +704,7 @@ bool SwRotationGrf::GetPresentation(
rText = SwResId( STR_ROTATION );
else if( rText.getLength() )
rText.clear();
rText = rText + OUString::number( GetValue() ) + "\xB0";
rText += OUString::number( GetValue() ) + "\xB0";
return true;
}
@@ -718,8 +716,8 @@ bool SwLuminanceGrf::GetPresentation(
rText = SwResId( STR_LUMINANCE );
else if( rText.getLength() )
rText.clear();
rText = rText + unicode::formatPercent(GetValue(),
Application::GetSettings().GetUILanguageTag());
rText += unicode::formatPercent(GetValue(),
Application::GetSettings().GetUILanguageTag());
return true;
}
@@ -731,8 +729,8 @@ bool SwContrastGrf::GetPresentation(
rText = SwResId( STR_CONTRAST );
else if( rText.getLength() )
rText.clear();
rText = rText + unicode::formatPercent(GetValue(),
Application::GetSettings().GetUILanguageTag());
rText += unicode::formatPercent(GetValue(),
Application::GetSettings().GetUILanguageTag());
return true;
}
@@ -757,8 +755,8 @@ bool SwChannelGrf::GetPresentation(
}
else if( rText.getLength() )
rText.clear();
rText = rText + unicode::formatPercent(GetValue(),
Application::GetSettings().GetUILanguageTag());
rText += unicode::formatPercent(GetValue(),
Application::GetSettings().GetUILanguageTag());
return true;
}
@@ -796,7 +794,7 @@ bool SwTransparencyGrf::GetPresentation(
rText = SwResId( STR_TRANSPARENCY );
else if( rText.getLength() )
rText.clear();
rText = rText + unicode::formatPercent(GetValue(),
rText += unicode::formatPercent(GetValue(),
Application::GetSettings().GetUILanguageTag());
return true;
}
test/source/bootstrapfixture.cxx
+1 -2
View File
@@ -211,8 +211,7 @@ void test::BootstrapFixture::validate(const OUString& rPath, test::ValidationFor
sal_Int32 nStartOfNumber = nIndex + std::strlen("Grand total of errors in submitted package: ");
OUString aNumber = aContentOUString.copy(nStartOfNumber);
sal_Int32 nErrors = aNumber.toInt32();
OString aMsg("validation error in OOXML export: Errors: ");
aMsg = aMsg + OString::number(nErrors);
OString aMsg = "validation error in OOXML export: Errors: " + OString::number(nErrors);
if(nErrors)
{
SAL_WARN("test", aContentOUString);
vcl/source/gdi/mtfxmldump.cxx
+2 -2
View File
@@ -68,7 +68,7 @@ OUString collectPushFlags(PushFlags nFlags)
aString = aStrings[0];
for (size_t i = 1; i < aStrings.size(); ++i)
{
aString = aString + ", " + aStrings[i];
aString += ", " + aStrings[i];
}
return aString;
}
@@ -121,7 +121,7 @@ OUString convertDrawTextFlagsToString(DrawTextFlags eDrawTextFlags)
aString = aStrings[0];
for (size_t i = 1; i < aStrings.size(); ++i)
{
aString = aString + " " + aStrings[i];
aString += " " + aStrings[i];
}
return aString;
};
vcl/source/uitest/logger.cxx
+2 -2
View File
@@ -256,11 +256,11 @@ void UITestLogger::logKeyInput(VclPtr<vcl::Window> const& xUIElement, const KeyE
}
if (aParentID.isEmpty())
{
aContent = aContent + "Type on '" + rID + "' " + aKeyCode;
aContent += "Type on '" + rID + "' " + aKeyCode;
}
else
{
aContent = aContent + "Type on '" + rID + "' " + aKeyCode + " from " + aParentID;
aContent += "Type on '" + rID + "' " + aKeyCode + " from " + aParentID;
}
}
else if (pUIObject->get_type() == "SwEditWinUIObject" && rID == "writer_edit")
vcl/source/window/builder.cxx
+1 -1
View File
@@ -429,7 +429,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr
sal_Int32 nIdx = m_sHelpRoot.lastIndexOf('.');
if (nIdx != -1)
m_sHelpRoot = m_sHelpRoot.copy(0, nIdx);
m_sHelpRoot = m_sHelpRoot + OString('/');
m_sHelpRoot += OString('/');
OUString sUri = sUIDir + sUIFile;
vcl/source/window/tabdlg.cxx
+1 -1
View File
@@ -252,7 +252,7 @@ std::vector<OString> TabDialog::getAllPageUIXMLDescriptions() const
{
// add the PageId to be able to detect the correct tabPage in
// selectPageByUIXMLDescription below
aNewName = aNewName + "|" + OString::number(nPageId);
aNewName += "|" + OString::number(nPageId);
}
aRetval.push_back(aNewName);
vcl/unx/generic/printer/cupsmgr.cxx
+2 -2
View File
@@ -872,8 +872,8 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi
" option " << pOptions[n].name << "=" << pOptions[n].value);
#if OSL_DEBUG_LEVEL > 1
OString aCmd( "cp " );
aCmd = aCmd + it->second.getStr();
aCmd = aCmd + OString( " $HOME/cupsprint.ps" );
aCmd += it->second.getStr();
aCmd += OString( " $HOME/cupsprint.ps" );
system( aCmd.getStr() );
#endif
vcl/unx/gtk3/gtk3gtkinst.cxx
+1 -1
View File
@@ -11675,7 +11675,7 @@ public:
sal_Int32 nIdx = m_sHelpRoot.lastIndexOf('.');
if (nIdx != -1)
m_sHelpRoot = m_sHelpRoot.copy(0, nIdx);
m_sHelpRoot = m_sHelpRoot + OUString('/');
m_sHelpRoot += OUString('/');
m_aUtf8HelpRoot = OUStringToOString(m_sHelpRoot, RTL_TEXTENCODING_UTF8);
m_aIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme();
m_aUILang = Application::GetSettings().GetUILanguageTag().getBcp47();
vcl/unx/gtk3/gtk3gtksalmenu.cxx
+3 -3
View File
@@ -31,9 +31,9 @@ static bool bUnityMode = false;
*/
static gchar* GetCommandForItem(GtkSalMenu* pParentMenu, sal_uInt16 nItemId)
{
OString aCommand("window-");
aCommand = aCommand + OString::number(reinterpret_cast<unsigned long>(pParentMenu));
aCommand = aCommand + "-" + OString::number(nItemId);
OString aCommand = "window-" +
OString::number(reinterpret_cast<unsigned long>(pParentMenu)) +
"-" + OString::number(nItemId);
return g_strdup(aCommand.getStr());
}
writerfilter/source/dmapper/DomainMapper_Impl.cxx
+1 -1
View File
@@ -5170,7 +5170,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
OUString titleStr;
uno::Any aValue(propertyVal.Value);
aValue >>= titleStr;
titleStr = titleStr + rResult;
titleStr += rResult;
propertyVal.Value <<= titleStr;
aValues[nTitleFoundIndex] = propertyVal;
}
xmlhelp/source/treeview/tvread.cxx
+1 -1
View File
@@ -665,7 +665,7 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext )
locale = "en-US";
ret = "en";
}
url = url + ret;
url += ret;
// first of all, try do determine whether there are any *.tree files present
xmloff/source/text/txtprhdl.cxx
+2 -2
View File
@@ -546,7 +546,7 @@ bool XMLFrameProtectPropHdl_Impl::exportXML(
}
else
{
rStrExpValue = rStrExpValue + " " + sVal;
rStrExpValue += " " + sVal;
}
}
else if( rStrExpValue.isEmpty() )
@@ -775,7 +775,7 @@ bool XMLGrfMirrorPropHdl_Impl::exportXML(
}
else
{
rStrExpValue = rStrExpValue + " " + sVal;
rStrExpValue += " " + sVal;
}
}
else if( rStrExpValue.isEmpty() )