diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 14:51:42 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 14:51:42 +0000 |
| commit | e6abd0f627633e2f53318b98b9233c71597a37b9 (patch) | |
| tree | 96d595d9e6a4873f0690b97b0df4f10da664cac5 /sc/source/filter/excel/xlformula.cxx | |
| parent | 81ae116b37d108041cf92f5a30befeb15ba2ff00 (diff) | |
INTEGRATION: CWS dr54 (1.19.54); FILE MERGED
2007/06/11 11:49:19 dr 1.19.54.3: RESYNC: (1.19-1.20); FILE MERGED
2007/06/07 12:18:56 er 1.19.54.2: #i70213# JIS and ASC spreadsheet functions, fullwidth/halfwidth katakana conversion
2007/05/22 13:28:38 dr 1.19.54.1: #i73911# remove leading spaces from validation list entries
Diffstat (limited to 'sc/source/filter/excel/xlformula.cxx')
| -rw-r--r-- | sc/source/filter/excel/xlformula.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 8ddccb995980..6254940bca8a 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xlformula.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: hr $ $Date: 2007-06-27 13:45:55 $ + * last change: $Author: rt $ $Date: 2007-07-03 15:51:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -240,12 +240,12 @@ static const XclFunctionInfo saFuncTable_3[] = { ocInfo, 244, 1, 1, V, { V }, EXC_FUNCFLAG_VOLATILE, 0 } }; -/** Functions new in BIFF4. Unsupported functions: ASC, DBCS. */ +/** Functions new in BIFF4. */ static const XclFunctionInfo saFuncTable_4[] = { { ocFixed, 14, 1, 3, V, { V }, 0, 0 }, // BIFF2-3: 1-2, BIFF4: 1-3 - { ocNoName, 214, 1, 1, V, { V }, EXC_FUNCFLAG_IMPORTONLY, 0 }, // ASC - { ocNoName, 215, 1, 1, V, { V }, EXC_FUNCFLAG_IMPORTONLY, 0 }, // DBCS + { ocAsc, 214, 1, 1, V, { V }, 0, 0 }, + { ocJis, 215, 1, 1, V, { V }, 0, 0 }, { ocRank, 216, 2, 3, V, { V, R, V }, 0, 0 }, { ocGDA2, 247, 4, 5, V, { V }, 0, 0 }, { ocFrequency, 252, 2, 2, A, { R }, 0, 0 }, @@ -644,7 +644,7 @@ bool XclTokenArrayHelper::GetStringList( String& rStringList, const ScTokenArray return bRet; } -void XclTokenArrayHelper::ConvertStringToList( ScTokenArray& rScTokArr, sal_Unicode cStringSep ) +void XclTokenArrayHelper::ConvertStringToList( ScTokenArray& rScTokArr, sal_Unicode cStringSep, bool bTrimLeadingSpaces ) { String aString; if( GetString( aString, rScTokArr ) ) @@ -655,6 +655,8 @@ void XclTokenArrayHelper::ConvertStringToList( ScTokenArray& rScTokArr, sal_Unic for( xub_StrLen nToken = 0; nToken < nTokenCnt; ++nToken ) { String aToken( aString.GetToken( 0, cStringSep, nStringIx ) ); + if( bTrimLeadingSpaces ) + aToken.EraseLeadingChars( ' ' ); if( nToken > 0 ) rScTokArr.AddOpCode( ocSep ); rScTokArr.AddString( aToken ); |