diff options
author | elixir <prashant3.yishu@gmail.com> | 2013-03-07 19:35:49 +0530 |
---|---|---|
committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-03-11 15:50:44 +0000 |
commit | 7d1f4cdec307bb1e761bb5dd3d8231bba5833e10 (patch) | |
tree | 106a20fe24e8935e9b4943f17dad49dba67aa013 /tools/source/string | |
parent | c9d7427707ca36f60079833f53efd435202fe231 (diff) |
fdo#38838: Converting String/UniString to OUString
Change-Id: If64db96005fcd8a42e4fa24041867b99183965f9
Reviewed-on: https://gerrit.libreoffice.org/2586
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'tools/source/string')
-rw-r--r-- | tools/source/string/tustring.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
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(); } } |