[Libreoffice-commits] core.git: formula/source

[Winfried Donkers]

 formula/source/core/api/token.cxx |   26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

New commits:
commit 09e171656a85712d37338e653374ee15aef91591
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date:   Fri Nov 28 11:52:42 2014 +0100

    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 at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index a414a4b..fe7b113 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 );