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 /svtools | |
| 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 'svtools')
| -rw-r--r-- | svtools/source/contnr/fileview.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/urlobj/inetimg.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index dfb0a1095a54..5b021fb8341b 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1599,7 +1599,7 @@ void SvtFileView::SetConfigString( const String& rCfgStr ) HeaderBar* pBar = mpImp->mpView->GetHeaderBar(); DBG_ASSERT( pBar, "invalid headerbar" ); - sal_uInt16 nIdx = 0; + sal_Int32 nIdx = 0; mpImp->mnSortColumn = (sal_uInt16)rCfgStr.GetToken( 0, ';', nIdx ).ToInt32(); sal_Bool bUp = (sal_Bool)(sal_uInt16)rCfgStr.GetToken( 0, ';', nIdx ).ToInt32(); HeaderBarItemBits nBits = pBar->GetItemBits( mpImp->mnSortColumn ); @@ -1616,7 +1616,7 @@ void SvtFileView::SetConfigString( const String& rCfgStr ) } pBar->SetItemBits( mpImp->mnSortColumn, nBits ); - while ( nIdx != STRING_NOTFOUND ) + while ( nIdx != -1 ) { sal_uInt16 nItemId = (sal_uInt16)rCfgStr.GetToken( 0, ';', nIdx ).ToInt32(); pBar->SetItemSize( nItemId, rCfgStr.GetToken( 0, ';', nIdx ).ToInt32() ); diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx index 185e0246f5a3..263404c171de 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/svtools/source/urlobj/inetimg.cxx @@ -64,7 +64,7 @@ sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat ) case SOT_FORMATSTR_ID_INET_IMAGE: { String sINetImg = read_zeroTerminated_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8); - xub_StrLen nStart = 0; + sal_Int32 nStart = 0; aImageURL = sINetImg.GetToken( 0, TOKEN_SEPARATOR, nStart ); aTargetURL = sINetImg.GetToken( 0, TOKEN_SEPARATOR, nStart ); aTargetFrame = sINetImg.GetToken( 0, TOKEN_SEPARATOR, nStart ); |