From b74c4b7c675883e23bea9fd52682ae89d36539f6 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 30 Sep 2019 15:11:25 +0200
Subject: loplugin:stringadd in package..sax

Change-Id: I1f8b626ae99bca6e31e7c4aa9c8a1fc016b76e5c
Reviewed-on: https://gerrit.libreoffice.org/79890
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 reportdesign/source/filter/xml/xmlExport.cxx          | 10 ++--------
 reportdesign/source/ui/inspection/GeometryHandler.cxx |  3 +--
 reportdesign/source/ui/misc/UITools.cxx               |  6 ++----
 reportdesign/source/ui/report/propbrw.cxx             |  4 ++--
 4 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'reportdesign')

diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 4c991cd87732..b548f991dcc6 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -1082,14 +1082,11 @@ void ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDefinit
                             sExpression = sExpression.replaceAt(nIndex, 1, "\"\"");
                             nIndex = sExpression.indexOf('"',nIndex+2);
                         }
-                        OUString sFormula("rpt:HASCHANGED(\"");
 
                         TGroupFunctionMap::const_iterator aGroupFind = m_aGroupFunctionMap.find(xGroup);
                         if ( aGroupFind != m_aGroupFunctionMap.end() )
                             sExpression = aGroupFind->second->getName();
-                        sFormula += sExpression;
-                        sFormula += "\")";
-                        sExpression = sFormula;
+                        sExpression = "rpt:HASCHANGED(\"" + sExpression + "\")";
                     }
                     AddAttribute(XML_NAMESPACE_REPORT, XML_SORT_EXPRESSION, sField);
                     AddAttribute(XML_NAMESPACE_REPORT, XML_GROUP_EXPRESSION,sExpression);
@@ -1556,10 +1553,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
                     xFunction->setName(sFunctionName);
                     if ( !sInitialFormula.isEmpty() )
                         xFunction->setInitialFormula(beans::Optional< OUString>(true, sInitialFormula));
-                    sFunction = "rpt:" + sFunction;
-                    sFunction += "([";
-                    sFunction += sExpression;
-                    sFunction += "]";
+                    sFunction = "rpt:" + sFunction + "([" + sExpression + "]";
 
                     if ( !sPrefix.isEmpty() )
                         sFunction += sPrefix;
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 20e37bf6413c..eaf9d679f509 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -2157,8 +2157,7 @@ void GeometryHandler::impl_setCounterFunction_throw()
 {
     OUString sNamePostfix;
     fillScope_throw(sNamePostfix);
-    OUString sFunctionName = m_aCounterFunction.m_sName;
-    sFunctionName += sNamePostfix;
+    OUString sFunctionName = m_aCounterFunction.m_sName + sNamePostfix;
     const OUString sQuotedFunctionName = lcl_getQuotedFunctionName(sFunctionName);
     OUString sScope;
     if ( !(!sFunctionName.isEmpty() && m_aFunctionNames.find(sQuotedFunctionName) != m_aFunctionNames.end() && impl_isCounterFunction_throw(sQuotedFunctionName,sScope)) )
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index bde0449a34b1..51d7b5e7cf69 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -162,15 +162,13 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32
     OSL_ENSURE(_xGroup.is(),"Group is NULL -> GPF");
     if ( _xGroup->getHeaderOn() && _xGroup->getHeader()->getName().isEmpty() )
     {
-        OUString sName = RptResId(RID_STR_GROUPHEADER);
-        sName += OUString::number(_nPos);
+        OUString sName = RptResId(RID_STR_GROUPHEADER) + OUString::number(_nPos);
         _xGroup->getHeader()->setName(sName);
     }
 
     if ( _xGroup->getFooterOn() && _xGroup->getFooter()->getName().isEmpty() )
     {
-        OUString sName = RptResId(RID_STR_GROUPFOOTER);
-        sName += OUString::number(_nPos);
+        OUString sName = RptResId(RID_STR_GROUPFOOTER) + OUString::number(_nPos);
         _xGroup->getFooter()->setName(sName);
     }
 }
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 633d5faea46a..ad6d8f1d494e 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -389,8 +389,8 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac
     }
     else    // multiselection
     {
-        aName = RptResId(RID_STR_BRWTITLE_PROPERTIES);
-        aName += RptResId(RID_STR_BRWTITLE_MULTISELECT);
+        aName = RptResId(RID_STR_BRWTITLE_PROPERTIES)
+            + RptResId(RID_STR_BRWTITLE_MULTISELECT);
     }
 
     return aName;
-- 
cgit