summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
authorelixir <prashant3.yishu@gmail.com>2013-03-07 19:35:49 +0530
committerFridrich Strba <fridrich@documentfoundation.org>2013-03-11 15:50:44 +0000
commit7d1f4cdec307bb1e761bb5dd3d8231bba5833e10 (patch)
tree106a20fe24e8935e9b4943f17dad49dba67aa013 /cui/source
parentc9d7427707ca36f60079833f53efd435202fe231 (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 'cui/source')
-rw-r--r--cui/source/dialogs/scriptdlg.cxx4
-rw-r--r--cui/source/options/optjava.cxx3
-rw-r--r--cui/source/tabpages/autocdlg.cxx6
3 files changed, 7 insertions, 6 deletions
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 7bfbbf521fde..cc3bcc0076c5 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -1232,8 +1232,8 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
if( aStoredEntry.Len() <= 0 )
return;
SvTreeListEntry* pEntry = 0;
- sal_uInt16 nIndex = 0;
- while ( nIndex != STRING_NOTFOUND )
+ sal_Int32 nIndex = 0;
+ while ( nIndex != -1 )
{
String aTmp( aStoredEntry.GetToken( 0, ';', nIndex ) );
SvTreeListEntry* pTmpEntry = m_pScriptsBox->FirstChild( pEntry );
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 47f1f9bfffaf..23e37a9fd86c 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -1080,7 +1080,8 @@ void SvxJavaClassPathDlg::SetClassPath( const String& _rPath )
if ( m_sOldPath.Len() == 0 )
m_sOldPath = _rPath;
m_aPathList.Clear();
- xub_StrLen i, nIdx = 0;
+ xub_StrLen i;
+ sal_Int32 nIdx = 0;
xub_StrLen nCount = comphelper::string::getTokenCount(_rPath, CLASSPATH_DELIMITER);
for ( i = 0; i < nCount; ++i )
{
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 6df09af10d58..2f11b4c86164 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -350,7 +350,7 @@ void OfaImpBrwString::Paint(
aFont.SetWeight( WEIGHT_BOLD );
sal_Bool bFett = sal_True;
- sal_uInt16 nPos = 0;
+ sal_Int32 nPos = 0;
do {
String sTxt( pUserData->pString->GetToken( 0, 1, nPos ));
@@ -359,14 +359,14 @@ void OfaImpBrwString::Paint(
rDev.DrawText( aNewPos, sTxt );
- if( STRING_NOTFOUND != nPos )
+ if( -1 != nPos )
aNewPos.X() += rDev.GetTextWidth( sTxt );
if( bFett )
rDev.SetFont( aOldFont );
bFett = !bFett;
- } while( STRING_NOTFOUND != nPos );
+ } while( -1 != nPos );
}
}