diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-29 20:44:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-30 11:39:01 +0100 |
| commit | 74929bba736cc6cceed3c088e13f5952abb1bd2b (patch) | |
| tree | 8a026d95bc586ca6a41686dee32dfa53b659b252 /sc/source/ui/docshell/docsh8.cxx | |
| parent | fc7e7b683112e9ccd23104f38d4acc3417e9d5b8 (diff) | |
Related: fdo#38838 remove UniString::ToUpperAscii
things got a little out of hand and I ended up
converting quite a bit of calc to OUString
Change-Id: I056326d37ffefa8c120cb2e564d166dd9f20f216
Diffstat (limited to 'sc/source/ui/docshell/docsh8.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh8.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index ae259c21608a..da29f00d8440 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -514,20 +514,21 @@ void lcl_GetColumnTypes( sal_Int32 nFieldLen = 0; sal_Int32 nPrecision = 0; sal_Int32 nDbType = sdbc::DataType::SQLNULL; - String aFieldName, aString; + String aFieldName; + OUString aString; // Feldname[,Type[,Width[,Prec]]] // Typ etc.: L; D; C[,W]; N[,W[,P]] if ( bHasFieldNames ) { aString = pDoc->GetString(nCol, nFirstRow, nTab); - aString.ToUpperAscii(); + aString = aString.toAsciiUpperCase(); xub_StrLen nToken = comphelper::string::getTokenCount(aString, ','); if ( nToken > 1 ) { - aFieldName = aString.GetToken( 0, ',' ); + aFieldName = aString.getToken( 0, ',' ); aString = comphelper::string::remove(aString, ' '); - switch ( aString.GetToken( 1, ',' ).GetChar(0) ) + switch ( aString.getToken( 1, ',' )[0] ) { case 'L' : nDbType = sdbc::DataType::BIT; @@ -559,10 +560,10 @@ void lcl_GetColumnTypes( } if ( bTypeDefined && !nFieldLen && nToken > 2 ) { - nFieldLen = aString.GetToken( 2, ',' ).ToInt32(); + nFieldLen = aString.getToken( 2, ',' ).toInt32(); if ( !bPrecDefined && nToken > 3 ) { - String aTmp( aString.GetToken( 3, ',' ) ); + String aTmp( aString.getToken( 3, ',' ) ); if ( CharClass::isAsciiNumeric(aTmp) ) { nPrecision = aTmp.ToInt32(); |