loplugin:stringadd simplify some *StringBuffer operations

pulled from a larger patch which I created with a more permissive
variant of this plugin

Change-Id: I7abf1f3f09e84703b6e0e52fe9587dff691b2187
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114875
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 12 insertions, 22 deletions

diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index a61d80e6cc6b..cdd2ebb35c47 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -408,8 +408,8 @@ bool XmlFilterBase::importFragment( const rtl::Reference<FragmentHandler>& rxHan
         }
         catch( Exception& )
         {
-            OSL_FAIL( OStringBuffer( "XmlFilterBase::importFragment - XML parser failed in fragment '" ).
-                append( OUStringToOString( aFragmentPath, RTL_TEXTENCODING_ASCII_US ) ).append( '\'' ).getStr() );
+            OSL_FAIL( OStringBuffer( "XmlFilterBase::importFragment - XML parser failed in fragment '"  +
+                     OUStringToOString( aFragmentPath, RTL_TEXTENCODING_ASCII_US ) + "'" ).getStr() );
         }
     }
     catch( Exception& )
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index ecaa4c5121e4..d02a8d8644e2 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -1117,8 +1117,8 @@ void ObjectFormatter::convertNumberFormat( PropertySet& rPropSet, const NumberFo
     }
     catch( Exception& )
     {
-        OSL_FAIL( OStringBuffer( "ObjectFormatter::convertNumberFormat - cannot create number format '" ).
-            append( OUStringToOString( rNumberFormat.maFormatCode, osl_getThreadTextEncoding() ) ).append( '\'' ).getStr() );
+        OSL_FAIL( OStringBuffer( "ObjectFormatter::convertNumberFormat - cannot create number format '" +
+                OUStringToOString( rNumberFormat.maFormatCode, osl_getThreadTextEncoding() )  + "'" ).getStr() );
     }
 
     // Setting "LinkNumberFormatToSource" does not really work, at least not for axis :-/
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 0506041e67d5..2539c7eac143 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -162,14 +162,11 @@ sal_uInt32 VMLExport::EnterGroup( const OUString& rShapeName, const tools::Recta
     if ( pRect && ( mnGroupLevel == 1 ) )
     {
         pAttrList->add( XML_coordorigin,
-                OStringBuffer( 20 ).append( sal_Int32( pRect->Left() ) )
-                .append( "," ).append( sal_Int32( pRect->Top() ) )
-                .makeStringAndClear() );
+                OString::number( pRect->Left() ) + "," + OString::number( pRect->Top() ) );
 
         pAttrList->add( XML_coordsize,
-                OStringBuffer( 20 ).append( sal_Int32( pRect->Right() ) - sal_Int32( pRect->Left() ) )
-                .append( "," ).append( sal_Int32( pRect->Bottom() ) - sal_Int32( pRect->Top() ) )
-                .makeStringAndClear() );
+                OString::number( pRect->Right() - pRect->Left() ) + "," +
+                OString::number( pRect->Bottom() - pRect->Top() ) );
     }
 
     m_pSerializer->startElementNS( XML_v, XML_group, pAttrList );
@@ -516,9 +513,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle&
                     }
                     if(nTop!=0 && nLeft!=0)
                         m_pShapeAttrList->add( XML_coordorigin,
-                                OStringBuffer( 20 ).append( sal_Int32( nLeft ) )
-                                .append( "," ).append( sal_Int32( nTop ) )
-                                .makeStringAndClear() );
+                                OString::number( nLeft ) + "," + OString::number( nTop ) );
                 }
                 bAlreadyWritten[ ESCHER_Prop_geoLeft ] = true;
                 bAlreadyWritten[ ESCHER_Prop_geoTop ] = true;
@@ -545,9 +540,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle&
 
                     if(nBottom!=0 &&  nRight!=0 )
                         m_pShapeAttrList->add( XML_coordsize,
-                                OStringBuffer( 20 ).append( sal_Int32( nRight ) - sal_Int32( nLeft ) )
-                                .append( "," ).append( sal_Int32( nBottom ) - sal_Int32( nTop ) )
-                                .makeStringAndClear() );
+                                OString::number( nRight - nLeft ) + "," + OString::number( nBottom - nTop ) );
                 }
                 bAlreadyWritten[ ESCHER_Prop_geoRight ] = true;
                 bAlreadyWritten[ ESCHER_Prop_geoBottom ] = true;
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index 1c737952872f..9e7308c7c496 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -474,10 +474,7 @@ void PresentationFragmentHandler::finalizeImport()
 
     if( !aPageRange.getLength() )
     {
-        aPageRange = OUStringBuffer()
-            .append( static_cast< sal_Int32 >( 1 ) )
-            .append( '-' )
-            .append( nPageCount ).makeStringAndClear();
+        aPageRange = "1-" + OUString::number( nPageCount );
     }
 
     StringRangeEnumerator aRangeEnumerator( aPageRange, 0, nPageCount - 1 );
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 96d26efe8ff8..0fca9b06a017 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -294,8 +294,8 @@ Color ConversionHelper::decodeColor( const GraphicHelper& rGraphicHelper,
         }
     }
 
-    OSL_FAIL( OStringBuffer( "lclGetColor - invalid VML color name '" ).
-        append( OUStringToOString( roVmlColor.get(), RTL_TEXTENCODING_ASCII_US ) ).append( '\'' ).getStr() );
+    OSL_FAIL( OStringBuffer( "lclGetColor - invalid VML color name '" +
+            OUStringToOString( roVmlColor.get(), RTL_TEXTENCODING_ASCII_US ) + "'" ).getStr() );
     aDmlColor.setSrgbClr( nDefaultRgb );
     return aDmlColor;
 }