[Libreoffice-commits] core.git: cui/source dbaccess/source extensions/source sc/source sw/source
Noel Grandin
noel at peralex.com
Tue Nov 5 12:18:52 CET 2013
cui/source/options/optjava.cxx | 2 +-
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 4 ++--
dbaccess/source/ui/dlg/queryfilter.cxx | 6 +++---
dbaccess/source/ui/misc/TokenWriter.cxx | 8 ++++----
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 9 ++++-----
extensions/source/propctrlr/standardcontrol.cxx | 4 ++--
sc/source/core/tool/compiler.cxx | 7 +++----
sc/source/filter/excel/xecontent.cxx | 6 +++---
sc/source/filter/excel/xlformula.cxx | 4 ++--
sc/source/filter/html/htmlexp.cxx | 4 ++--
sc/source/filter/html/htmlimp.cxx | 4 ++--
sc/source/ui/dbgui/asciiopt.cxx | 8 ++++----
sc/source/ui/dbgui/csvgrid.cxx | 4 ++--
sc/source/ui/dbgui/csvruler.cxx | 4 ++--
sc/source/ui/dbgui/fieldwnd.cxx | 4 ++--
sc/source/ui/dbgui/imoptdlg.cxx | 2 +-
sc/source/ui/dbgui/scuiasciiopt.cxx | 12 ++++++------
sc/source/ui/docshell/arealink.cxx | 2 +-
sc/source/ui/docshell/docsh8.cxx | 2 +-
sc/source/ui/miscdlgs/anyrefdg.cxx | 4 ++--
sc/source/ui/miscdlgs/linkarea.cxx | 4 ++--
sc/source/ui/optdlg/tpusrlst.cxx | 4 ++--
sc/source/ui/pagedlg/areasdlg.cxx | 4 ++--
sw/source/core/unocore/unochart.cxx | 6 +++---
sw/source/filter/ww8/docxattributeoutput.cxx | 4 ++--
sw/source/ui/dochdl/swdtflvr.cxx | 4 ++--
sw/source/ui/envelp/envimg.cxx | 4 ++--
sw/source/ui/fldui/fldmgr.cxx | 4 ++--
28 files changed, 66 insertions(+), 68 deletions(-)
New commits:
commit 3d65dfa3c98e0f79c579cfac23d55092f7554244
Author: Noel Grandin <noel at peralex.com>
Date: Mon Oct 28 13:20:52 2013 +0200
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
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index e1dca0dd..8679154 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -1074,7 +1074,7 @@ void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
m_pPathList->Clear();
xub_StrLen i;
sal_Int32 nIdx = 0;
- xub_StrLen nCount = comphelper::string::getTokenCount(_rPath, CLASSPATH_DELIMITER);
+ sal_Int32 nCount = comphelper::string::getTokenCount(_rPath, CLASSPATH_DELIMITER);
for ( i = 0; i < nCount; ++i )
{
OUString sToken = _rPath.getToken( 0, CLASSPATH_DELIMITER, nIdx );
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 0ac82b4..83f1feb 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -86,7 +86,7 @@ DBG_NAME(OTextConnectionHelper)
{
DBG_CTOR(OTextConnectionHelper,NULL);
- xub_StrLen nCnt = comphelper::string::getTokenCount(m_aFieldSeparatorList, '\t');
+ sal_Int32 nCnt = comphelper::string::getTokenCount(m_aFieldSeparatorList, '\t');
xub_StrLen i;
for( i = 0 ; i < nCnt ; i += 2 )
@@ -469,7 +469,7 @@ DBG_NAME(OTextConnectionHelper)
void OTextConnectionHelper::SetSeparator( ComboBox& rBox, const OUString& rList, const OUString& rVal )
{
char nTok = '\t';
- xub_StrLen nCnt(comphelper::string::getTokenCount(rList, nTok));
+ sal_Int32 nCnt = comphelper::string::getTokenCount(rList, nTok);
xub_StrLen i;
for( i=0 ; i<nCnt ; i+=2 )
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index fa7f1b7..e624cbb 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -210,7 +210,7 @@ DlgFilterCrit::~DlgFilterCrit()
sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const OUString& _rSelectedPredicate ) const
{
sal_Int32 nPredicateIndex = -1;
- for ( xub_StrLen i=0; i < comphelper::string::getTokenCount(aSTR_COMPARE_OPERATORS, ';'); ++i)
+ for ( sal_Int32 i=0; i < comphelper::string::getTokenCount(aSTR_COMPARE_OPERATORS, ';'); ++i)
if ( aSTR_COMPARE_OPERATORS.getToken(i, ';') == _rSelectedPredicate )
{
nPredicateIndex = i;
@@ -712,7 +712,7 @@ IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox *, pListBox )
if(eColumnSearch == ColumnSearch::FULL)
{
- for(xub_StrLen i=0;i < comphelper::string::getTokenCount(aSTR_COMPARE_OPERATORS, ';');i++)
+ for(sal_Int32 i=0;i < comphelper::string::getTokenCount(aSTR_COMPARE_OPERATORS, ';');i++)
pComp->InsertEntry(aSTR_COMPARE_OPERATORS.getToken(i, ';'));
}
else if(eColumnSearch == ColumnSearch::CHAR)
@@ -722,7 +722,7 @@ IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox *, pListBox )
}
else if(eColumnSearch == ColumnSearch::BASIC)
{
- xub_StrLen i;
+ sal_Int32 i;
for( i = 0; i < 6; i++ )
pComp->InsertEntry(aSTR_COMPARE_OPERATORS.getToken(i, ';'));
for(i=8; i < comphelper::string::getTokenCount(aSTR_COMPARE_OPERATORS, ';'); ++i)
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index ef4b72b..1e4895f 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -103,7 +103,7 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor&
osl_atomic_increment( &m_refCount );
impl_initFromDescriptor( _aDataDescriptor, false );
- xub_StrLen nCount = comphelper::string::getTokenCount(rExchange, char(11));
+ sal_Int32 nCount = comphelper::string::getTokenCount(rExchange, char(11));
if( nCount > SBA_FORMAT_SELECTION_COUNT && !rExchange.getToken(4, ';').isEmpty())
{
m_pRowMarker = new sal_Int32[nCount-SBA_FORMAT_SELECTION_COUNT];
@@ -403,11 +403,11 @@ sal_Bool ORTFImportExport::Write()
}
(*m_pStream) << "{\\fonttbl";
- xub_StrLen nTokenCount = comphelper::string::getTokenCount(aFonts, ';');
- for(sal_uInt32 j=0;j<nTokenCount;++j)
+ sal_Int32 nTokenCount = comphelper::string::getTokenCount(aFonts, ';');
+ for(sal_Int32 j=0; j<nTokenCount; ++j)
{
(*m_pStream) << "\\f";
- m_pStream->WriteNumber(static_cast<sal_Int32>(j));
+ m_pStream->WriteNumber(j);
(*m_pStream) << "\\fcharset0\\fnil ";
(*m_pStream) << comphelper::string::getToken(aFonts, j, ';').getStr();
(*m_pStream) << ';';
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 78f5f7e..1b45eac 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -69,7 +69,7 @@ namespace
if ( !bAsterix )
{
OUString sName = _sFieldName;
- xub_StrLen nTokenCount = comphelper::string::getTokenCount(sName, '.');
+ sal_Int32 nTokenCount = comphelper::string::getTokenCount(sName, '.');
if ( (nTokenCount == 2 && sName.getToken(1,'.')[0] == '*' )
|| (nTokenCount == 3 && sName.getToken(2,'.')[0] == '*' ) )
{
@@ -139,9 +139,8 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
SetTitleFont(aTitleFont);
OUString aTxt(ModuleRes(STR_QUERY_SORTTEXT));
- xub_StrLen nCount = comphelper::string::getTokenCount(aTxt, ';');
- xub_StrLen nIdx = 0;
- for (; nIdx < nCount; nIdx++)
+ sal_Int32 nCount = comphelper::string::getTokenCount(aTxt, ';');
+ for (sal_Int32 nIdx = 0; nIdx < nCount; nIdx++)
m_pOrderCell->InsertEntry(aTxt.getToken(nIdx, ';'));
for(long i=0;i < BROW_ROW_CNT;i++)
@@ -202,7 +201,7 @@ void OSelectionBrowseBox::initialize()
// We slip in a few optionals one, too.
if ( lcl_SupportsCoreSQLGrammar(xConnection) )
{
- xub_StrLen nCount = comphelper::string::getTokenCount(m_aFunctionStrings, ';');
+ sal_Int32 nCount = comphelper::string::getTokenCount(m_aFunctionStrings, ';');
for (xub_StrLen nIdx = 0; nIdx < nCount; nIdx++)
m_pFunctionCell->InsertEntry(m_aFunctionStrings.getToken(nIdx, ';'));
}
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 395b564..06bf36d 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -1158,10 +1158,10 @@ namespace pcr
//..............................................................
StlSyntaxSequence< OUString > lcl_convertMultiLineToList( const OUString& _rCompsedTextWithLineBreaks )
{
- xub_StrLen nLines( comphelper::string::getTokenCount(_rCompsedTextWithLineBreaks, '\n') );
+ sal_Int32 nLines = comphelper::string::getTokenCount(_rCompsedTextWithLineBreaks, '\n');
StlSyntaxSequence< OUString > aStrings( nLines );
StlSyntaxSequence< OUString >::iterator stringItem = aStrings.begin();
- for ( xub_StrLen token = 0; token < nLines; ++token, ++stringItem )
+ for ( sal_Int32 token = 0; token < nLines; ++token, ++stringItem )
*stringItem = _rCompsedTextWithLineBreaks.getToken( token, '\n' );
return aStrings;
}
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 5a7d8e2..f640455 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3272,14 +3272,13 @@ void ScCompiler::AutoCorrectParsedSymbol()
else if ( (GetCharTableFlags( c1, 0 ) & SC_COMPILER_C_CHAR_VALUE)
&& (GetCharTableFlags( c2, c2p ) & SC_COMPILER_C_CHAR_VALUE) )
{
- xub_StrLen nXcount;
- if ( (nXcount = comphelper::string::getTokenCount(aCorrectedSymbol, cx)) > 1 )
+ if ( comphelper::string::getTokenCount(aCorrectedSymbol, cx) > 1 )
{ // x => *
sal_Unicode c = mxSymbols->getSymbolChar(ocMul);
aCorrectedSymbol = aCorrectedSymbol.replaceAll(OUString(cx), OUString(c));
bCorrected = true;
}
- if ( (nXcount = comphelper::string::getTokenCount(aCorrectedSymbol, cX)) > 1 )
+ if ( comphelper::string::getTokenCount(aCorrectedSymbol, cX) > 1 )
{ // X => *
sal_Unicode c = mxSymbols->getSymbolChar(ocMul);
aCorrectedSymbol = aCorrectedSymbol.replaceAll(OUString(cX), OUString(c));
@@ -3297,7 +3296,7 @@ void ScCompiler::AutoCorrectParsedSymbol()
aDoc = aSymbol.copy(0, nPosition + 2);
aSymbol = aSymbol.copy(nPosition + 2);
}
- xub_StrLen nRefs = comphelper::string::getTokenCount(aSymbol, ':');
+ sal_Int32 nRefs = comphelper::string::getTokenCount(aSymbol, ':');
bool bColons;
if ( nRefs > 2 )
{ // duplicated or too many ':'? B:2::C10 => B2:C10
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 138ffa8..65eb8a2 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1568,9 +1568,9 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
Data validity is BIFF8 only (important for the XclExpString object).
Excel uses the NUL character as string list separator. */
mxString1.reset( new XclExpString( EXC_STR_8BITLENGTH ) );
- xub_StrLen nTokenCnt = comphelper::string::getTokenCount(aString, '\n');
+ sal_Int32 nTokenCnt = comphelper::string::getTokenCount(aString, '\n');
sal_Int32 nStringIx = 0;
- for( xub_StrLen nToken = 0; nToken < nTokenCnt; ++nToken )
+ for( sal_Int32 nToken = 0; nToken < nTokenCnt; ++nToken )
{
OUString aToken( aString.getToken( 0, '\n', nStringIx ) );
if( nToken > 0 )
@@ -1807,7 +1807,7 @@ XclExpWebQuery::XclExpWebQuery(
mbEntireDoc( false )
{
// comma separated list of HTML table names or indexes
- xub_StrLen nTokenCnt = comphelper::string::getTokenCount(rSource, ';');
+ sal_Int32 nTokenCnt = comphelper::string::getTokenCount(rSource, ';');
OUString aNewTables;
OUString aAppendTable;
sal_Int32 nStringIx = 0;
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 10cc2fe..343a46f 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -797,9 +797,9 @@ void XclTokenArrayHelper::ConvertStringToList( ScTokenArray& rScTokArr, sal_Unic
if( GetString( aString, rScTokArr ) )
{
rScTokArr.Clear();
- xub_StrLen nTokenCnt = comphelper::string::getTokenCount(aString, cStringSep);
+ sal_Int32 nTokenCnt = comphelper::string::getTokenCount(aString, cStringSep);
sal_Int32 nStringIx = 0;
- for( xub_StrLen nToken = 0; nToken < nTokenCnt; ++nToken )
+ for( sal_Int32 nToken = 0; nToken < nTokenCnt; ++nToken )
{
OUString aToken( aString.getToken( 0, cStringSep, nStringIx ) );
if( bTrimLeadingSpaces )
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 0849729..19910d8 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -372,7 +372,7 @@ void ScHTMLExport::WriteHeader()
<< OOO_STRING_SVTOOLS_HTML_thead << "," << OOO_STRING_SVTOOLS_HTML_tbody << "," << OOO_STRING_SVTOOLS_HTML_tfoot << ","
<< OOO_STRING_SVTOOLS_HTML_tablerow << "," << OOO_STRING_SVTOOLS_HTML_tableheader << ","
<< OOO_STRING_SVTOOLS_HTML_tabledata << "," << OOO_STRING_SVTOOLS_HTML_parabreak << " { " << sFontFamily;
- xub_StrLen nFonts = comphelper::string::getTokenCount(aHTMLStyle.aFontFamilyName, ';');
+ sal_Int32 nFonts = comphelper::string::getTokenCount(aHTMLStyle.aFontFamilyName, ';');
if ( nFonts == 1 )
{
rStrm << '\"';
@@ -1075,7 +1075,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
{
aStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_face).
append(RTL_CONSTASCII_STRINGPARAM("=\""));
- xub_StrLen nFonts = comphelper::string::getTokenCount(rFontItem.GetFamilyName(), ';');
+ sal_Int32 nFonts = comphelper::string::getTokenCount(rFontItem.GetFamilyName(), ';');
if ( nFonts == 1 )
{
OString aTmpStr = HTMLOutFuncs::ConvertStringToHTML(
diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx
index 482e5e5..99544ba 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -211,9 +211,9 @@ OUString ScHTMLImport::GetHTMLRangeNameList( ScDocument* pDoc, const OUString& r
OUString aNewName;
ScRangeName* pRangeNames = pDoc->GetRangeName();
ScRangeList aRangeList;
- xub_StrLen nTokenCnt = comphelper::string::getTokenCount(rOrigName, ';');
+ sal_Int32 nTokenCnt = comphelper::string::getTokenCount(rOrigName, ';');
sal_Int32 nStringIx = 0;
- for( xub_StrLen nToken = 0; nToken < nTokenCnt; nToken++ )
+ for( sal_Int32 nToken = 0; nToken < nTokenCnt; nToken++ )
{
OUString aToken( rOrigName.getToken( 0, ';', nStringIx ) );
if( pRangeNames && ScfTools::IsHTMLTablesName( aToken ) )
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index d52d4aa..1072a89 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -183,8 +183,8 @@ bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const
static OUString lcl_decodeSepString( const OUString & rSepNums, bool & o_bMergeFieldSeps )
{
OUString aFieldSeps;
- xub_StrLen nSub = comphelper::string::getTokenCount( rSepNums, '/');
- for (xub_StrLen i=0; i<nSub; ++i)
+ sal_Int32 nSub = comphelper::string::getTokenCount( rSepNums, '/');
+ for (sal_Int32 i=0; i<nSub; ++i)
{
OUString aCode = rSepNums.getToken( i, '/' );
if ( aCode.equalsAscii(pStrMrg) )
@@ -204,7 +204,7 @@ static OUString lcl_decodeSepString( const OUString & rSepNums, bool & o_bMergeF
void ScAsciiOptions::ReadFromString( const OUString& rString )
{
- xub_StrLen nCount = comphelper::string::getTokenCount(rString, ',');
+ sal_Int32 nCount = comphelper::string::getTokenCount(rString, ',');
OUString aToken;
// Field separator.
@@ -247,7 +247,7 @@ void ScAsciiOptions::ReadFromString( const OUString& rString )
delete[] pColFormat;
aToken = rString.getToken(4,',');
- xub_StrLen nSub = comphelper::string::getTokenCount(aToken, '/');
+ sal_Int32 nSub = comphelper::string::getTokenCount(aToken, '/');
nInfoCount = nSub / 2;
if (nInfoCount)
{
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 221da15..2440f85 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -1071,9 +1071,9 @@ void ScCsvGrid::ImplDrawCellText( const Point& rPos, const OUString& rText )
/* #i60296# If string contains mixed script types, the space character
U+0020 may be drawn with a wrong width (from non-fixed-width Asian or
Complex font). Now we draw every non-space portion separately. */
- xub_StrLen nTokenCount = comphelper::string::getTokenCount(aPlainText, ' ');
+ sal_Int32 nTokenCount = comphelper::string::getTokenCount(aPlainText, ' ');
sal_Int32 nCharIxInt = 0;
- for( xub_StrLen nToken = 0; nToken < nTokenCount; ++nToken )
+ for( sal_Int32 nToken = 0; nToken < nTokenCount; ++nToken )
{
sal_Int32 nBeginIx = nCharIxInt;
OUString aToken = aPlainText.getToken( 0, ' ', nCharIxInt );
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index 3ea0d51..0363c09 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -62,8 +62,8 @@ static void load_FixedWidthList(ScCsvSplits &aSplits)
sSplits = sFixedWidthLists;
// String ends with a semi-colon so there is no 'int' after the last one.
- xub_StrLen n = comphelper::string::getTokenCount(sSplits, ';') - 1;
- for (xub_StrLen i = 0; i < n; ++i)
+ sal_Int32 n = comphelper::string::getTokenCount(sSplits, ';') - 1;
+ for (sal_Int32 i = 0; i < n; ++i)
aSplits.Insert( sSplits.getToken(i, ';').toInt32() );
}
}
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index 717867b..ca91ab6 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -579,10 +579,10 @@ void ScDPFieldControlBase::DrawBackground( OutputDevice& rDev )
support hard line breaks here. This part will draw each line of the
text for itself. */
- xub_StrLen nTokenCnt = comphelper::string::getTokenCount(GetText(), '\n');
+ sal_Int32 nTokenCnt = comphelper::string::getTokenCount(GetText(), '\n');
long nY = (aSize.Height() - nTokenCnt * rDev.GetTextHeight()) / 2;
sal_Int32 nStringIx = 0;
- for( xub_StrLen nToken = 0; nToken < nTokenCnt; ++nToken )
+ for( sal_Int32 nToken = 0; nToken < nTokenCnt; ++nToken )
{
OUString aLine( GetText().getToken( 0, '\n', nStringIx ) );
Point aLinePos( (aSize.Width() - rDev.GetCtrlTextWidth( aLine )) / 2, nY );
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index 56d4b74..fd2a18a 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -45,7 +45,7 @@ ScImportOptions::ScImportOptions( const OUString& rStr )
bSaveAsShown = sal_True; // "true" if not in string (after CSV import)
bQuoteAllText = false;
bSaveFormulas = false;
- xub_StrLen nTokenCount = comphelper::string::getTokenCount(rStr, ',');
+ sal_Int32 nTokenCount = comphelper::string::getTokenCount(rStr, ',');
if ( nTokenCount >= 3 )
{
// first 3 tokens: common
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 5e2720a..87aa28c 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -62,8 +62,8 @@ using namespace com::sun::star::uno;
static void lcl_FillCombo( ComboBox& rCombo, const OUString& rList, sal_Unicode cSelect )
{
- xub_StrLen i;
- xub_StrLen nCount = comphelper::string::getTokenCount(rList, '\t');
+ sal_Int32 i;
+ sal_Int32 nCount = comphelper::string::getTokenCount(rList, '\t');
for ( i=0; i<nCount; i+=2 )
rCombo.InsertEntry( rList.getToken(i,'\t') );
@@ -86,8 +86,8 @@ static sal_Unicode lcl_CharFromCombo( ComboBox& rCombo, const OUString& rList )
OUString aStr = rCombo.GetText();
if ( !aStr.isEmpty() )
{
- xub_StrLen nCount = comphelper::string::getTokenCount(rList, '\t');
- for ( xub_StrLen i=0; i<nCount; i+=2 )
+ sal_Int32 nCount = comphelper::string::getTokenCount(rList, '\t');
+ for ( sal_Int32 i=0; i<nCount; i+=2 )
{
if ( ScGlobal::GetpTransliteration()->isEqual( aStr, rList.getToken(i,'\t') ) )
c = (sal_Unicode)rList.getToken(i+1,'\t').toInt32();
@@ -404,8 +404,8 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,OUString aDatName,
pLbCustomLang->SelectLanguage(static_cast<LanguageType>(nLanguage), true);
// *** column type ListBox ***
- xub_StrLen nCount = comphelper::string::getTokenCount(aColumnUser, ';');
- for (xub_StrLen i=0; i<nCount; i++)
+ sal_Int32 nCount = comphelper::string::getTokenCount(aColumnUser, ';');
+ for (sal_Int32 i=0; i<nCount; i++)
pLbType->InsertEntry( aColumnUser.getToken( i, ';' ) );
pLbType->SetSelectHdl( LINK( this, ScImportAsciiDlg, LbColTypeHdl ) );
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 068ef32..2069141 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -278,7 +278,7 @@ sal_Bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilt
// find total size of source area
SCCOL nWidth = 0;
SCROW nHeight = 0;
- xub_StrLen nTokenCnt = comphelper::string::getTokenCount(aTempArea, ';');
+ sal_Int32 nTokenCnt = comphelper::string::getTokenCount(aTempArea, ';');
sal_Int32 nStringIx = 0;
xub_StrLen nToken;
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 87a7226..2df6c36 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -523,7 +523,7 @@ void lcl_GetColumnTypes(
{
aString = pDoc->GetString(nCol, nFirstRow, nTab);
aString = aString.toAsciiUpperCase();
- xub_StrLen nToken = comphelper::string::getTokenCount(aString, ',');
+ sal_Int32 nToken = comphelper::string::getTokenCount(aString, ',');
if ( nToken > 1 )
{
aFieldName = aString.getToken( 0, ',' );
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 1ec55dc..a943692 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -148,8 +148,8 @@ bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const OUStr
ScAddress::Details aDetails(pDoc->GetAddressConvention(), 0, 0);
ScRangeUtil aRangeUtil;
- xub_StrLen nTokenCnt = comphelper::string::getTokenCount(rStr, ';');
- for( xub_StrLen nToken = 0; nToken < nTokenCnt; ++nToken )
+ sal_Int32 nTokenCnt = comphelper::string::getTokenCount(rStr, ';');
+ for( sal_Int32 nToken = 0; nToken < nTokenCnt; ++nToken )
{
ScRange aRange;
OUString aRangeStr( rStr.getToken( nToken, ';' ) );
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index 830d043..af88fed 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -175,8 +175,8 @@ void ScLinkedAreaDlg::InitFromOldLink( const OUString& rFile, const OUString& rF
UpdateSourceRanges();
- xub_StrLen nRangeCount = comphelper::string::getTokenCount(rSource, ';');
- for ( xub_StrLen i=0; i<nRangeCount; i++ )
+ sal_Int32 nRangeCount = comphelper::string::getTokenCount(rSource, ';');
+ for ( sal_Int32 i=0; i<nRangeCount; i++ )
{
OUString aRange = rSource.getToken(i,';');
m_pLbRanges->SelectEntry( aRange );
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 5fcb9bf..cf16ad4 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -314,9 +314,9 @@ void ScTpUserLists::MakeListStr( OUString& rListStr )
{
OUString aStr;
- xub_StrLen nToken = comphelper::string::getTokenCount(rListStr, LF);
+ sal_Int32 nToken = comphelper::string::getTokenCount(rListStr, LF);
- for(xub_StrLen i=0;i<nToken;i++)
+ for(sal_Int32 i=0; i<nToken; i++)
{
OUString aString = comphelper::string::strip(rListStr.getToken(i, LF), ' ');
aStr += aString;
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index d9d7083..2c071e8 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -372,8 +372,8 @@ sal_Bool ScPrintAreasDlg::Impl_CheckRefStrings()
ScAddress aAddr;
ScRange aRange;
- xub_StrLen nSepCount = comphelper::string::getTokenCount(aStrPrintArea, sep);
- for ( xub_StrLen i = 0; i < nSepCount && bPrintAreaOk; ++i )
+ sal_Int32 nSepCount = comphelper::string::getTokenCount(aStrPrintArea, sep);
+ for ( sal_Int32 i = 0; i < nSepCount && bPrintAreaOk; ++i )
{
OUString aOne = aStrPrintArea.getToken(i, sep);
sal_uInt16 nResult = aRange.Parse( aOne, pDoc, eConv );
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index f57023e..4d53bc6 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 8f1847e..7c6246b 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 c34e8fe..3c496c7 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 41de9e1..4af7217 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 cf85fd0..64c5801 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);
More information about the Libreoffice-commits
mailing list