editeng/source/editeng/editdbg.cxx | 235
++++------
extensions/source/logging/csvformatter.cxx | 9
extensions/source/logging/plaintextformatter.cxx | 9
extensions/source/propctrlr/eventhandler.cxx | 6
extensions/source/propctrlr/formcomponenthandler.cxx | 9
extensions/source/propctrlr/standardcontrol.cxx | 4
extensions/source/propctrlr/stringrepresentation.cxx | 3
filter/source/msfilter/rtfutil.cxx | 14
filter/source/svg/svgwriter.cxx | 8
forms/source/component/DatabaseForm.cxx | 10
forms/source/component/Filter.cxx | 14
forms/source/xforms/model_ui.cxx | 3
forms/source/xforms/submission/submission_get.cxx | 3
framework/source/fwe/helper/titlehelper.cxx | 3
framework/source/fwi/classes/converter.cxx | 11
framework/source/recording/dispatchrecorder.cxx | 36 -
framework/source/services/urltransformer.cxx | 7
framework/source/uielement/headermenucontroller.cxx | 11
framework/source/uielement/langselectionstatusbarcontroller.cxx | 3
framework/source/uielement/recentfilesmenucontroller.cxx | 3
20 files changed, 184 insertions(+), 217 deletions(-)
New commits:
commit 3a0c5b782001fc398740b46f2adc9e07055505d6
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Mar 24 19:12:58 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Mar 25 07:27:34 2023 +0000
loplugin:stringadd in editeng..framework
after my patch to merge the bufferadd loplugin into stringadd
Change-Id: Ieac16a01fde6467a2f6fe47864069304a3c44e47
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149552
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index e3c8f5a2bff8..308d4af93794 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -64,83 +64,83 @@ static OString DbgOutItem(const SfxItemPool& rPool, const
SfxPoolItem& rItem)
switch ( rItem.Which() )
{
case EE_PARA_WRITINGDIR:
- aDebStr.append("WritingDir=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxFrameDirectionItem&>(rItem).GetValue()));
+ aDebStr.append("WritingDir="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxFrameDirectionItem&>(rItem).GetValue())));
break;
case EE_PARA_OUTLLRSPACE:
case EE_PARA_LRSPACE:
- aDebStr.append("FI=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxLRSpaceItem&>(rItem).GetTextFirstLineOffset()));
- aDebStr.append(", LI=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxLRSpaceItem&>(rItem).GetTextLeft()));
- aDebStr.append(", RI=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxLRSpaceItem&>(rItem).GetRight()));
+ aDebStr.append("FI="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxLRSpaceItem&>(rItem).GetTextFirstLineOffset()))
+ + ", LI="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxLRSpaceItem&>(rItem).GetTextLeft()))
+ + ", RI="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxLRSpaceItem&>(rItem).GetRight())));
break;
case EE_PARA_NUMBULLET:
aDebStr.append("NumItem ");
for ( sal_uInt16 nLevel = 0; nLevel < 3; nLevel++ )
{
- aDebStr.append("Level");
- aDebStr.append(static_cast<sal_Int32>(nLevel));
- aDebStr.append('=');
+ aDebStr.append("Level"
+ + OString::number(static_cast<sal_Int32>(nLevel))
+ + "=");
const SvxNumberFormat* pFmt = static_cast<const
SvxNumBulletItem&>(rItem).GetNumRule().Get( nLevel );
if ( pFmt )
{
- aDebStr.append('(');
- aDebStr.append(pFmt->GetFirstLineOffset());
- aDebStr.append(',');
- aDebStr.append(pFmt->GetAbsLSpace());
- aDebStr.append(',');
+ aDebStr.append("("
+ + OString::number(pFmt->GetFirstLineOffset())
+ + ","
+ + OString::number(pFmt->GetAbsLSpace())
+ + ",");
if ( pFmt->GetNumberingType() == SVX_NUM_BITMAP )
aDebStr.append("Bitmap");
else if( pFmt->GetNumberingType() != SVX_NUM_CHAR_SPECIAL )
aDebStr.append("Number");
else
{
- aDebStr.append("Char=[");
-
aDebStr.append(static_cast<sal_Int32>(pFmt->GetBulletChar()));
- aDebStr.append(']');
+ aDebStr.append("Char=["
+ +
OString::number(static_cast<sal_Int32>(pFmt->GetBulletChar()))
+ + "]");
}
aDebStr.append(") ");
}
}
break;
case EE_PARA_BULLETSTATE:
- aDebStr.append("ShowBullet=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SfxBoolItem&>(rItem).GetValue()));
+ aDebStr.append("ShowBullet="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SfxBoolItem&>(rItem).GetValue())));
break;
case EE_PARA_HYPHENATE:
- aDebStr.append("Hyphenate=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SfxBoolItem&>(rItem).GetValue()));
+ aDebStr.append("Hyphenate="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SfxBoolItem&>(rItem).GetValue())));
break;
case EE_PARA_OUTLLEVEL:
- aDebStr.append("Level=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SfxInt16Item&>(rItem).GetValue()));
+ aDebStr.append("Level="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SfxInt16Item&>(rItem).GetValue())));
break;
case EE_PARA_ULSPACE:
- aDebStr.append("SB=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxULSpaceItem&>(rItem).GetUpper()));
- aDebStr.append(", SA=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxULSpaceItem&>(rItem).GetLower()));
+ aDebStr.append("SB="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxULSpaceItem&>(rItem).GetUpper()))
+ + ", SA="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxULSpaceItem&>(rItem).GetLower())));
break;
case EE_PARA_SBL:
aDebStr.append("SBL=");
if ( static_cast<const
SvxLineSpacingItem&>(rItem).GetLineSpaceRule() == SvxLineSpaceRule::Min )
{
- aDebStr.append("Min: ");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxLineSpacingItem&>(rItem).GetInterLineSpace()));
+ aDebStr.append("Min: "
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxLineSpacingItem&>(rItem).GetInterLineSpace())));
}
else if ( static_cast<const
SvxLineSpacingItem&>(rItem).GetInterLineSpaceRule() ==
SvxInterLineSpaceRule::Prop )
{
- aDebStr.append("Prop: ");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxLineSpacingItem&>(rItem).GetPropLineSpace()));
+ aDebStr.append("Prop: "
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxLineSpacingItem&>(rItem).GetPropLineSpace())));
}
else
aDebStr.append("Unsupported Type!");
break;
case EE_PARA_JUST:
- aDebStr.append("SvxAdust=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxAdjustItem&>(rItem).GetAdjust()));
+ aDebStr.append("SvxAdust="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxAdjustItem&>(rItem).GetAdjust())));
break;
case EE_PARA_TABS:
{
@@ -153,8 +153,7 @@ static OString DbgOutItem(const SfxItemPool& rPool, const
SfxPoolItem& rItem)
for (sal_uInt16 i = 0; i < rTabs.Count(); ++i)
{
const SvxTabStop& rTab = rTabs[i];
- aDebStr.append(rTab.GetTabPos());
- aDebStr.append(' ');
+ aDebStr.append(OString::number(rTab.GetTabPos()) + " ");
}
aDebStr.append(')');
}
@@ -170,55 +169,57 @@ static OString DbgOutItem(const SfxItemPool& rPool, const
SfxPoolItem& rItem)
{
aDebStr.append("Color= ");
Color aColor( static_cast<const SvxColorItem&>(rItem).GetValue() );
- aDebStr.append(static_cast<sal_Int32>(aColor.GetRed()));
- aDebStr.append(", ");
- aDebStr.append(static_cast<sal_Int32>(aColor.GetGreen()));
- aDebStr.append(", ");
- aDebStr.append(static_cast<sal_Int32>(aColor.GetBlue()));
+ aDebStr.append(
+ OString::number(static_cast<sal_Int32>(aColor.GetRed()))
+ + ", "
+ + OString::number(static_cast<sal_Int32>(aColor.GetGreen()))
+ + ", "
+ + OString::number(static_cast<sal_Int32>(aColor.GetBlue())));
}
break;
case EE_CHAR_BKGCOLOR:
{
aDebStr.append("FillColor= ");
Color aColor( static_cast<const SvxColorItem&>(rItem).GetValue() );
- aDebStr.append(static_cast<sal_Int32>(aColor.GetRed()));
- aDebStr.append(", ");
- aDebStr.append(static_cast<sal_Int32>(aColor.GetGreen()));
- aDebStr.append(", ");
- aDebStr.append(static_cast<sal_Int32>(aColor.GetBlue()));
+ aDebStr.append(
+ OString::number(static_cast<sal_Int32>(aColor.GetRed()))
+ + ", "
+ + OString::number(static_cast<sal_Int32>(aColor.GetGreen()))
+ + ", "
+ + OString::number(static_cast<sal_Int32>(aColor.GetBlue())));
}
break;
case EE_CHAR_FONTINFO:
case EE_CHAR_FONTINFO_CJK:
case EE_CHAR_FONTINFO_CTL:
{
- aDebStr.append("Font=");
- aDebStr.append(OUStringToOString(static_cast<const
SvxFontItem&>(rItem).GetFamilyName(), RTL_TEXTENCODING_ASCII_US));
- aDebStr.append(" (CharSet: ");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxFontItem&>(rItem).GetCharSet()));
- aDebStr.append(')');
+ aDebStr.append("Font="
+ + OUStringToOString(static_cast<const
SvxFontItem&>(rItem).GetFamilyName(), RTL_TEXTENCODING_ASCII_US)
+ + " (CharSet: "
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxFontItem&>(rItem).GetCharSet()))
+ + ")");
}
break;
case EE_CHAR_FONTHEIGHT:
case EE_CHAR_FONTHEIGHT_CJK:
case EE_CHAR_FONTHEIGHT_CTL:
{
- aDebStr.append("Groesse=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxFontHeightItem&>(rItem).GetHeight()));
+ aDebStr.append("Groesse="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxFontHeightItem&>(rItem).GetHeight())));
Size aSz( 0, static_cast<const
SvxFontHeightItem&>(rItem).GetHeight() );
MapUnit eUnit = rPool.GetMetric( rItem.Which() );
MapMode aItemMapMode(eUnit);
MapMode aPntMap( MapUnit::MapPoint );
aSz = OutputDevice::LogicToLogic( aSz, aItemMapMode, aPntMap );
- aDebStr.append(" Points=");
- aDebStr.append(static_cast<sal_Int32>(aSz.Height()));
+ aDebStr.append(" Points="
+ + OString::number(static_cast<sal_Int32>(aSz.Height())));
}
break;
case EE_CHAR_FONTWIDTH:
{
- aDebStr.append("Breite=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxCharScaleWidthItem&>(rItem).GetValue()));
- aDebStr.append('%');
+ aDebStr.append("Breite="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxCharScaleWidthItem&>(rItem).GetValue()))
+ + "%");
}
break;
case EE_CHAR_WEIGHT:
@@ -228,65 +229,64 @@ static OString DbgOutItem(const SfxItemPool& rPool, const
SfxPoolItem& rItem)
aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxWeightItem&>(rItem).GetWeight()));
break;
case EE_CHAR_UNDERLINE:
- aDebStr.append("FontUnderline=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxUnderlineItem&>(rItem).GetLineStyle()));
+ aDebStr.append("FontUnderline="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxUnderlineItem&>(rItem).GetLineStyle())));
break;
case EE_CHAR_OVERLINE:
- aDebStr.append("FontOverline=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxOverlineItem&>(rItem).GetLineStyle()));
+ aDebStr.append("FontOverline="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxOverlineItem&>(rItem).GetLineStyle())));
break;
case EE_CHAR_EMPHASISMARK:
- aDebStr.append("FontUnderline=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxEmphasisMarkItem&>(rItem).GetEmphasisMark()));
+ aDebStr.append("FontUnderline="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxEmphasisMarkItem&>(rItem).GetEmphasisMark())));
break;
case EE_CHAR_RELIEF:
- aDebStr.append("FontRelief=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxCharReliefItem&>(rItem).GetValue()));
+ aDebStr.append("FontRelief="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxCharReliefItem&>(rItem).GetValue())));
break;
case EE_CHAR_STRIKEOUT:
- aDebStr.append("FontStrikeout=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxCrossedOutItem&>(rItem).GetStrikeout()));
+ aDebStr.append("FontStrikeout="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxCrossedOutItem&>(rItem).GetStrikeout())));
break;
case EE_CHAR_ITALIC:
case EE_CHAR_ITALIC_CJK:
case EE_CHAR_ITALIC_CTL:
- aDebStr.append("FontPosture=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxPostureItem&>(rItem).GetPosture()));
+ aDebStr.append("FontPosture="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxPostureItem&>(rItem).GetPosture())));
break;
case EE_CHAR_OUTLINE:
- aDebStr.append("FontOutline=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxContourItem&>(rItem).GetValue()));
+ aDebStr.append("FontOutline="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxContourItem&>(rItem).GetValue())));
break;
case EE_CHAR_SHADOW:
- aDebStr.append("FontShadowed=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxShadowedItem&>(rItem).GetValue()));
+ aDebStr.append("FontShadowed="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxShadowedItem&>(rItem).GetValue())));
break;
case EE_CHAR_ESCAPEMENT:
- aDebStr.append("Escape=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxEscapementItem&>(rItem).GetEsc()));
- aDebStr.append(", ");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxEscapementItem&>(rItem).GetProportionalHeight()));
+ aDebStr.append("Escape="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxEscapementItem&>(rItem).GetEsc()))
+ + ", "
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxEscapementItem&>(rItem).GetProportionalHeight())));
break;
case EE_CHAR_PAIRKERNING:
- aDebStr.append("PairKerning=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxAutoKernItem&>(rItem).GetValue()));
+ aDebStr.append("PairKerning="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxAutoKernItem&>(rItem).GetValue())));
break;
case EE_CHAR_KERNING:
{
- aDebStr.append("Kerning=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxKerningItem&>(rItem).GetValue()));
+ aDebStr.append("Kerning="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxKerningItem&>(rItem).GetValue())));
Size aSz( 0, static_cast<short>(static_cast<const
SvxKerningItem&>(rItem).GetValue()) );
MapUnit eUnit = rPool.GetMetric( rItem.Which() );
MapMode aItemMapMode(eUnit);
MapMode aPntMap( MapUnit::MapPoint );
aSz = OutputDevice::LogicToLogic( aSz, aItemMapMode, aPntMap );
- aDebStr.append(" Points=");
- aDebStr.append(static_cast<sal_Int32>(aSz.Height()));
+ aDebStr.append(" Points=" +
OString::number(static_cast<sal_Int32>(aSz.Height())));
}
break;
case EE_CHAR_WLM:
- aDebStr.append("WordLineMode=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const
SvxWordLineModeItem&>(rItem).GetValue()));
+ aDebStr.append("WordLineMode="
+ + OString::number(static_cast<sal_Int32>(static_cast<const
SvxWordLineModeItem&>(rItem).GetValue())));
break;
case EE_CHAR_XMLATTRIBS:
aDebStr.append("XMLAttribs=...");
@@ -351,15 +351,15 @@ void EditEngine::DumpData(const EditEngine* pEE, bool
bInfoBox)
for ( sal_Int32 z = 0; z <
pPPortion->GetNode()->GetCharAttribs().Count(); ++z )
{
const std::unique_ptr<EditCharAttrib>& rAttr =
pPPortion->GetNode()->GetCharAttribs().GetAttribs()[z];
- OStringBuffer aCharAttribs;
- aCharAttribs.append("\nA");
- aCharAttribs.append(nPortion);
- aCharAttribs.append(": ");
-
aCharAttribs.append(static_cast<sal_Int32>(rAttr->GetItem()->Which()));
- aCharAttribs.append('\t');
- aCharAttribs.append(rAttr->GetStart());
- aCharAttribs.append('\t');
- aCharAttribs.append(rAttr->GetEnd());
+ OString aCharAttribs =
+ "\nA"
+ + OString::number(nPortion)
+ + ": "
+ +
OString::number(static_cast<sal_Int32>(rAttr->GetItem()->Which()))
+ + "\t"
+ + OString::number(rAttr->GetStart())
+ + "\t"
+ + OString::number(rAttr->GetEnd());
if ( rAttr->IsEmpty() )
bZeroAttr = true;
fprintf(fp, "%s => ", aCharAttribs.getStr());
@@ -371,34 +371,33 @@ void EditEngine::DumpData(const EditEngine* pEE, bool
bInfoBox)
fprintf( fp, "\nNULL-Attribute!" );
const sal_Int32 nTextPortions = pPPortion->GetTextPortions().Count();
- OStringBuffer aPortionStr("\nText portions: #");
- aPortionStr.append(nTextPortions);
- aPortionStr.append(" \nA");
- aPortionStr.append(nPortion);
- aPortionStr.append(": Paragraph Length = ");
- aPortionStr.append(pPPortion->GetNode()->Len());
- aPortionStr.append("\nA");
- aPortionStr.append(nPortion);
- aPortionStr.append(": ");
+ OStringBuffer aPortionStr("\nText portions: #"
+ + OString::number(nTextPortions)
+ + " \nA"
+ + OString::number(nPortion)
+ + ": Paragraph Length = "
+ + OString::number(pPPortion->GetNode()->Len())
+ + "\nA"
+ + OString::number(nPortion)
+ + ": ");
sal_Int32 n = 0;
for ( sal_Int32 z = 0; z < nTextPortions; ++z )
{
TextPortion& rPortion = pPPortion->GetTextPortions()[z];
- aPortionStr.append(' ');
- aPortionStr.append(rPortion.GetLen());
- aPortionStr.append('(');
-
aPortionStr.append(static_cast<sal_Int32>(rPortion.GetSize().Width()));
- aPortionStr.append(')');
- aPortionStr.append('[');
- aPortionStr.append(static_cast<sal_Int32>(rPortion.GetKind()));
- aPortionStr.append(']');
- aPortionStr.append(';');
+ aPortionStr.append(" "
+ + OString::number(rPortion.GetLen())
+ + "("
+ +
OString::number(static_cast<sal_Int32>(rPortion.GetSize().Width()))
+ + ")"
+ "["
+ + OString::number(static_cast<sal_Int32>(rPortion.GetKind()))
+ + "];");
n += rPortion.GetLen();
}
- aPortionStr.append("\nA");
- aPortionStr.append(nPortion);
- aPortionStr.append(": Total length: ");
- aPortionStr.append(n);
+ aPortionStr.append("\nA"
+ + OString::number(nPortion)
+ + ": Total length: "
+ + OString::number(n));
if ( pPPortion->GetNode()->Len() != n )
aPortionStr.append(" => Error !!!");
fprintf(fp, "%s", aPortionStr.getStr());
diff --git a/extensions/source/logging/csvformatter.cxx
b/extensions/source/logging/csvformatter.cxx
index ddbf3a9a2c36..c495bbe1ea95 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -202,8 +202,7 @@ namespace logging
sal_Int32 columns = m_Columnnames.getLength();
for(sal_Int32 i=0; i<columns; i++)
{
- buf.append(m_Columnnames[i]);
- buf.append(comma_char);
+ buf.append(m_Columnnames[i] + OUStringChar(comma_char));
}
buf.setLength(buf.getLength()-1);
buf.append(dos_newline);
@@ -216,14 +215,12 @@ namespace logging
if(m_LogEventNo)
{
- aLogEntry.append( record.SequenceNumber );
- aLogEntry.append(comma_char);
+ aLogEntry.append(record.SequenceNumber + comma_char);
}
if(m_LogThread)
{
- aLogEntry.append( record.ThreadID );
- aLogEntry.append(comma_char);
+ aLogEntry.append(record.ThreadID + OUStringChar(comma_char));
}
if(m_LogTimestamp)
diff --git a/extensions/source/logging/plaintextformatter.cxx
b/extensions/source/logging/plaintextformatter.cxx
index 23392b61c491..2c534a2a2e8f 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -105,14 +105,11 @@ namespace logging
if ( !(_rRecord.SourceClassName.isEmpty() ||
_rRecord.SourceMethodName.isEmpty()) )
{
- aLogEntry.append( _rRecord.SourceClassName );
- aLogEntry.append( "::" );
- aLogEntry.append( _rRecord.SourceMethodName );
- aLogEntry.append( ": " );
+ aLogEntry.append( _rRecord.SourceClassName + "::"
+ + _rRecord.SourceMethodName + ": " );
}
- aLogEntry.append( _rRecord.Message );
- aLogEntry.append( "\n" );
+ aLogEntry.append( _rRecord.Message + "\n" );
return aLogEntry.makeStringAndClear();
}
diff --git a/extensions/source/propctrlr/eventhandler.cxx
b/extensions/source/propctrlr/eventhandler.cxx
index ea99755244af..136dcb35dac3 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -131,8 +131,7 @@ namespace pcr
,sUniqueBrowseId(std::move( _sUniqueBrowseId ))
,nId( _nId )
{
- OUStringBuffer aQualifiedListenerClass;
- aQualifiedListenerClass.append( "com.sun.star." );
+ OUStringBuffer aQualifiedListenerClass( "com.sun.star." );
aQualifiedListenerClass.appendAscii( _pListenerNamespaceAscii );
aQualifiedListenerClass.append( "." );
aQualifiedListenerClass.appendAscii( _pListenerClassAsciiName );
@@ -608,8 +607,7 @@ namespace pcr
OSL_ENSURE( !sLocation.isEmpty(),
"EventHandler::convertToControlValue: unexpected: no location!" );
if ( !sLocation.isEmpty() )
{
- aComposeBuffer.append( sLocation );
- aComposeBuffer.append( ", " );
+ aComposeBuffer.append( sLocation + ", " );
}
// language
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx
b/extensions/source/propctrlr/formcomponenthandler.cxx
index 81f90518d2c5..9385d0bdc5af 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -739,8 +739,7 @@ namespace pcr
else
{
// font name
- displayName.append( aFont.Name );
- displayName.append( ", " );
+ displayName.append( aFont.Name + ", " );
// font style
::FontWeight eWeight = vcl::unohelper::ConvertFontWeight(
aFont.Weight );
@@ -762,8 +761,7 @@ namespace pcr
// font size
if ( aFont.Height )
{
- displayName.append( ", " );
- displayName.append( sal_Int32( aFont.Height ) );
+ displayName.append( ", " + OUString::number( sal_Int32(
aFont.Height ) ) );
}
}
@@ -2526,8 +2524,7 @@ namespace pcr
OUStringBuffer sTemp;
if ( bAdd )
{
- sTemp.append(_sName);
- sTemp.append("/");
+ sTemp.append(OUString::Concat(_sName) + "/");
}
sTemp.append(rQueryName);
Reference< XNameAccess >
xSubQueries(_xQueryNames->getByName(rQueryName),UNO_QUERY);
diff --git a/extensions/source/propctrlr/standardcontrol.cxx
b/extensions/source/propctrlr/standardcontrol.cxx
index 95b4143c76b8..9468ecc56745 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -724,9 +724,7 @@ namespace pcr
{
if ( strings != _rStrings.begin() )
aComposed.append( ';' );
- aComposed.append( '\"' );
- aComposed.append( *strings );
- aComposed.append( '\"' );
+ aComposed.append( "\"" + *strings + "\"" );
}
return aComposed.makeStringAndClear();
}
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx
b/extensions/source/propctrlr/stringrepresentation.cxx
index 30dbde907733..6f40c09c9d84 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -329,8 +329,7 @@ namespace
// (separated by a line break)
for (const auto& rElement : _rElements)
{
- sCompose.append(OUString(_rTransformer(rElement)));
- sCompose.append("\n");
+ sCompose.append(OUString(_rTransformer(rElement)) + "\n");
}
sCompose.stripEnd('\n');
diff --git a/filter/source/msfilter/rtfutil.cxx
b/filter/source/msfilter/rtfutil.cxx
index 75f453c347c9..73941dc4ec1d 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -180,20 +180,17 @@ OString OutChar(sal_Unicode c, int* pUCMode,
rtl_TextEncoding eDestEnc, bool* pS
{
if (*pUCMode != nLen)
{
- aBuf.append("\\uc");
- aBuf.append(nLen);
+ aBuf.append("\\uc" + OString::number(nLen));
// #i47831# add an additional whitespace, so that
"document whitespaces" are not ignored.
aBuf.append(' ');
*pUCMode = nLen;
}
- aBuf.append("\\u");
- aBuf.append(static_cast<sal_Int32>(c));
+ aBuf.append("\\u" +
OString::number(static_cast<sal_Int32>(c)));
}
for (sal_Int32 nI = 0; nI < nLen; ++nI)
{
- aBuf.append("\\'");
- aBuf.append(OutHex(sConverted[nI], 2));
+ aBuf.append("\\'" + OutHex(sConverted[nI], 2));
}
}
}
@@ -222,10 +219,9 @@ OString OutString(const OUString& rStr, rtl_TextEncoding
eDestEnc, bool bUnicode
aBuf.append(OutChar(rStr[n], &nUCMode, eDestEnc, nullptr, bUnicode));
if (nUCMode != 1)
{
- aBuf.append(OOO_STRING_SVTOOLS_RTF_UC);
- aBuf.append(sal_Int32(1));
aBuf.append(
- " "); // #i47831# add an additional whitespace, so that "document
whitespaces" are not ignored.;
+ OOO_STRING_SVTOOLS_RTF_UC + OString::number(sal_Int32(1))
+ + " "); // #i47831# add an additional whitespace, so that
"document whitespaces" are not ignored.;
}
return aBuf.makeStringAndClear();
}
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index d6909bcdb070..2da8385bc4c3 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -3101,10 +3101,10 @@ void SVGActionWriter::ImplWriteActions( const
GDIMetaFile& rMtf,
sal_uInt16 sz =
static_cast<sal_uInt16>((pA->GetDataSize()) / 2);
if (sz)
{
- sType.append("; ");
- sType.append(
- reinterpret_cast<sal_Unicode
const*>(pData),
- sz);
+ sType.append(OUString::Concat("; ")
+ + std::u16string_view(
+ reinterpret_cast<sal_Unicode
const*>(pData),
+ sz));
}
}
}
diff --git a/forms/source/component/DatabaseForm.cxx
b/forms/source/component/DatabaseForm.cxx
index d4795414a43d..fccd2367ea17 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -437,9 +437,7 @@ OUString ODatabaseForm::GetDataEncoded(bool
_bURLEncoded,const Reference<XContro
Encode( aName );
Encode( aValue );
- aResult.append(aName);
- aResult.append('=');
- aResult.append(aValue);
+ aResult.append(aName + "=" + aValue);
if (pSuccObj < aSuccObjList.end() - 1)
{
@@ -905,9 +903,9 @@ void ODatabaseForm::Encode( OUString& rString )
short nLo = static_cast<sal_Int16>(nCharCode) - (nHi*16);
if( nHi > 9 ) nHi += int('A')-10; else nHi += int('0');
if( nLo > 9 ) nLo += int('A')-10; else nLo += int('0');
- aResult.append('%');
- aResult.append(static_cast<sal_Unicode>(nHi));
- aResult.append(static_cast<sal_Unicode>(nLo));
+ aResult.append("%"
+ + OUStringChar(static_cast<sal_Unicode>(nHi))
+ + OUStringChar(static_cast<sal_Unicode>(nLo)) );
}
}
}
diff --git a/forms/source/component/Filter.cxx
b/forms/source/component/Filter.cxx
index bd9b640f1ce3..c59139d0f5d7 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -412,18 +412,16 @@ namespace frm
const Reference< XDatabaseMetaData > xMeta(
xConnection->getMetaData(), UNO_SET_THROW );
const OUString sQuoteChar = xMeta->getIdentifierQuoteString();
- aStatement.append( "SELECT DISTINCT " );
- aStatement.append( sQuoteChar );
- aStatement.append( sRealFieldName );
- aStatement.append( sQuoteChar );
+ aStatement.append(
+ "SELECT DISTINCT "
+ + sQuoteChar
+ + sRealFieldName
+ + sQuoteChar );
// if the field had an alias in our form's statement, give it this
alias in the new statement, too
if ( !sFieldName.isEmpty() && ( sFieldName != sRealFieldName ) )
{
- aStatement.append(" AS ");
- aStatement.append( sQuoteChar );
- aStatement.append( sFieldName );
- aStatement.append( sQuoteChar );
+ aStatement.append(" AS "+ sQuoteChar + sFieldName + sQuoteChar
);
}
aStatement.append( " FROM " );
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index e8208565f4fe..5d56e8b3baa0 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -814,8 +814,7 @@ static OUString lcl_serializeForDisplay( const
Reference<XNodeList>& xNodes )
if( !sLine.isEmpty()
&& !sLine.startsWith( "<?xml" ) )
{
- sResult.append( sLine );
- sResult.append( '\n' );
+ sResult.append( sLine + "\n" );
}
}
diff --git a/forms/source/xforms/submission/submission_get.cxx
b/forms/source/xforms/submission/submission_get.cxx
index 5078daf9db29..ae630b504b0c 100644
--- a/forms/source/xforms/submission/submission_get.cxx
+++ b/forms/source/xforms/submission/submission_get.cxx
@@ -76,8 +76,7 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const
css::uno::Reference<
aQueryString.append(reinterpret_cast<char const
*>(aByteBuffer.getConstArray()), n);
if (!aQueryString.isEmpty() && m_aURLObj.GetProtocol() !=
INetProtocol::File)
{
- aUTF8QueryURL.append('?');
- aUTF8QueryURL.append(aQueryString);
+ aUTF8QueryURL.append("?" + aQueryString);
}
OUString aQueryURL = OStringToOUString(aUTF8QueryURL,
RTL_TEXTENCODING_UTF8);
ucbhelper::Content aContent(aQueryURL, aEnvironment, m_xContext);
diff --git a/framework/source/fwe/helper/titlehelper.cxx
b/framework/source/fwe/helper/titlehelper.cxx
index 31981d403b4f..e0983d9e5549 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -434,8 +434,7 @@ void TitleHelper::impl_updateTitleForController (const
css::uno::Reference< css:
sTitle.append (xModelTitle->getTitle ());
if ( nLeasedNumber > 1 )
{
- sTitle.append(" : ");
- sTitle.append(nLeasedNumber);
+ sTitle.append(" : " + OUString::number(nLeasedNumber));
}
if (xModel.is ())
{
diff --git a/framework/source/fwi/classes/converter.cxx
b/framework/source/fwi/classes/converter.cxx
index a29c5b1271c9..59ae35d396b5 100644
--- a/framework/source/fwi/classes/converter.cxx
+++ b/framework/source/fwi/classes/converter.cxx
@@ -76,36 +76,37 @@ OUString Converter::convert_DateTime2ISO8601( const
DateTime& aSource )
sBuffer.append("0");
sBuffer.append( nYear );
- sBuffer.append("-");
// write month formatted as "MM"
+ sBuffer.append("-");
if (nMonth<10)
sBuffer.append("0");
sBuffer.append( nMonth );
- sBuffer.append("-");
// write day formatted as "DD"
+ sBuffer.append("-");
if (nDay<10)
sBuffer.append("0");
sBuffer.append( nDay );
- sBuffer.append("T");
// write hours formatted as "hh"
+ sBuffer.append("T");
if (nHour<10)
sBuffer.append("0");
sBuffer.append( nHour );
- sBuffer.append(":");
// write min formatted as "mm"
+ sBuffer.append(":");
if (nMin<10)
sBuffer.append("0");
sBuffer.append( nMin );
- sBuffer.append(":");
// write sec formatted as "ss"
+ sBuffer.append(":");
if (nSec<10)
sBuffer.append("0");
sBuffer.append( nSec );
+ // write time-zone
sBuffer.append("Z");
return sBuffer.makeStringAndClear();
diff --git a/framework/source/recording/dispatchrecorder.cxx
b/framework/source/recording/dispatchrecorder.cxx
index fe81814955f7..9c4a1bc90a81 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -145,14 +145,15 @@ OUString SAL_CALL DispatchRecorder::getRecordedMacro()
aScriptBuffer.ensureCapacity(10000);
m_nRecordingID = 1;
- aScriptBuffer.append("rem
----------------------------------------------------------------------\n");
- aScriptBuffer.append("rem define variables\n");
- aScriptBuffer.append("dim document as object\n");
- aScriptBuffer.append("dim dispatcher as object\n");
- aScriptBuffer.append("rem
----------------------------------------------------------------------\n");
- aScriptBuffer.append("rem get access to the document\n");
- aScriptBuffer.append("document =
ThisComponent.CurrentController.Frame\n");
- aScriptBuffer.append("dispatcher =
createUnoService(\"com.sun.star.frame.DispatchHelper\")\n\n");
+ aScriptBuffer.append(
+ "rem
----------------------------------------------------------------------\n"
+ "rem define variables\n"
+ "dim document as object\n"
+ "dim dispatcher as object\n"
+ "rem
----------------------------------------------------------------------\n"
+ "rem get access to the document\n"
+ "document = ThisComponent.CurrentController.Frame\n"
+ "dispatcher =
createUnoService(\"com.sun.star.frame.DispatchHelper\")\n\n");
for (auto const& statement : m_aStatements)
implts_recordMacro( statement.aCommand, statement.aArgs,
statement.bIsComment, aScriptBuffer );
@@ -320,22 +321,17 @@ void DispatchRecorder::implts_recordMacro(
std::u16string_view aURL,
// add arg().Name
if(bAsComment)
aArgumentBuffer.append(REM_AS_COMMENT);
- aArgumentBuffer.append (sArrayName);
- aArgumentBuffer.append("(");
- aArgumentBuffer.append (nValidArgs);
- aArgumentBuffer.append(").Name = \"");
- aArgumentBuffer.append (lArguments[i].Name);
- aArgumentBuffer.append("\"\n");
+ aArgumentBuffer.append(sArrayName
+ + "(" + OUString::number(nValidArgs)
+ + ").Name = \"" + lArguments[i].Name
+ + "\"\n");
// add arg().Value
if(bAsComment)
aArgumentBuffer.append(REM_AS_COMMENT);
- aArgumentBuffer.append (sArrayName);
- aArgumentBuffer.append("(");
- aArgumentBuffer.append (nValidArgs);
- aArgumentBuffer.append(").Value = ");
- aArgumentBuffer.append (sValBuffer);
- aArgumentBuffer.append("\n");
+ aArgumentBuffer.append(sArrayName
+ + "(" + OUString::number(nValidArgs)
+ + ").Value = " + sValBuffer + "\n");
++nValidArgs;
}
diff --git a/framework/source/services/urltransformer.cxx
b/framework/source/services/urltransformer.cxx
index 239aed6dbfa0..b2ec62c5a434 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -76,8 +76,8 @@ void lcl_ParserHelper(INetURLObject& _rParser,
css::util::URL& _rURL,bool _bUseI
OUStringBuffer aPath(128);
for ( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
{
- aPath.append( '/');
- aPath.append( _rParser.getName( nIndex, false,
INetURLObject::DecodeMechanism::NONE ));
+ aPath.append( "/"
+ + _rParser.getName( nIndex, false,
INetURLObject::DecodeMechanism::NONE ));
}
if ( nCount > 0 )
@@ -227,8 +227,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL&
aURL )
aCompletePath.append( aURL.Name );
else
{
- aCompletePath.append( '/' );
- aCompletePath.append( aURL.Name );
+ aCompletePath.append( "/" + aURL.Name );
}
}
diff --git a/framework/source/uielement/headermenucontroller.cxx
b/framework/source/uielement/headermenucontroller.cxx
index f8c76fb8d8c1..7fc2259ef553 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -127,10 +127,10 @@ void HeaderMenuController::fillPopupMenu( const
Reference< css::frame::XModel >&
xPropSet->getPropertyValue( aDisplayNameStr ) >>=
aDisplayName;
xPropSet->getPropertyValue( aHeaderFooterIsOnStr ) >>=
bHeaderIsOn;
- OUStringBuffer aStrBuf( aCmd );
- aStrBuf.append( "?PageStyle:string=");
- aStrBuf.append( aDisplayName );
- aStrBuf.append( "&On:bool=" );
+ OUStringBuffer aStrBuf( aCmd
+ + "?PageStyle:string="
+ + aDisplayName
+ + "&On:bool=" );
if ( !bHeaderIsOn )
aStrBuf.append( "true" );
else
@@ -161,8 +161,7 @@ void HeaderMenuController::fillPopupMenu( const Reference<
css::frame::XModel >&
// Insert special item for all command
rPopupMenu->insertItem(ALL_MENUITEM_ID,
FwkResId(STR_MENU_HEADFOOTALL), 0, 0);
- OUStringBuffer aStrBuf( aCmd );
- aStrBuf.append( "?On:bool=" );
+ OUStringBuffer aStrBuf( aCmd + "?On:bool=" );
// Command depends on check state of first menu item entry
if ( !bFirstChecked )
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx
b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index b0f71f3e3f33..e620af612092 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -251,8 +251,7 @@ void LangSelectionStatusbarController::LangMenu(
}
else if (MID_LANG_PARA_1 <= nId && nId <= MID_LANG_PARA_9)
{
- aBuff.append( ".uno:LanguageStatus?Language:string=Paragraph_" );
- aBuff.append( aSelectedLang );
+ aBuff.append( ".uno:LanguageStatus?Language:string=Paragraph_" +
aSelectedLang );
}
else if (nId == MID_LANG_PARA_NONE)
{
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx
b/framework/source/uielement/recentfilesmenucontroller.cxx
index 644fd2215780..194f66d1476f 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -228,8 +228,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference<
css::awt::XPopupMenu >
}
else
{
- aMenuShortCut.append( sal_Int32( i + 1 ) );
- aMenuShortCut.append( ". " );
+ aMenuShortCut.append( OUString::number(sal_Int32( i + 1 ) ) +
". " );
}
OUString aURLString = "vnd.sun.star.popup:RecentFileList?entry=" +
OUString::number(i);
