From ab285c743afa1c8769581871d7b56374fd8c49f1 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 2 Nov 2019 18:59:49 +0200 Subject: loplugin:stringadd tweak the plugin to be more permissive, then validate by hand afterwards Change-Id: I40c5c911fe6ff7e45baaca372abf7dac211d9654 Reviewed-on: https://gerrit.libreoffice.org/81942 Tested-by: Jenkins Reviewed-by: Noel Grandin --- xmloff/source/draw/sdxmlexp.cxx | 4 ++-- xmloff/source/draw/ximpcustomshape.cxx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'xmloff') diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index d5b7d906ecfc..44c9afee02fd 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -690,8 +690,8 @@ bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference& xPage, OUStr pNew = new ImpXMLAutoLayoutInfo(nType, pInfo); mvAutoLayoutInfoList.emplace_back( pNew ); OUString sNewName = - "AL" + OUString::number(mvAutoLayoutInfoList.size() - 1); - sNewName += "T" + OUString::number(nType); + "AL" + OUString::number(mvAutoLayoutInfoList.size() - 1) + + "T" + OUString::number(nType); pNew->SetLayoutName(sNewName); } diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 9baf64552411..80955168676d 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -1205,13 +1205,13 @@ void XMLEnhancedCustomShapeContext::EndElement() if ( GetEquationName( rEquation, nIndexOf + 1, aEquationName ) ) { // copying first characters inclusive '?' - OUString aNew( rEquation.copy( 0, nIndexOf + 1 ) ); sal_Int32 nIndex = 0; EquationHashMap::iterator aHashIter( pH->find( aEquationName ) ); if ( aHashIter != pH->end() ) nIndex = (*aHashIter).second; - aNew += OUString::number( nIndex ); - aNew += rEquation.copy( nIndexOf + aEquationName.getLength() + 1 ); + OUString aNew = rEquation.copy( 0, nIndexOf + 1 ) + + OUString::number( nIndex ) + + rEquation.copy( nIndexOf + aEquationName.getLength() + 1 ); rEquation = aNew; } nIndexOf++; -- cgit