Avoid getTokenCount and use indexed getToken

Change-Id: Iaac598c9e56afa29db88237fecbe54d9cb4d4011

1 files changed, 15 insertions, 7 deletions

diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index f6bd2718c35e..40e283108339 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -1055,9 +1055,17 @@ namespace pcr
         {
             sal_Int32 nLines = comphelper::string::getTokenCount(_rCompsedTextWithLineBreaks, '\n');
             StlSyntaxSequence< OUString > aStrings( nLines );
-            StlSyntaxSequence< OUString >::iterator stringItem = aStrings.begin();
-            for ( sal_Int32 token = 0; token < nLines; ++token, ++stringItem )
-                *stringItem = _rCompsedTextWithLineBreaks.getToken( token, '\n' );
+            if (nLines)
+            {
+                StlSyntaxSequence< OUString >::iterator stringItem = aStrings.begin();
+                sal_Int32 nIdx {0};
+                do
+                {
+                    *stringItem = _rCompsedTextWithLineBreaks.getToken( 0, '\n', nIdx );
+                    ++stringItem;
+                }
+                while (nIdx>0);
+            }
             return aStrings;
         }
 
@@ -1150,9 +1158,9 @@ namespace pcr
         if (!aStr.isEmpty())
         {
             long nDiff=0;
-            sal_Int32 nCount = comphelper::string::getTokenCount(aStr, '\n');
 
-            OUString aInput = aStr.getToken(0,'\n' );
+            sal_Int32 nIdx {0};
+            OUString aInput = aStr.getToken(0, '\n', nIdx );
 
             if (!aInput.isEmpty())
             {
@@ -1168,9 +1176,9 @@ namespace pcr
             }
             else
             {
-                for (sal_Int32 i=1; i<nCount; ++i)
+                while (nIdx>0)
                 {
-                    aInput=aStr.getToken(static_cast<sal_uInt16>(i), '\n');
+                    aInput=aStr.getToken(0, '\n', nIdx);
                     if (!aInput.isEmpty())
                     {
                         aOutput += ";";