diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-28 13:20:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-11-05 13:18:14 +0200 |
| commit | 3d65dfa3c98e0f79c579cfac23d55092f7554244 (patch) | |
| tree | 492c438c7af8dc56240add22d259945b67ea130a /sw/source/ui | |
| parent | 9802db7ff181a9c4d15cc453725b63b82a941fff (diff) | |
convert xub_StrLen to sal_Int32
Converts code that calls comphelper::string::getTokenCount() to
use sal_Int32 to store the return value.
Change-Id: I439605a39d29b1309649e30f3ff40dfa412efcde
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/dochdl/swdtflvr.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/envelp/envimg.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/fldui/fldmgr.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index c34e8fe8d4f0..3c496c70accb 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -2121,11 +2121,11 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData, comphelper::string::getTokenCount(aExpand, '\t') ) ) { OUString sTmp( aExpand ); - xub_StrLen nRows = comphelper::string::getTokenCount(sTmp, '\n'); + sal_Int32 nRows = comphelper::string::getTokenCount(sTmp, '\n'); if( nRows ) --nRows; sTmp = sTmp.getToken( 0, '\n' ); - xub_StrLen nCols = comphelper::string::getTokenCount(sTmp, '\t'); + sal_Int32 nCols = comphelper::string::getTokenCount(sTmp, '\t'); // at least one column & row must be there if( !nRows || !nCols ) diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index 41de9e189674..4af72172b4b9 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -54,10 +54,10 @@ SW_DLLPUBLIC OUString MakeSender() OUString sRet; OUString sSenderToken(SW_RES(STR_SENDER_TOKENS)); - xub_StrLen nTokenCount = comphelper::string::getTokenCount(sSenderToken, ';'); + sal_Int32 nTokenCount = comphelper::string::getTokenCount(sSenderToken, ';'); sal_Int32 nSttPos = 0; bool bLastLength = true; - for( xub_StrLen i = 0; i < nTokenCount; i++ ) + for( sal_Int32 i = 0; i < nTokenCount; i++ ) { OUString sToken = sSenderToken.getToken( 0, ';', nSttPos ); if (sToken == "COMPANY") diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index cf85fd022bca..64c5801ff3e3 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -1513,10 +1513,10 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat, break; case TYP_DROPDOWN: { - xub_StrLen nTokenCount = comphelper::string::getTokenCount(sPar2, DB_DELIM); + sal_Int32 nTokenCount = comphelper::string::getTokenCount(sPar2, DB_DELIM); Sequence<OUString> aEntries(nTokenCount); OUString* pArray = aEntries.getArray(); - for(xub_StrLen nToken = 0; nToken < nTokenCount; nToken++) + for(sal_Int32 nToken = 0; nToken < nTokenCount; nToken++) pArray[nToken] = sPar2.getToken(nToken, DB_DELIM); ((SwDropDownField*)pTmpFld)->SetItems(aEntries); ((SwDropDownField*)pTmpFld)->SetName(sPar1); |