diff options
| -rw-r--r-- | basctl/source/basicide/bastype3.cxx | 8 | ||||
| -rw-r--r-- | basctl/source/basicide/bastypes.cxx | 11 | ||||
| -rw-r--r-- | codemaker/source/javamaker/javatype.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxexport.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 7 | ||||
| -rw-r--r-- | xmloff/source/core/RDFaExportHelper.cxx | 7 |
6 files changed, 11 insertions, 34 deletions
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx index 194d52d175e3..db15a6a6787e 100644 --- a/basctl/source/basicide/bastype3.cxx +++ b/basctl/source/basicide/bastype3.cxx @@ -455,13 +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); - return aName.makeStringAndClear(); + return "[" + rMgrName + "]." + rLibName; } diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 461044c7d407..340ea4052372 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -183,17 +183,14 @@ OUString BaseWindow::GetTitle() OUString BaseWindow::CreateQualifiedName() { - OUStringBuffer aName; + OUString aName; 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(); + return aName; } void BaseWindow::SetReadOnly (bool) diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx index b0edb7f103a6..5b8748e4bf5f 100644 --- a/codemaker/source/javamaker/javatype.cxx +++ b/codemaker/source/javamaker/javatype.cxx @@ -855,11 +855,7 @@ 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()); + rtl::OString classDescriptor("L" + className + ";"); {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/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 59e9bd1f2f59..1b3c8f811291 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -294,14 +294,12 @@ 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, "application/vnd.openxmlformats-officedocument.drawingml.chart" ); diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index c432363ab79c..da4cae665d09 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(msSeed+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 d202b06e9129..052c76c82ecf 100644 --- a/xmloff/source/core/RDFaExportHelper.cxx +++ b/xmloff/source/core/RDFaExportHelper.cxx @@ -56,8 +56,6 @@ using namespace ::com::sun::star; namespace xmloff { -static const char s_prefix [] = "_:b"; - static ::rtl::OUString makeCURIE(SvXMLExport * i_pExport, uno::Reference<rdf::XURI> const & i_xURI) @@ -128,10 +126,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 = "_:b" + OUString::valueOf(++m_Counter); } return rEntry; } |