diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 12:22:37 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 12:22:37 +0000 |
commit | 9e2bde7d77df7f8b681a2effda0f17488678aa2a (patch) | |
tree | 04d226f2cdf9846fe6e8b2f61c26e9a232364e7d /sc/source | |
parent | 080f879cb38d5404765bfc188b6f9361888c6fb6 (diff) |
INTEGRATION: CWS dr51 (1.16.6); FILE MERGED
2006/11/02 19:59:42 er 1.16.6.1: #i70041# add missing arguments support for most obvious functions of Xcl imported files while writing the correct default parameters to OOoXML's plain old formula
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/filter/excel/xlformula.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 121e318ad054..f158a70a6286 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.16 $ + * $Revision: 1.17 $ * - * last change: $Author: ihi $ $Date: 2006-10-18 12:24:52 $ + * last change: $Author: ihi $ $Date: 2006-12-19 13:22:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -90,7 +90,7 @@ static const XclFunctionInfo saFuncTable_2[] = { ocNBW, 11, 2, 30, V, { V, R } }, { ocStDev, 12, 1, 30, V, { R } }, { ocCurrency, 13, 1, 2, V, { V } }, - { ocFixed, 14, 2, 2, V, { V, V, C, I } }, + { ocFixed, 14, 1, 2, V, { V, V, C, I } }, { ocSin, 15, 1, 1, V, { V } }, { ocCos, 16, 1, 1, V, { V } }, { ocTan, 17, 1, 1, V, { V } }, @@ -238,7 +238,7 @@ static const XclFunctionInfo saFuncTable_3[] = /** Functions new in BIFF4. Unsupported functions: ASC, DBCS. */ static const XclFunctionInfo saFuncTable_4[] = { - { ocFixed, 14, 2, 3, V, { V } }, // BIFF2-3: 2, BIFF4: 2-3 + { ocFixed, 14, 1, 3, V, { V } }, // BIFF2-3: 1-2, BIFF4: 1-3 { ocNoName, 214, 1, 1, V, { V }, EXC_FUNCFLAG_IMPORTONLY }, // ASC { ocNoName, 215, 1, 1, V, { V }, EXC_FUNCFLAG_IMPORTONLY }, // DBCS { ocRank, 216, 2, 3, V, { V, R, V } }, |