From 3922602fc3aff254ba1df3e2f193a7f569b8963f Mon Sep 17 00:00:00 2001
From: Matteo Casalin <matteo.casalin@yahoo.com>
Date: Sun, 29 Apr 2018 22:42:33 +0200
Subject: Avoid getTokenCount

Change-Id: Iad8a623a219b1e6158a1ec447bdc7853817d2086
---
 sw/source/uibase/envelp/envimg.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sw')

diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx
index c09159802628..199b8fcda74a 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <hintids.hxx>
-#include <comphelper/string.hxx>
 #include <o3tl/any.hxx>
 #include <tools/stream.hxx>
 #include <sfx2/app.hxx>
@@ -50,13 +49,14 @@ OUString MakeSender()
 {
     SvtUserOptions& rUserOpt = SW_MOD()->GetUserOptions();
 
+    const OUString sSenderToken(SwResId(STR_SENDER_TOKENS));
+    if (sSenderToken.isEmpty())
+        return OUString();
+
     OUString sRet;
-    OUString sSenderToken(SwResId(STR_SENDER_TOKENS));
-    sal_Int32 nTokenCount = comphelper::string::getTokenCount(sSenderToken, ';');
     sal_Int32 nSttPos = 0;
     bool bLastLength = true;
-    for( sal_Int32 i = 0; i < nTokenCount; i++ )
-    {
+    do {
         OUString sToken = sSenderToken.getToken( 0, ';', nSttPos );
         if (sToken == "COMPANY")
         {
@@ -86,7 +86,7 @@ OUString MakeSender()
             sRet += rUserOpt.GetState();
         else if (!sToken.isEmpty()) //spaces
             sRet += sToken;
-    }
+    } while (nSttPos>=0);
     return sRet;
 }
 
-- 
cgit