diff options
| author | Eike Rathke <erack@redhat.com> | 2016-03-14 15:43:50 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-03-14 15:45:53 +0100 |
| commit | 0aa29f32f9c39f598f43cdf3664b89d6cb151b17 (patch) | |
| tree | cbf7be14d7275c525c483dd27722efd870329e06 | |
| parent | 4cbb7cdf1be8219c34eb38e6a0d59aa8418c8a85 (diff) | |
prefix domain namespace to FORECAST.* functions for ODFF, tdf#94635 follow-up
Change-Id: If875b538f2143eb572371dfcc086145c2f6e80f5
| -rw-r--r-- | formula/source/core/resource/core_resource.src | 16 | ||||
| -rw-r--r-- | sc/source/filter/oox/formulabase.cxx | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index 1d6c15d0458a..0fb5a635d7d1 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -368,14 +368,14 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_LINEST { Text = "LINEST" ; }; String SC_OPCODE_LOGEST { Text = "LOGEST" ; }; String SC_OPCODE_FORECAST { Text = "FORECAST" ; }; - String SC_OPCODE_FORECAST_ETS_ADD { Text = "FORECAST.ETS" ; }; - String SC_OPCODE_FORECAST_ETS_SEA { Text = "FORECAST.ETS.SEASONALITY" ; }; - String SC_OPCODE_FORECAST_ETS_MUL { Text = "FORECAST.ETS.MULT" ; }; - String SC_OPCODE_FORECAST_ETS_PIA { Text = "FORECAST.ETS.CONFINT" ; }; - String SC_OPCODE_FORECAST_ETS_PIM { Text = "FORECAST.ETS.PI.MULT" ; }; - String SC_OPCODE_FORECAST_ETS_STA { Text = "FORECAST.ETS.STAT" ; }; - String SC_OPCODE_FORECAST_ETS_STM { Text = "FORECAST.ETS.STAT.MULT" ; }; - String SC_OPCODE_FORECAST_LIN { Text = "FORECAST.LINEAR" ; }; + String SC_OPCODE_FORECAST_ETS_ADD { Text = "COM.MICROSOFT.FORECAST.ETS" ; }; + String SC_OPCODE_FORECAST_ETS_SEA { Text = "COM.MICROSOFT.FORECAST.ETS.SEASONALITY" ; }; + String SC_OPCODE_FORECAST_ETS_MUL { Text = "ORG.LIBREOFFICE.FORECAST.ETS.MULT" ; }; + String SC_OPCODE_FORECAST_ETS_PIA { Text = "COM.MICROSOFT.FORECAST.ETS.CONFINT" ; }; + String SC_OPCODE_FORECAST_ETS_PIM { Text = "ORG.LIBREOFFICE.FORECAST.ETS.PI.MULT" ; }; + String SC_OPCODE_FORECAST_ETS_STA { Text = "COM.MICROSOFT.FORECAST.ETS.STAT" ; }; + String SC_OPCODE_FORECAST_ETS_STM { Text = "ORG.LIBREOFFICE.FORECAST.ETS.STAT.MULT" ; }; + String SC_OPCODE_FORECAST_LIN { Text = "COM.MICROSOFT.FORECAST.LINEAR" ; }; String SC_OPCODE_CHI_INV { Text = "LEGACY.CHIINV" ; }; String SC_OPCODE_CHI_INV_MS { Text = "COM.MICROSOFT.CHISQ.INV.RT" ; }; String SC_OPCODE_GAMMA_DIST { Text = "GAMMADIST" ; }; diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 41190f00ae81..2e1a4a9d5472 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -904,11 +904,11 @@ static const FunctionData saFuncTable2013[] = /* FIXME: BIFF12 function identifiers available? Where to obtain? */ static const FunctionData saFuncTable2016[] = { - { "FORECAST.ETS", "FORECAST.ETS", NOID, NOID, 3, 6, V, { VR, VA, VR }, FUNCFLAG_MACROCALL_NEW }, - { "FORECAST.ETS.CONFINT", "FORECAST.ETS.CONFINT", NOID, NOID, 4, 7, V, { VR, VA, VR }, FUNCFLAG_MACROCALL_NEW }, - { "FORECAST.ETS.SEASONALITY", "FORECAST.ETS.SEASONALITY", NOID, NOID, 2, 4, V, { VR, VA, VR }, FUNCFLAG_MACROCALL_NEW }, - { "FORECAST.ETS.STAT", "FORECAST.ETS.STAT", NOID, NOID, 3, 6, V, { VR, VA, VR }, FUNCFLAG_MACROCALL_NEW }, - { "FORECAST.LINEAR", "FORECAST.LINEAR", NOID, NOID, 3, 3, V, { VR, VA }, FUNCFLAG_MACROCALL_NEW } + { "COM.MICROSOFT.FORECAST.ETS", "FORECAST.ETS", NOID, NOID, 3, 6, V, { VR, VA, VR }, FUNCFLAG_MACROCALL_NEW }, + { "COM.MICROSOFT.FORECAST.ETS.CONFINT", "FORECAST.ETS.CONFINT", NOID, NOID, 4, 7, V, { VR, VA, VR }, FUNCFLAG_MACROCALL_NEW }, + { "COM.MICROSOFT.FORECAST.ETS.SEASONALITY", "FORECAST.ETS.SEASONALITY", NOID, NOID, 2, 4, V, { VR, VA, VR }, FUNCFLAG_MACROCALL_NEW }, + { "COM.MICROSOFT.FORECAST.ETS.STAT", "FORECAST.ETS.STAT", NOID, NOID, 3, 6, V, { VR, VA, VR }, FUNCFLAG_MACROCALL_NEW }, + { "COM.MICROSOFT.FORECAST.LINEAR", "FORECAST.LINEAR", NOID, NOID, 3, 3, V, { VR, VA }, FUNCFLAG_MACROCALL_NEW } }; |