diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/unocore/unochart.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 4 | ||||
| -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 |
5 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index f57023e82c1a..4d53bc6808af 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -457,7 +457,7 @@ static bool GetSubranges( const OUString &rRangeRepresentation, { bool bRes = true; OUString aRangesStr( rRangeRepresentation ); - xub_StrLen nLen = comphelper::string::getTokenCount(aRangesStr, ';'); + sal_Int32 nLen = comphelper::string::getTokenCount(aRangesStr, ';'); uno::Sequence< OUString > aRanges( nLen ); sal_Int32 nCnt = 0; @@ -1767,7 +1767,7 @@ OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const OUString& rRange // multiple ranges are delimeted by a ';' like in // "Table1.A1:A4;Table1.C2:C5" the same table must be used in all ranges! - xub_StrLen nNumRanges = comphelper::string::getTokenCount(aRangeRepresentation, ';'); + sal_Int32 nNumRanges = comphelper::string::getTokenCount(aRangeRepresentation, ';'); SwTable* pFirstFoundTable = 0; // to check that only one table will be used for (sal_uInt16 i = 0; i < nNumRanges; ++i) { @@ -1835,7 +1835,7 @@ OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const OUString& rXML // multiple ranges are delimeted by a ' ' like in // "Table1.$A$1:.$A$4 Table1.$C$2:.$C$5" the same table must be used in all ranges! - xub_StrLen nNumRanges = comphelper::string::getTokenCount(aXMLRange, ' '); + sal_Int32 nNumRanges = comphelper::string::getTokenCount(aXMLRange, ' '); OUString aFirstFoundTable; // to check that only one table will be used for (sal_uInt16 i = 0; i < nNumRanges; ++i) { diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 8f1847e70c80..7c6246b7255d 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -911,9 +911,9 @@ void DocxAttributeOutput::DoWriteCmd( const OUString& rCmd ) void DocxAttributeOutput::CmdField_Impl( FieldInfos& rInfos ) { m_pSerializer->startElementNS( XML_w, XML_r, FSEND ); - xub_StrLen nNbToken = comphelper::string::getTokenCount(rInfos.sCmd, '\t'); + sal_Int32 nNbToken = comphelper::string::getTokenCount(rInfos.sCmd, '\t'); - for ( xub_StrLen i = 0; i < nNbToken; i++ ) + for ( sal_Int32 i = 0; i < nNbToken; i++ ) { OUString sToken = rInfos.sCmd.getToken( i, '\t' ); if ( rInfos.eType == ww::eCREATEDATE 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); |