From b5b4ead2cce7c65c3abf1830f27001ef2481e3b9 Mon Sep 17 00:00:00 2001 From: Christos Strubulis Date: Thu, 13 Dec 2012 10:31:36 -0800 Subject: [PATCH] Replace chained O(U)StringBuffer::append() with operator+ --- .../widget/ActivityChooserModel.java | 18 +++++++++--------- basctl/source/basicide/bastype3.cxx | 7 +------ basctl/source/basicide/bastypes.cxx | 7 ++----- codemaker/source/javamaker/javatype.cxx | 7 ++----- sw/source/core/fields/dbfld.cxx | 6 +++--- sw/source/filter/ww8/docxexport.cxx | 4 ++-- sw/source/filter/ww8/ww8graf.cxx | 7 ++----- xmloff/source/core/RDFaExportHelper.cxx | 5 +---- 8 files changed, 22 insertions(+), 39 deletions(-) diff --git a/android/abs-lib/src/com/actionbarsherlock/widget/ActivityChooserModel.java b/android/abs-lib/src/com/actionbarsherlock/widget/ActivityChooserModel.java index 3792074..21edb1e 100755 --- a/android/abs-lib/src/com/actionbarsherlock/widget/ActivityChooserModel.java +++ b/android/abs-lib/src/com/actionbarsherlock/widget/ActivityChooserModel.java @@ -835,11 +835,11 @@ class ActivityChooserModel extends DataSetObservable { @Override public String toString() { StringBuilder builder = new StringBuilder(); - builder.append("["); - builder.append("; activity:").append(activity); - builder.append("; time:").append(time); - builder.append("; weight:").append(new BigDecimal(weight)); - builder.append("]"); + builder +="["; + builder += "; activity:" + activity; + builder += "; time:" + time; + builder += "; weight:" + new BigDecimal(weight); + builder += "]"; return builder.toString(); } } @@ -898,10 +898,10 @@ class ActivityChooserModel extends DataSetObservable { @Override public String toString() { StringBuilder builder = new StringBuilder(); - builder.append("["); - builder.append("resolveInfo:").append(resolveInfo.toString()); - builder.append("; weight:").append(new BigDecimal(weight)); - builder.append("]"); + builder += "["; + builder += "resolveInfo:" + resolveInfo.toString(); + builder += "; weight:" + new BigDecimal(weight); + builder += "]"; return builder.toString(); } } diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx index 194d52d..4ba66c4 100644 --- a/basctl/source/basicide/bastype3.cxx +++ b/basctl/source/basicide/bastype3.cxx @@ -455,12 +455,7 @@ SvTreeListEntry* TreeListBox::FindRootEntry( const ScriptDocument& rDocument, Li OUString CreateMgrAndLibStr( const OUString& rMgrName, const OUString& rLibName ) { - OUStringBuffer aName; - aName.append('['); - aName.append(rMgrName); - aName.append(']'); - aName.append('.'); - aName.append(rLibName); + OUStringBuffer aName = "[" + rMgrName + "]." + rLibName; return aName.makeStringAndClear(); } diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 461044c..c6ef16a 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -187,11 +187,8 @@ OUString BaseWindow::CreateQualifiedName() if ( !m_aLibName.isEmpty() ) { LibraryLocation eLocation = m_aDocument.getLibraryLocation( m_aLibName ); - aName.append(m_aDocument.getTitle(eLocation)); - aName.append('.'); - aName.append(m_aLibName); - aName.append('.'); - aName.append(GetTitle()); + aName = m_aDocument.getTitle(eLocation) + "." + m_aLibName + + "." + GetTitle(); } return aName.makeStringAndClear(); } diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx index b0edb7f..c786cbc 100644 --- a/codemaker/source/javamaker/javatype.cxx +++ b/codemaker/source/javamaker/javatype.cxx @@ -855,11 +855,8 @@ void handleEnumType( rtl::OString(RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/Enum")), rtl::OString())); SAL_WNODEPRECATED_DECLARATIONS_POP - rtl::OStringBuffer buf; - buf.append('L'); - buf.append(className); - buf.append(';'); - rtl::OString classDescriptor(buf.makeStringAndClear()); + OStringBuffer buf = "L" + className + ";"; + OString classDescriptor(buf.makeStringAndClear()); {for (sal_uInt16 i = 0; i < fields; ++i) { RTConstValue fieldValue(reader.getFieldValue(i)); if (fieldValue.m_type != RT_TYPE_INT32 diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index 1072b50..3de5712 100644 --- a/sw/source/core/fields/dbfld.cxx +++ b/sw/source/core/fields/dbfld.cxx @@ -205,9 +205,9 @@ void SwDBField::InitContent() { if (!IsInitialized()) { - aContent = rtl::OUStringBuffer().append('<') - .append(((const SwDBFieldType*)GetTyp())->GetColumnName()) - .append('>').makeStringAndClear(); + aContent = "<"; + aContent += ((const SwDBFieldType*)GetTyp())->GetColumnName(); + aContent += ">"; } } diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 59e9bd1..ff82261 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -294,13 +294,13 @@ void DocxExport::DoFormText(const SwInputField* /*pFld*/) rtl::OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount ) { - rtl::OUString aFileName = rtl::OUStringBuffer().append("charts/chart").append(nCount).append(".xml").makeStringAndClear(); + OUString aFileName = "charts/chart" + OUString::valueOf(nCount) + ".xml"; OUString sId = m_pFilter->addRelation( m_pDocumentFS->getOutputStream(), "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart", aFileName ); - aFileName = rtl::OUStringBuffer().append("word/charts/chart").append(nCount).append(".xml").makeStringAndClear(); + aFileName = "word/charts/chart" + OUString::valueOf(nCount) + ".xml"; ::sax_fastparser::FSHelperPtr pChartFS = m_pFilter->openFragmentStreamWithSerializer( aFileName, diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index c432363..5f56687 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -154,11 +154,8 @@ void wwFrameNamer::SetUniqueGraphName(SwFrmFmt *pFrmFmt, const rtl::OUString &rF { if (mbIsDisabled || rFixed.isEmpty()) return; - rtl::OUStringBuffer aName(msSeed); - aName.append(++mnImportedGraphicsCount); - aName.append(": "); - aName.append(rFixed); - pFrmFmt->SetName(aName.makeStringAndClear()); + + pFrmFmt->SetName(OUString::valueOf(++mnImportedGraphicsCount) + ": " + rFixed); } // ReadGrafStart liest die ObjektDaten ein und erzeugt falls noetig einen Anker diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx index d202b06..17d628e 100644 --- a/xmloff/source/core/RDFaExportHelper.cxx +++ b/xmloff/source/core/RDFaExportHelper.cxx @@ -128,10 +128,7 @@ RDFaExportHelper::LookupBlankNode( m_BlankNodeMap[ i_xBlankNode->getStringValue() ] ); if (rEntry.isEmpty()) { - ::rtl::OUStringBuffer buf; - buf.appendAscii(s_prefix); - buf.append(++m_Counter); - rEntry = buf.makeStringAndClear(); + rEntry = s_prefix + OUString::valueOf(++m_Counter); } return rEntry; } -- 1.7.10.4