diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-21 15:36:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-21 16:50:13 +0100 |
| commit | d4b20d5c99adf2f32d782453387caef2439d9fa1 (patch) | |
| tree | 7d151b6918604cb73b24846835faf5c6475bc34b /linguistic | |
| parent | 4af59f9dea4c57ac5ebc8c43ff3b934a5498d164 (diff) | |
convert lcl_GetToken from xub_StrLen to sal_Int32
Change-Id: I72e98f1059280ed05b6cf77a6d69e522b4b8c075
Diffstat (limited to 'linguistic')
| -rw-r--r-- | linguistic/source/dlistimp.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
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 ) ) |