From d4b20d5c99adf2f32d782453387caef2439d9fa1 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 21 Oct 2013 15:36:33 +0100
Subject: convert lcl_GetToken from xub_StrLen to sal_Int32

Change-Id: I72e98f1059280ed05b6cf77a6d69e522b4b8c075
---
 linguistic/source/dlistimp.cxx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'linguistic')

diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index f90a6b0503b8..05f514ef1615 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -22,7 +22,6 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <osl/file.hxx>
 #include <tools/stream.hxx>
-#include <tools/string.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/useroptions.hxx>
@@ -781,10 +780,10 @@ void * SAL_CALL DicList_getFactory( const sal_Char * pImplName,
 }
 
 
-xub_StrLen lcl_GetToken( OUString &rToken,
+static sal_Int32 lcl_GetToken( OUString &rToken,
             const OUString &rText, xub_StrLen nPos, const OUString &rDelim )
 {
-    xub_StrLen nRes = STRING_LEN;
+    sal_Int32 nRes = -1;
 
     if (rText.isEmpty() ||  nPos >= rText.getLength())
         rToken = "";
@@ -796,7 +795,7 @@ xub_StrLen lcl_GetToken( OUString &rToken,
     }
     else
     {
-        xub_StrLen  i;
+        sal_Int32 i;
         for (i = nPos;  i < rText.getLength();  ++i)
         {
             if (-1 != rDelim.indexOf( rText[i] ))
@@ -828,8 +827,8 @@ static void AddInternal(
             "ensure no '.'");
 
         OUString      aToken;
-        xub_StrLen  nPos = 0;
-        while (STRING_LEN !=
+        sal_Int32 nPos = 0;
+        while (-1 !=
                     (nPos = lcl_GetToken( aToken, rNew, nPos, aDelim )))
         {
             if( !aToken.isEmpty()  &&  !IsNumeric( aToken ) )
-- 
cgit