|
 |
f0633d |
From 80994001d563ffd51f008eae4eb88c6eb2b7d38b Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: Eike Rathke <erack@redhat.com>
|
|
|
f0633d |
Date: Sat, 2 Nov 2013 21:03:17 +0100
|
|
|
f0633d |
Subject: [PATCH 011/109] resolved fdo#67572 export add-in equivalents as
|
|
|
f0633d |
internal to .xlsx
|
|
|
f0633d |
|
|
|
f0633d |
For OOXML .xlsx export the add-in functions that are equivalents of
|
|
|
f0633d |
known internal functions as those internal functions.
|
|
|
f0633d |
|
|
|
f0633d |
(cherry picked from commit da7c6092a644dc22f90fb8eef0c4f0df06ec204a)
|
|
|
f0633d |
|
|
|
f0633d |
Minus the DURATION change that was fixed on master (and 4.2) with
|
|
|
f0633d |
62e1a27dc757637223f5f18b1a340ba138e0cb82
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: Ic41f32b67902effa07c3d4db137be08dc5af7265
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/6530
|
|
|
f0633d |
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
|
f0633d |
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
|
f0633d |
---
|
|
|
f0633d |
sc/source/filter/inc/formulabase.hxx | 1 +
|
|
|
f0633d |
sc/source/filter/oox/formulabase.cxx | 27 ++++++++++++++++-----------
|
|
|
f0633d |
2 files changed, 17 insertions(+), 11 deletions(-)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
|
|
|
f0633d |
index cb2785e..50948f7 100644
|
|
|
f0633d |
--- a/sc/source/filter/inc/formulabase.hxx
|
|
|
f0633d |
+++ b/sc/source/filter/inc/formulabase.hxx
|
|
|
f0633d |
@@ -499,6 +499,7 @@ struct FunctionInfo
|
|
|
f0633d |
bool mbParamPairs; /// True = optional parameters are expected to appear in pairs.
|
|
|
f0633d |
bool mbVolatile; /// True = volatile function.
|
|
|
f0633d |
bool mbExternal; /// True = external function in Calc.
|
|
|
f0633d |
+ bool mbInternal; /// True = internal function in Calc. (Both can be true!)
|
|
|
f0633d |
bool mbMacroFunc; /// True = macro sheet function or command.
|
|
|
f0633d |
bool mbVarParam; /// True = use a tFuncVar token, also if min/max are equal.
|
|
|
f0633d |
};
|
|
|
f0633d |
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
|
|
|
f0633d |
index d0db2e7..c222e7e 100644
|
|
|
f0633d |
--- a/sc/source/filter/oox/formulabase.cxx
|
|
|
f0633d |
+++ b/sc/source/filter/oox/formulabase.cxx
|
|
|
f0633d |
@@ -212,6 +212,7 @@ const sal_uInt16 FUNCFLAG_MACROCALL_NEW = FUNCFLAG_MACROCALL | FUNCFLAG_MACR
|
|
|
f0633d |
must exist. */
|
|
|
f0633d |
const sal_uInt16 FUNCFLAG_BIFFIMPORTONLY = 0x0800; /// Only used in BIFF binary import filter.
|
|
|
f0633d |
const sal_uInt16 FUNCFLAG_BIFFEXPORTONLY = 0x1000; /// Only used in BIFF binary export filter.
|
|
|
f0633d |
+const sal_uInt16 FUNCFLAG_INTERNAL = 0x2000; /// Function is internal in Calc.
|
|
|
f0633d |
|
|
|
f0633d |
/// Converts a function library index (value of enum FunctionLibraryType) to function flags.
|
|
|
f0633d |
#define FUNCLIB_TO_FUNCFLAGS( funclib_index ) static_cast< sal_uInt16 >( static_cast< sal_uInt8 >( funclib_index ) << 12 )
|
|
|
f0633d |
@@ -584,8 +585,8 @@ static const FunctionData saFuncTableBiff4[] =
|
|
|
f0633d |
{ "QUOTIENT", "QUOTIENT", 417, NOID, 2, 2, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "DELTA", "DELTA", 418, NOID, 1, 2, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "GESTEP", "GESTEP", 419, NOID, 1, 2, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
- { "ISEVEN", "ISEVEN", 420, NOID, 1, 1, V, { RR }, FUNCFLAG_EXTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
- { "ISODD", "ISODD", 421, NOID, 1, 1, V, { RR }, FUNCFLAG_EXTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
+ { "ISEVEN", "ISEVEN", 420, NOID, 1, 1, V, { RR }, FUNCFLAG_EXTERNAL | FUNCFLAG_INTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
+ { "ISODD", "ISODD", 421, NOID, 1, 1, V, { RR }, FUNCFLAG_EXTERNAL | FUNCFLAG_INTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
{ "MROUND", "MROUND", 422, NOID, 2, 2, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "ERF", "ERF", 423, NOID, 1, 2, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "ERFC", "ERFC", 424, NOID, 1, 1, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
@@ -609,10 +610,10 @@ static const FunctionData saFuncTableBiff4[] =
|
|
|
f0633d |
{ "YIELD", "YIELD", 442, NOID, 6, 7, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "DOLLARDE", "DOLLARDE", 443, NOID, 2, 2, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "DOLLARFR", "DOLLARFR", 444, NOID, 2, 2, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
- { "NOMINAL", "NOMINAL", 445, NOID, 2, 2, V, { RR }, FUNCFLAG_EXTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
- { "EFFECT", "EFFECT", 446, NOID, 2, 2, V, { RR }, FUNCFLAG_EXTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
- { "CUMPRINC", "CUMPRINC", 447, NOID, 6, 6, V, { RR }, FUNCFLAG_EXTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
- { "CUMIPMT", "CUMIPMT", 448, NOID, 6, 6, V, { RR }, FUNCFLAG_EXTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
+ { "NOMINAL", "NOMINAL", 445, NOID, 2, 2, V, { RR }, FUNCFLAG_EXTERNAL | FUNCFLAG_INTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
+ { "EFFECT", "EFFECT", 446, NOID, 2, 2, V, { RR }, FUNCFLAG_EXTERNAL | FUNCFLAG_INTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
+ { "CUMPRINC", "CUMPRINC", 447, NOID, 6, 6, V, { RR }, FUNCFLAG_EXTERNAL | FUNCFLAG_INTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
+ { "CUMIPMT", "CUMIPMT", 448, NOID, 6, 6, V, { RR }, FUNCFLAG_EXTERNAL | FUNCFLAG_INTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
{ "EDATE", "EDATE", 449, NOID, 2, 2, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "EOMONTH", "EOMONTH", 450, NOID, 2, 2, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "YEARFRAC", "YEARFRAC", 451, NOID, 2, 3, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
@@ -622,7 +623,7 @@ static const FunctionData saFuncTableBiff4[] =
|
|
|
f0633d |
{ "COUPNCD", "COUPNCD", 455, NOID, 3, 4, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "COUPNUM", "COUPNUM", 456, NOID, 3, 4, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "COUPPCD", "COUPPCD", 457, NOID, 3, 4, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
- { "DURATION", "DURATION", 458, NOID, 5, 6, V, { RR }, FUNCFLAG_EXTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
+ { "DURATION", "DURATION", 458, NOID, 5, 6, V, { RR }, FUNCFLAG_EXTERNAL }, // Calc: builtin and add-in (but different!)
|
|
|
f0633d |
{ "MDURATION", "MDURATION", 459, NOID, 5, 6, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "ODDLPRICE", "ODDLPRICE", 460, NOID, 7, 8, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "ODDLYIELD", "ODDLYIELD", 461, NOID, 8, 9, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
@@ -632,14 +633,14 @@ static const FunctionData saFuncTableBiff4[] =
|
|
|
f0633d |
{ "WEEKNUM", "WEEKNUM", 465, NOID, 1, 2, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "AMORDEGRC", "AMORDEGRC", 466, NOID, 6, 7, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "AMORLINC", "AMORLINC", 467, NOID, 6, 7, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
- { "CONVERT", "CONVERT", 468, NOID, 3, 3, V, { RR }, FUNCFLAG_EXTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
+ { "CONVERT", "CONVERT", 468, NOID, 3, 3, V, { RR }, FUNCFLAG_EXTERNAL }, // Calc: builtin and add-in (but different!)
|
|
|
f0633d |
{ "ACCRINT", "ACCRINT", 469, NOID, 6, 7, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "ACCRINTM", "ACCRINTM", 470, NOID, 4, 5, V, { RR }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "WORKDAY", "WORKDAY", 471, NOID, 2, 3, V, { RR, RR, RX, C }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
{ "NETWORKDAYS", "NETWORKDAYS", 472, NOID, 2, 3, V, { RR, RR, RX, C }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
- { "GCD", "GCD", 473, NOID, 1, MX, V, { RX }, FUNCFLAG_EXTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
+ { "GCD", "GCD", 473, NOID, 1, MX, V, { RX }, FUNCFLAG_EXTERNAL | FUNCFLAG_INTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
{ "MULTINOMIAL", "MULTINOMIAL", 474, NOID, 1, MX, V, { RX }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
- { "LCM", "LCM", 475, NOID, 1, MX, V, { RX }, FUNCFLAG_EXTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
+ { "LCM", "LCM", 475, NOID, 1, MX, V, { RX }, FUNCFLAG_EXTERNAL | FUNCFLAG_INTERNAL }, // Calc: builtin and add-in
|
|
|
f0633d |
{ "FVSCHEDULE", "FVSCHEDULE", 476, NOID, 2, 2, V, { RR, RX }, FUNCFLAG_EXTERNAL },
|
|
|
f0633d |
|
|
|
f0633d |
// *** macro sheet commands ***
|
|
|
f0633d |
@@ -999,6 +1000,7 @@ void FunctionProviderImpl::initFunc( const FunctionData& rFuncData, sal_uInt8 nM
|
|
|
f0633d |
xFuncInfo->mbParamPairs = getFlag( rFuncData.mnFlags, FUNCFLAG_PARAMPAIRS );
|
|
|
f0633d |
xFuncInfo->mbVolatile = getFlag( rFuncData.mnFlags, FUNCFLAG_VOLATILE );
|
|
|
f0633d |
xFuncInfo->mbExternal = getFlag( rFuncData.mnFlags, FUNCFLAG_EXTERNAL );
|
|
|
f0633d |
+ xFuncInfo->mbInternal = !xFuncInfo->mbExternal || getFlag( rFuncData.mnFlags, FUNCFLAG_INTERNAL );
|
|
|
f0633d |
bool bMacroCmd = getFlag( rFuncData.mnFlags, FUNCFLAG_MACROCMD );
|
|
|
f0633d |
xFuncInfo->mbMacroFunc = bMacroCmd || getFlag( rFuncData.mnFlags, FUNCFLAG_MACROFUNC );
|
|
|
f0633d |
xFuncInfo->mbVarParam = bMacroCmd || (rFuncData.mnMinParamCount != rFuncData.mnMaxParamCount) || getFlag( rFuncData.mnFlags, FUNCFLAG_ALWAYSVAR );
|
|
|
f0633d |
@@ -1349,7 +1351,10 @@ bool OpCodeProviderImpl::initFuncOpCodes( const ApiTokenMap& rIntFuncTokenMap, c
|
|
|
f0633d |
{
|
|
|
f0633d |
FunctionInfoRef xFuncInfo = *aIt;
|
|
|
f0633d |
// set API opcode from ODF function name
|
|
|
f0633d |
- bIsValid &= initFuncOpCode( *xFuncInfo, xFuncInfo->mbExternal ? rExtFuncTokenMap : rIntFuncTokenMap );
|
|
|
f0633d |
+ if (xFuncInfo->mbExternal)
|
|
|
f0633d |
+ bIsValid &= initFuncOpCode( *xFuncInfo, rExtFuncTokenMap );
|
|
|
f0633d |
+ if (xFuncInfo->mbInternal)
|
|
|
f0633d |
+ bIsValid &= initFuncOpCode( *xFuncInfo, rIntFuncTokenMap );
|
|
|
f0633d |
// insert the function info into the maps
|
|
|
f0633d |
if( (xFuncInfo->mnApiOpCode != OPCODE_NONAME) && (xFuncInfo->mnApiOpCode != OPCODE_BAD) )
|
|
|
f0633d |
{
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|