strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid getTokenCount and use indexed getToken

Browse source 
Change-Id: I14c22a3f04bd9ee31d7261f48ed64bad2477f8fd
This commit is contained in:
Matteo Casalin 2018-08-12 22:07:09 +02:00
parent 7224b69bd5
commit 0a2be735c3
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sc/source/ui/docshell/docsh8.cxx
View file

@ -24,7 +24,6 @@
#include <svl/converter.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/propertysequence.hxx>
#include <comphelper/string.hxx>
#include <comphelper/types.hxx>
#include <ucbhelper/content.hxx>
#include <svx/txenctab.hxx>
@ -470,20 +469,18 @@ void lcl_GetColumnTypes(
sal_Int32 nPrecision = 0;
sal_Int32 nDbType = sdbc::DataType::SQLNULL;
OUString aFieldName;
OUString aString;
// Fieldname[,Type[,Width[,Prec]]]
// Type etc.: L; D; C[,W]; N[,W[,P]]
if ( bHasFieldNames )
{
aString = rDoc.GetString(nCol, nFirstRow, nTab);
aString = aString.toAsciiUpperCase();
sal_Int32 nToken = comphelper::string::getTokenCount(aString, ',');
if ( nToken > 1 )
OUString aString {rDoc.GetString(nCol, nFirstRow, nTab).toAsciiUpperCase()};
sal_Int32 nIdx {0};
aFieldName = aString.getToken( 0, ',', nIdx);
if ( nIdx>0 )
{
aFieldName = aString.getToken( 0, ',' );
aString = aString.replaceAll(" ", "");
switch ( aString.getToken( 1, ',' )[0] )
switch ( aString.getToken( 0, ',', nIdx )[0] )
{
case 'L' :
nDbType = sdbc::DataType::BIT;
@ -514,12 +511,12 @@ void lcl_GetColumnTypes(
bTypeDefined = true;
break;
}
if ( bTypeDefined && !nFieldLen && nToken > 2 )
if ( bTypeDefined && !nFieldLen && nIdx>0 )
{
nFieldLen = aString.getToken( 2, ',' ).toInt32();
if ( !bPrecDefined && nToken > 3 )
nFieldLen = aString.getToken( 0, ',', nIdx ).toInt32();
if ( !bPrecDefined && nIdx>0 )
{
OUString aTmp( aString.getToken( 3, ',' ) );
OUString aTmp( aString.getToken( 0, ',', nIdx ) );
if ( CharClass::isAsciiNumeric(aTmp) )
{
nPrecision = aTmp.toInt32();
@ -530,8 +527,6 @@ void lcl_GetColumnTypes(
}
}
}
else
aFieldName = aString;
// Check field name and generate valid field name if necessary.
// First character has to be alphabetical, subsequent characters