From 7d1f4cdec307bb1e761bb5dd3d8231bba5833e10 Mon Sep 17 00:00:00 2001 From: elixir Date: Thu, 7 Mar 2013 19:35:49 +0530 Subject: fdo#38838: Converting String/UniString to OUString Change-Id: If64db96005fcd8a42e4fa24041867b99183965f9 Reviewed-on: https://gerrit.libreoffice.org/2586 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba --- tools/source/string/tustring.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/source/string/tustring.cxx') diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx index a66dc6026452..b07cd3c9e8d8 100644 --- a/tools/source/string/tustring.cxx +++ b/tools/source/string/tustring.cxx @@ -520,14 +520,14 @@ void STRING::SetToken( xub_StrLen nToken, STRCODE cTok, const STRING& rStr, Replace( nFirstChar, i-nFirstChar, rStr ); } -STRING STRING::GetToken( xub_StrLen nToken, STRCODE cTok, xub_StrLen& rIndex ) const +STRING STRING::GetToken( xub_StrLen nToken, STRCODE cTok, sal_Int32& rIndex ) const { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); const STRCODE* pStr = mpData->maStr; xub_StrLen nLen = (xub_StrLen)mpData->mnLen; xub_StrLen nTok = 0; - xub_StrLen nFirstChar = rIndex; + sal_Int32 nFirstChar = rIndex; xub_StrLen i = nFirstChar; // Determine token position and length @@ -557,12 +557,12 @@ STRING STRING::GetToken( xub_StrLen nToken, STRCODE cTok, xub_StrLen& rIndex ) c if ( i < nLen ) rIndex = i+1; else - rIndex = STRING_NOTFOUND; + rIndex = -1; return Copy( nFirstChar, i-nFirstChar ); } else { - rIndex = STRING_NOTFOUND; + rIndex = -1; return STRING(); } } -- cgit v1.2.3