writerfilter/source/dmapper/DomainMapper_Impl.hxx | 16 ++++++-------
writerfilter/source/dmapper/NumberingManager.cxx | 3 --
writerfilter/source/ooxml/Handler.cxx | 7 -----
writerperfect/source/writer/exp/XMLBase64ImportContext.cxx | 3 --
xmloff/source/chart/SchXMLTableContext.cxx | 3 --
xmloff/source/core/DocumentSettingsContext.cxx | 3 --
xmloff/source/core/XMLBase64ImportContext.cxx | 3 --
xmloff/source/draw/sdxmlexp.cxx | 7 +----
xmloff/source/draw/shapeexport.cxx | 9 ++-----
xmloff/source/style/prstylecond.cxx | 4 +--
xmloff/source/text/XMLTextFrameContext.cxx | 6 +---
xmloff/source/transform/OOo2Oasis.cxx | 3 --
xmloff/source/transform/TransformerBase.cxx | 7 +----
xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 15 ++++--------
14 files changed, 31 insertions(+), 58 deletions(-)
New commits:
commit 366eaa1a383a0f5f3f755f2b6a739d3d9c5b8343
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Oct 1 18:25:40 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Oct 2 08:47:24 2019 +0200
loplugin:stringadd in writerfilter..xmloff
Change-Id: Ib5292f4c702cc1e2994c736250a93e6fb18d1a20
Reviewed-on: https://gerrit.libreoffice.org/79988
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 55049dab7681..2df4e5ff505a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -298,17 +298,17 @@ struct PermInsertPosition
if (m_Ed.isEmpty())
{
- bookmarkName += "permission-for-group:";
- bookmarkName += OUString::number(m_Id);
- bookmarkName += ":";
- bookmarkName += m_EdGrp;
+ bookmarkName += "permission-for-group:" +
+ OUString::number(m_Id) +
+ ":" +
+ m_EdGrp;
}
else
{
- bookmarkName += "permission-for-user:";
- bookmarkName += OUString::number(m_Id);
- bookmarkName += ":";
- bookmarkName += m_Ed;
+ bookmarkName += "permission-for-user:" +
+ OUString::number(m_Id) +
+ ":" +
+ m_Ed;
}
//todo: make sure the name is not used already!
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 5f6bb6393f09..af5d2bde6f78 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -452,8 +452,7 @@ OUString ListDef::GetStyleName(sal_Int32 const nId,
{
if (xStyles.is())
{
- OUString sStyleName( "WWNum" );
- sStyleName += OUString::number( nId );
+ OUString sStyleName = "WWNum" + OUString::number( nId );
while (xStyles.is() && xStyles->hasByName(sStyleName)) // unique
{
diff --git a/writerfilter/source/ooxml/Handler.cxx
b/writerfilter/source/ooxml/Handler.cxx
index f7003b44e6f0..459e0adc480a 100644
--- a/writerfilter/source/ooxml/Handler.cxx
+++ b/writerfilter/source/ooxml/Handler.cxx
@@ -329,12 +329,7 @@ OOXMLHyperlinkHandler::~OOXMLHyperlinkHandler()
void OOXMLHyperlinkHandler::writetext()
{
- OUString sReturn(" HYPERLINK \"");
-
- sReturn += mURL;
- sReturn += "\"";
- sReturn += mFieldCode;
-
+ OUString sReturn = " HYPERLINK \"" + mURL + "\"" + mFieldCode;
mpFastContext->text(sReturn);
}
diff --git a/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx
b/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx
index 0835bc20e0ad..abae977a6389 100644
--- a/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx
+++ b/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx
@@ -43,8 +43,7 @@ void XMLBase64ImportContext::characters(const OUString&
rChars)
OUString aChars;
if (!m_aBase64CharsLeft.isEmpty())
{
- aChars = m_aBase64CharsLeft;
- aChars += aTrimmedChars;
+ aChars = m_aBase64CharsLeft + aTrimmedChars;
m_aBase64CharsLeft.clear();
}
else
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx
b/xmloff/source/chart/SchXMLTableContext.cxx
index 491c8c313d47..cb4a7e789793 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -913,8 +913,7 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
}
else if( ! lcl_tableOfRangeMatches( aRange,
rTable.aTableNameOfFile ))
{
- OUString aRep("label ");
- aRep += OUString::number( rLSeq.first.first );
+ OUString aRep = "label " + OUString::number(
rLSeq.first.first );
Reference< chart2::data::XDataSequence > xNewSeq(
xDataProv->createDataSequenceByRangeRepresentation(
aRep ));
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx
b/xmloff/source/core/DocumentSettingsContext.cxx
index 9d3bafb53b54..59c61614e6d8 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -489,8 +489,7 @@ void XMLConfigItemContext::Characters( const OUString&
rChars )
OUString sChars;
if( !msValue.isEmpty() )
{
- sChars = msValue;
- sChars += sTrimmedChars;
+ sChars = msValue + sTrimmedChars;
msValue.clear();
}
else
diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx
b/xmloff/source/core/XMLBase64ImportContext.cxx
index f7291c39a7d3..f39bd39cb80d 100644
--- a/xmloff/source/core/XMLBase64ImportContext.cxx
+++ b/xmloff/source/core/XMLBase64ImportContext.cxx
@@ -55,8 +55,7 @@ void XMLBase64ImportContext::Characters( const OUString&
rChars )
OUString sChars;
if( !sBase64CharsLeft.isEmpty() )
{
- sChars = sBase64CharsLeft;
- sChars += sTrimmedChars;
+ sChars = sBase64CharsLeft + sTrimmedChars;
sBase64CharsLeft.clear();
}
else
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index b2bfd9d5b398..baf552c8ca10 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -691,8 +691,7 @@ bool SdXMLExport::ImpPrepAutoLayoutInfo(const
Reference<XDrawPage>& xPage, OUStr
mvAutoLayoutInfoList.emplace_back( pNew );
OUString sNewName = "AL";
sNewName += OUString::number(mvAutoLayoutInfoList.size() -
1);
- sNewName += "T";
- sNewName += OUString::number(nType);
+ sNewName += "T" + OUString::number(nType);
pNew->SetLayoutName(sNewName);
}
@@ -1219,9 +1218,7 @@ void SdXMLExport::ImpWritePageMasterInfos()
if(pInfo)
{
// create name
- OUString sNewName("PM");
-
- sNewName += OUString::number(nCnt);
+ OUString sNewName = "PM" + OUString::number(nCnt);
pInfo->SetName(sNewName);
// prepare page-master attributes
diff --git a/xmloff/source/draw/shapeexport.cxx
b/xmloff/source/draw/shapeexport.cxx
index 0adf2202bb1e..836fc921fdf3 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2953,8 +2953,7 @@ void XMLShapeExport::ImpExportOLE2Shape(
}
if( !bIsEmptyPresObj )
{
- OUString sURL(XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE);
- sURL += sPersistName;
+ OUString sURL = XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE + sPersistName;
if( !bExportEmbedded )
{
sURL = GetExport().AddEmbeddedObject( sURL );
@@ -3797,8 +3796,7 @@ static void ImpExportEquations( SvXMLExport& rExport,
const uno::Sequence< OUStr
sal_Int32 i;
for ( i = 0; i < rEquations.getLength(); i++ )
{
- OUString aStr('f');
- aStr += OUString::number( i );
+ OUString aStr= "f" + OUString::number( i );
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aStr );
aStr = rEquations[ i ];
@@ -4919,8 +4917,7 @@ void XMLShapeExport::ImpExportTableShape( const
uno::Reference< drawing::XShape
if( !bExportEmbedded )
{
- OUString sURL( "Pictures/" );
- sURL += sPictureName;
+ OUString sURL = "Pictures/" + sPictureName;
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sURL
);
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE,
XML_SIMPLE );
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW,
XML_EMBED );
diff --git a/xmloff/source/style/prstylecond.cxx
b/xmloff/source/style/prstylecond.cxx
index 569ebce6c919..f0dafdf1c36d 100644
--- a/xmloff/source/style/prstylecond.cxx
+++ b/xmloff/source/style/prstylecond.cxx
@@ -73,8 +73,8 @@ OUString GetParaStyleCondExternal( OUString const &internal)
aResult += "()";
if (g_ConditionMap[i].aValue != -1)
{
- aResult += "=";
- aResult += OUString::number( g_ConditionMap[i].aValue );
+ aResult += "=" +
+ OUString::number( g_ConditionMap[i].aValue );
}
return aResult;
}
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx
b/xmloff/source/text/XMLTextFrameContext.cxx
index 3755b3845c03..0e1fdfeec7b3 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -464,8 +464,7 @@ void XMLTextFrameContext_Impl::Create()
}
else
{
- OUString sURL( "vnd.sun.star.ServiceName:" );
- sURL += sFilterService;
+ OUString sURL = "vnd.sun.star.ServiceName:" + sFilterService;
xPropSet = GetImport().GetTextImport()
->createAndInsertOLEObject( GetImport(), sURL,
sStyleName,
@@ -1227,8 +1226,7 @@ void XMLTextFrameContext_Impl::Characters( const
OUString& rChars )
OUString sChars;
if( !sBase64CharsLeft.isEmpty() )
{
- sChars = sBase64CharsLeft;
- sChars += sTrimmedChars;
+ sChars = sBase64CharsLeft + sTrimmedChars;
sBase64CharsLeft.clear();
}
else
diff --git a/xmloff/source/transform/OOo2Oasis.cxx
b/xmloff/source/transform/OOo2Oasis.cxx
index e5060c3846cd..780e0f604632 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1149,8 +1149,7 @@ void XMLDocumentTransformerContext_Impl::StartElement(
pMutableAttrList = new XMLMutableAttributeList( xAttrList );
xAttrList = pMutableAttrList;
- OUString sMime("application/vnd.oasis.opendocument.");
- sMime += rValue;
+ OUString sMime = "application/vnd.oasis.opendocument." + rValue;
pMutableAttrList->SetValueByIndex( i, sMime );
OUString aNewAttrQName(
GetTransformer().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_OFFICE,
::xmloff::token::GetXMLToken( XML_MIMETYPE ) ) );
pMutableAttrList->RenameAttributeByIndex(i, aNewAttrQName );
diff --git a/xmloff/source/transform/TransformerBase.cxx
b/xmloff/source/transform/TransformerBase.cxx
index db3cbfe629db..2a838cbfc97b 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -840,8 +840,7 @@ XMLMutableAttributeList
*XMLTransformerBase::ProcessAttrList(
break;
case XML_ATACTION_SHAPEID:
{
- OUString sNewValue( "shape" );
- sNewValue += rAttrValue;
+ OUString sNewValue = "shape" + rAttrValue;
pMutableAttrList->SetValueByIndex( i, sNewValue );
break;
}
@@ -1276,9 +1275,7 @@ bool XMLTransformerBase::ConvertURIToOASIS( OUString&
rURI,
if( bRel )
{
- OUString sTmp( m_aExtPathPrefix );
- sTmp += rURI;
- rURI = sTmp;
+ rURI = m_aExtPathPrefix + rURI;
bRet = true;
}
}
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
index 6101ec60ecfd..85b4c59a8a70 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
@@ -119,8 +119,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence<
beans::PropertyValue >& /
}
// ooo/script:libraries element
- OUString aLibContElementName( aPrefix );
- aLibContElementName += ":libraries";
+ OUString aLibContElementName = aPrefix + ":libraries";
XMLElement* pLibContElement = new XMLElement(
aLibContElementName );
Reference< xml::sax::XAttributeList > xLibContAttribs(
pLibContElement );
@@ -163,8 +162,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence<
beans::PropertyValue >& /
if ( xLibContainer->isLibraryLink( rLibName ) )
{
// ooo/script:library-linked element
- OUString aLibElementName( aPrefix );
- aLibElementName += ":library-linked";
+ OUString aLibElementName = aPrefix +
":library-linked";
XMLElement* pLibElement = new XMLElement(
aLibElementName );
Reference< xml::sax::XAttributeList >
xLibAttribs = static_cast< xml::sax::XAttributeList* >( pLibElement );
@@ -198,8 +196,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence<
beans::PropertyValue >& /
else
{
// ooo/script:library-embedded element
- OUString aLibElementName( aPrefix );
- aLibElementName += ":library-embedded";
+ OUString aLibElementName = aPrefix +
":library-embedded";
XMLElement* pLibElement = new XMLElement(
aLibElementName );
Reference< xml::sax::XAttributeList >
xLibAttribs = static_cast< xml::sax::XAttributeList* >( pLibElement );
@@ -235,8 +232,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence<
beans::PropertyValue >& /
if ( xLib->hasByName( rModName ) )
{
// ooo/script:module element
- OUString aModElementName( aPrefix
);
- aModElementName += ":module";
+ OUString aModElementName = aPrefix
+ ":module";
XMLElement* pModElement = new
XMLElement( aModElementName );
Reference<
xml::sax::XAttributeList > xModAttribs = static_cast< xml::sax::XAttributeList*
>( pModElement );
@@ -248,8 +244,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence<
beans::PropertyValue >& /
m_xHandler->startElement(
aModElementName, xModAttribs );
// ooo/script:source-code element
- OUString aSourceElementName(
aPrefix );
- aSourceElementName +=
":source-code";
+ OUString aSourceElementName =
aPrefix + ":source-code";
XMLElement* pSourceElement = new
XMLElement( aSourceElementName );
Reference<
xml::sax::XAttributeList > xSourceAttribs = static_cast<
xml::sax::XAttributeList* >( pSourceElement );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
