diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2014-11-28 11:52:42 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-12-09 16:28:47 +0000 |
| commit | 09e171656a85712d37338e653374ee15aef91591 (patch) | |
| tree | 63b2aa3e07fc0cc8ae39feca47b4ec818ea4a6ab /formula | |
| parent | 777a5cfb7cd7c4e9193285701160f2a6d9617041 (diff) | |
fdo#40835 add 4th argument to FDIST when exporting to OOXML
In ODF1.2, the 4th argument (cumulative) is optional (default true)
In Excel, the 4th argument is mandatory
Change-Id: I0d38b73af541d52f3750ba61c0864202504ca8b1
Reviewed-on: https://gerrit.libreoffice.org/13172
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/token.cxx | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index a414a4b12cb9..fe7b11372c2c 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -1016,33 +1016,11 @@ inline bool MissingConventionODF::isRewriteNeeded( OpCode eOp ) const } /* - * fdo 81596 -Test status ( . : in progress , v : tested , - not applicable ) -finished: -- ocCosecant: // for OOXML not rewritten anymore -- ocSecant: // for OOXML not rewritten anymore -- ocCot: // for OOXML not rewritten anymore -- ocCosecantHyp: // for OOXML not rewritten anymore -- ocSecantHyp: // for OOXML not rewritten anymore -- ocCotHyp: // for OOXML not rewritten anymore -- ocArcCot: // for OOXML not rewritten anymore -- ocArcCotHyp: // ACOTH(x), not needed for Excel2013 and later -- ocChose: // CHOOSE() - no rewrite needed, it seems -v ocEuroConvert: -v ocIf: -v ocRound: -v ocRoundUp: -v ocRoundDown: -v ocGammaDist: -v ocPoissonDist: -v ocNormDist: -v ocLogNormDist: - + fdo 81596 To be implemented yet: ocExternal: ? ocMacro: ? ocIndex: INDEX() ? - ocFDist: // later, fdo40835 */ inline bool MissingConventionOOXML::isRewriteNeeded( OpCode eOp ) const { @@ -1064,6 +1042,7 @@ inline bool MissingConventionOOXML::isRewriteNeeded( OpCode eOp ) const case ocPoissonDist: case ocNormDist: case ocLogNormDist: + case ocFDist: return true; default: return false; @@ -1173,6 +1152,7 @@ void FormulaMissingContext::AddMoreArgs( FormulaTokenArray *pNewArr, const Missi case ocGammaDist: case ocNormDist: + case ocFDist: if (mnCurArg == 2) { pNewArr->AddOpCode( ocSep ); |