loplugin:stringview add check for getToken().toInt32

where we can convert that to
    o3tl::toInt32(o3tl::getToken(
and avoid the heap allocation of a temporary string

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

3 files changed, 16 insertions, 12 deletions

diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx
index 98657263a4bc..afc8acf72d00 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -671,14 +671,14 @@ util::DateTime ConvertDateStringToDateTime( const OUString& rDateTime )
     // and writes it as Z (=UTC+0)
     OUString sTime = rDateTime.getToken( 0, 'Z', nIndex );
     nIndex = 0;
-    aDateTime.Year = sal_uInt16( sDate.getToken( 0, '-', nIndex ).toInt32() );
-    aDateTime.Month = sal_uInt16( sDate.getToken( 0, '-', nIndex ).toInt32() );
+    aDateTime.Year = sal_uInt16( o3tl::toInt32(o3tl::getToken(sDate, 0, '-', nIndex )) );
+    aDateTime.Month = sal_uInt16( o3tl::toInt32(o3tl::getToken(sDate, 0, '-', nIndex )) );
     if (nIndex != -1)
         aDateTime.Day = sal_uInt16( o3tl::toInt32(sDate.subView( nIndex )) );
 
     nIndex = 0;
-    aDateTime.Hours = sal_uInt16( sTime.getToken( 0, ':', nIndex ).toInt32() );
-    aDateTime.Minutes = sal_uInt16( sTime.getToken( 0, ':', nIndex ).toInt32() );
+    aDateTime.Hours = sal_uInt16( o3tl::toInt32(o3tl::getToken(sTime, 0, ':', nIndex )) );
+    aDateTime.Minutes = sal_uInt16( o3tl::toInt32(o3tl::getToken(sTime, 0, ':', nIndex )) );
     if (nIndex != -1)
         aDateTime.Seconds = sal_uInt16( o3tl::toInt32(sTime.subView( nIndex )) );
 
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 311a0ffd4384..58258a386c83 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -5354,7 +5354,7 @@ void  DomainMapper_Impl::handleRubyEQField( const FieldContextPtr& pContext)
     if (nIndex != -1)
     {
         nIndex += 5;
-        sal_uInt32  nJc = rCommand.getToken(0, ' ',nIndex).toInt32();
+        sal_uInt32  nJc = o3tl::toInt32(o3tl::getToken(rCommand, 0, ' ',nIndex));
         const   sal_Int32   aRubyAlignValues[] =
         {
             NS_ooxml::LN_Value_ST_RubyAlign_center,
@@ -5373,7 +5373,7 @@ void  DomainMapper_Impl::handleRubyEQField( const FieldContextPtr& pContext)
     if (nIndex != -1)
     {
         nIndex += 6;
-        aInfo.nHps = rCommand.getToken(0, ' ',nIndex).toInt32();
+        aInfo.nHps = o3tl::toInt32(o3tl::getToken(rCommand, 0, ' ',nIndex));
     }
 
     nIndex = rCommand.indexOf("\\o");
@@ -5863,7 +5863,7 @@ void DomainMapper_Impl::handleToc
                                 //empty tokens should be skipped
                 while( sStyleName.isEmpty() && nPosition > 0 )
                     sStyleName = sTemplate.getToken( 0, ',', nPosition );
-                nLevel = sTemplate.getToken( 0, ',', nPosition ).toInt32();
+                nLevel = o3tl::toInt32(o3tl::getToken(sTemplate, 0, ',', nPosition ));
                 if( !nLevel )
                     nLevel = 1;
                 if( !sStyleName.isEmpty() )
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 3426c9213f4f..6d03ac396664 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -47,6 +47,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <svx/svdobj.hxx>
 #include <tools/UnitConversion.hxx>
+#include <o3tl/string_view.hxx>
 
 #include <dmapper/GraphicZOrderHelper.hxx>
 #include "rtfdocumentimpl.hxx"
@@ -497,8 +498,9 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
                     // The coordinates are in an (x,y) form.
                     aToken = aToken.copy(1, aToken.getLength() - 2);
                     sal_Int32 nI = 0;
-                    sal_Int32 nX = aToken.getToken(0, ',', nI).toInt32();
-                    sal_Int32 nY = (nI >= 0) ? aToken.getToken(0, ',', nI).toInt32() : 0;
+                    sal_Int32 nX = o3tl::toInt32(o3tl::getToken(aToken, 0, ',', nI));
+                    sal_Int32 nY
+                        = (nI >= 0) ? o3tl::toInt32(o3tl::getToken(aToken, 0, ',', nI)) : 0;
                     drawing::EnhancedCustomShapeParameterPair aPair;
                     aPair.First.Value <<= nX;
                     aPair.Second.Value <<= nY;
@@ -517,7 +519,8 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
             sal_Int32 nCharIndex = 0;
             do
             {
-                sal_Int32 nSeg = rProperty.second.getToken(0, ';', nCharIndex).toInt32();
+                sal_Int32 nSeg
+                    = o3tl::toInt32(o3tl::getToken(rProperty.second, 0, ';', nCharIndex));
                 if (!nSize)
                     nSize = nSeg;
                 else if (!nCount)
@@ -842,8 +845,9 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
                     // The coordinates are in an (x,y) form.
                     aToken = aToken.copy(1, aToken.getLength() - 2);
                     sal_Int32 nI = 0;
-                    sal_Int32 nX = aToken.getToken(0, ',', nI).toInt32();
-                    sal_Int32 nY = (nI >= 0) ? aToken.getToken(0, ',', nI).toInt32() : 0;
+                    sal_Int32 nX = o3tl::toInt32(o3tl::getToken(aToken, 0, ',', nI));
+                    sal_Int32 nY
+                        = (nI >= 0) ? o3tl::toInt32(o3tl::getToken(aToken, 0, ',', nI)) : 0;
                     RTFSprms aPathAttributes;
                     aPathAttributes.set(NS_ooxml::LN_CT_Point2D_x, new RTFValue(nX));
                     aPathAttributes.set(NS_ooxml::LN_CT_Point2D_y, new RTFValue(nY));