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 /sfx2 | |
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 'sfx2')
-rw-r--r-- | sfx2/source/appl/childwin.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/linkmgr2.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/appl/lnkbase2.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/dialog/srchdlg.cxx | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 798da8c280fb..0df98290416b 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -104,7 +104,7 @@ sal_Bool GetPosSizeFromString( const String& rStr, Point& rPos, Size& rSize ) if ( comphelper::string::getTokenCount(rStr, '/') != 4 ) return sal_False; - xub_StrLen nIdx = 0; + sal_Int32 nIdx = 0; rPos.X() = rStr.GetToken(0, '/', nIdx).ToInt32(); rPos.Y() = rStr.GetToken(0, '/', nIdx).ToInt32(); rSize.Width() = rStr.GetToken(0, '/', nIdx).ToInt32(); diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 91cf2e7bda07..32d3919cb822 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -238,7 +238,7 @@ bool LinkManager::GetDisplayNames( const SvBaseLink * pLink, case OBJECT_CLIENT_GRF: case OBJECT_CLIENT_OLE: { - sal_uInt16 nPos = 0; + sal_Int32 nPos = 0; String sFile( sLNm.GetToken( 0, ::sfx2::cTokenSeperator, nPos ) ); String sRange( sLNm.GetToken( 0, ::sfx2::cTokenSeperator, nPos ) ); @@ -262,7 +262,7 @@ bool LinkManager::GetDisplayNames( const SvBaseLink * pLink, break; case OBJECT_CLIENT_DDE: { - sal_uInt16 nTmp = 0; + sal_Int32 nTmp = 0; String sCmd( sLNm ); String sServer( sCmd.GetToken( 0, cTokenSeperator, nTmp ) ); String sTopic( sCmd.GetToken( 0, cTokenSeperator, nTmp ) ); diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 9cbd3b254e0a..f649c603f354 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -602,7 +602,7 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt ) return 0; String sNm( rLinkName ); - sal_uInt16 nTokenPos = 0; + sal_Int32 nTokenPos = 0; rtl::OUString sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); DdeServices& rSvc = DdeService::GetServices(); diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 1bd5f8dd9bd8..40f9420ce361 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -320,7 +320,7 @@ void ContentListBox_Impl::InitRoot() { String aRow( pEntries[i] ); String aTitle, aURL; - xub_StrLen nIdx = 0; + sal_Int32 nIdx = 0; aTitle = aRow.GetToken( 0, '\t', nIdx ); aURL = aRow.GetToken( 0, '\t', nIdx ); sal_Unicode cFolder = aRow.GetToken( 0, '\t', nIdx ).GetChar(0); @@ -364,7 +364,7 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) { String aRow( pEntries[i] ); String aTitle, aURL; - xub_StrLen nIdx = 0; + sal_Int32 nIdx = 0; aTitle = aRow.GetToken( 0, '\t', nIdx ); aURL = aRow.GetToken( 0, '\t', nIdx ); sal_Unicode cFolder = aRow.GetToken( 0, '\t', nIdx ).GetChar(0); @@ -1082,7 +1082,7 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl) { String aRow( pFacs[i] ); String aTitle, aType; - xub_StrLen nIdx = 0; + sal_Int32 nIdx = 0; aTitle = aRow.GetToken( 0, '\t', nIdx ); aType = aRow.GetToken( 0, '\t', nIdx ); String* pURL = new String( aRow.GetToken( 0, '\t', nIdx ) ); @@ -1601,7 +1601,7 @@ void SfxHelpIndexWindow_Impl::Initialize() { String aRow( pFacs[i] ); String aTitle, aType, aURL; - xub_StrLen nIdx = 0; + sal_Int32 nIdx = 0; aTitle = aRow.GetToken( 0, '\t', nIdx ); aType = aRow.GetToken( 0, '\t', nIdx ); aURL = aRow.GetToken( 0, '\t', nIdx ); @@ -2952,7 +2952,7 @@ void SfxHelpWindow_Impl::LoadConfig() { aUserData = String( aTemp ); DBG_ASSERT( comphelper::string::getTokenCount(aUserData, ';') == 6, "invalid user data" ); - sal_uInt16 nIdx = 0; + sal_Int32 nIdx = 0; nIndexSize = aUserData.GetToken( 0, ';', nIdx ).ToInt32(); nTextSize = aUserData.GetToken( 0, ';', nIdx ).ToInt32(); sal_Int32 nWidth = aUserData.GetToken( 0, ';', nIdx ).ToInt32(); diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index 7d7c45ad8cab..c5745f09da26 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -89,7 +89,7 @@ void SearchDialog::LoadConfig() { String sUserData( aTemp ); DBG_ASSERT( comphelper::string::getTokenCount(sUserData, ';') == 5, "invalid config data" ); - xub_StrLen nIdx = 0; + sal_Int32 nIdx = 0; String sSearchText = sUserData.GetToken( 0, ';', nIdx ); m_aWholeWordsBox.Check( sUserData.GetToken( 0, ';', nIdx ).ToInt32() == 1 ); m_aMatchCaseBox.Check( sUserData.GetToken( 0, ';', nIdx ).ToInt32() == 1 ); @@ -97,7 +97,7 @@ void SearchDialog::LoadConfig() m_aBackwardsBox.Check( sUserData.GetToken( 0, ';', nIdx ).ToInt32() == 1 ); nIdx = 0; - while ( nIdx != STRING_NOTFOUND ) + while ( nIdx != -1 ) m_aSearchEdit.InsertEntry( sSearchText.GetToken( 0, '\t', nIdx ) ); m_aSearchEdit.SelectEntryPos(0); } |