From 9d8c206ee4a5c130e11a4e786b4286f3362f9ca1 Mon Sep 17 00:00:00 2001
From: Fakabbir Amin <fakabbir@gmail.com>
Date: Wed, 15 Feb 2017 15:47:31 +0530
Subject: tdf#100726 Improved readability of OUString concatenations

Cleanup in filter, framework and svtools directory.

Change-Id: Icf4f04cff1207e58ce55ea3dc8c21b0635c3b6ec
Reviewed-on: https://gerrit.libreoffice.org/34298
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 filter/source/svg/svgwriter.cxx                      | 20 ++++++++++----------
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 11 +++--------
 2 files changed, 13 insertions(+), 18 deletions(-)

(limited to 'filter/source')

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 1fed9900fc66..82d542402dad 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1817,10 +1817,10 @@ OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bo
 
         if( nSize > 1 )
         {
-            aPathData += "M ";
-            aPathData += OUString::number( ( aPolyPoint = rPoly[ 0 ] ).X() );
-            aPathData += aComma;
-            aPathData += OUString::number( aPolyPoint.Y() );
+            aPathData += "M "
+                        + OUString::number( ( aPolyPoint = rPoly[ 0 ] ).X() )
+                        + aComma
+                        + OUString::number( aPolyPoint.Y() );
 
             sal_Char nCurrentMode = 0;
             const bool bClose(!bLine || rPoly[0] == rPoly[nSize - 1]);
@@ -1839,9 +1839,9 @@ OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bo
                     {
                         if ( j )
                             aPathData += aBlank;
-                        aPathData += OUString::number( ( aPolyPoint = rPoly[ n++ ] ).X() );
-                        aPathData += aComma;
-                        aPathData += OUString::number( aPolyPoint.Y() );
+                        aPathData += OUString::number( ( aPolyPoint = rPoly[ n++ ] ).X() )
+                                    + aComma
+                                    + OUString::number( aPolyPoint.Y() );
                     }
                 }
                 else
@@ -1851,9 +1851,9 @@ OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bo
                         nCurrentMode = 'L';
                         aPathData += "L ";
                     }
-                    aPathData += OUString::number( ( aPolyPoint = rPoly[ n++ ] ).X() );
-                    aPathData += aComma;
-                    aPathData += OUString::number( aPolyPoint.Y() );
+                    aPathData += OUString::number( ( aPolyPoint = rPoly[ n++ ] ).X() )
+                                + aComma
+                                + OUString::number( aPolyPoint.Y() );
                 }
             }
 
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 1c0bc8f37866..05bf27ca3bda 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -341,9 +341,7 @@ OUString XMLFilterSettingsDialog::createUniqueFilterName( const OUString& rFilte
 
     while( mxFilterContainer->hasByName( aFilterName ) )
     {
-        aFilterName = rFilterName;
-        aFilterName += aSpace;
-        aFilterName += OUString::number( nId++ );
+        aFilterName = rFilterName + aSpace + OUString::number( nId++ );
     }
 
     return aFilterName;
@@ -360,9 +358,7 @@ OUString XMLFilterSettingsDialog::createUniqueTypeName( const OUString& rTypeNam
 
     while( mxFilterContainer->hasByName( aTypeName ) )
     {
-        aTypeName = rTypeName;
-        aTypeName += aSpace;
-        aTypeName += OUString::number( nId++ );
+        aTypeName = rTypeName + aSpace + OUString::number( nId++ );
     }
 
     return aTypeName;
@@ -595,8 +591,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
         OUString aDocType;
         if( !pFilterEntry->maDocType.match( m_sDocTypePrefix ) )
         {
-            aDocType = m_sDocTypePrefix;
-            aDocType += pFilterEntry->maDocType;
+            aDocType = m_sDocTypePrefix + pFilterEntry->maDocType;
         }
         else
         {
-- 
cgit