CWS-TOOLING: integrate CWS calcperf03

2009-01-27 17:45:09 +0100 er  r267014 : satisfy some stoneage compiler (tinderbox error)
2009-01-26 13:53:16 +0100 er  r266921 : corrected merge accident
2009-01-23 23:27:18 +0100 er  r266857 : #i97468# for better accuracy use ::rtl::math::atanh() in ATANH and FISHER, tanh() in FISHERINV; patch from <regina>
2009-01-23 23:08:14 +0100 er  r266854 : #i97467# added C99 atanh() substitute rtl_math_atanh() and ::rtl::math::atanh() since not all compilers have it; patch from <regina>
Plus in rtl_math_log1p() made a variable volatile to prevent compilers from being too smart.
2009-01-23 19:20:43 +0100 er  r266849 : #i95381# make PODF adapter recognize empty/missing parameter, in this case ADDRESS 3rd parameter
2009-01-23 17:34:21 +0100 er  r266841 : #i95450# support ADDRESS 3rd parameter (abs) as missing parameter
2009-01-23 15:53:23 +0100 er  r266830 : some minor beautification
2009-01-23 15:45:20 +0100 er  r266829 : small bits missed during integration of cws frmdlg
2009-01-23 02:56:38 +0100 er  r266764 : removed CVS nonsense
2009-01-23 02:50:15 +0100 er  r266763 : get rid of nasty DOS lineends
2009-01-23 01:56:09 +0100 er  r266762 : #i98318# fix crash with external references constructed via Function Wizard; also fixes crash #i98338# and WaE #i97555#
2009-01-22 15:58:41 +0100 er  r266732 : #i97547# EUROCONVERT: add SKK/EUR
2009-01-21 15:47:39 +0100 er  r266676 : CWS-TOOLING: rebase CWS calcperf03 to trunk@266428 (milestone: DEV300:m39)
2009-01-09 17:22:23 +0100 er  r266105 : #i89976# use ::std::nth_element() instead of a fully sorted array for MEDIAN, PERCENTILE, QUARTILE, LARGE, SMALL
2008-11-07 20:13:55 +0100 er  r263483 : #i95967# Broadcast: use bulk broadcast also for single cell changes as multiple identical listeners may be involved; speeds up the Zaske document to draw level with Excel
2008-11-07 20:08:37 +0100 er  r263482 : #i95967# Notify: spare a vtable access

1 files changed, 106 insertions, 113 deletions

diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index d80591c58abb..3cb3eb10f1eb 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -880,11 +880,6 @@ BOOL FormulaTokenArray::HasMatrixDoubleRefOps()
 
 // --- POF (plain old formula) rewrite of a token array ---------------------
 
-/* TODO: When both POF OOoXML and ODFF are to be supported differently, the
- * FormulaMissingContext and FormulaTokenArray::*Pof* methods should go to a convention
- * on its own.
- */
-
 #if 0
 // static function can't be compiled if not used (warning)
 //#if OSL_DEBUG_LEVEL > 0
@@ -898,65 +893,65 @@ static void DumpTokArr( FormulaTokenArray *pCode )
 }
 #endif
 
-inline bool MissingConvention::isRewriteNeeded( OpCode eOp ) const

-{

-    switch (eOp)

-    {

-        case ocGammaDist:

-        case ocPoissonDist:

-            return true;

-        case ocMissing:

-        case ocLog:

-        case ocAddress:

-            return !isODFF();   // rewrite only for PODF

-        default:

-            return false;

-    }

+inline bool MissingConvention::isRewriteNeeded( OpCode eOp ) const
+{
+    switch (eOp)
+    {
+        case ocGammaDist:
+        case ocPoissonDist:
+        case ocAddress:
+            return true;
+        case ocMissing:
+        case ocLog:
+            return !isODFF();   // rewrite only for PODF
+        default:
+            return false;
+    }
 }
 
 class FormulaMissingContext
 {
     public:
-            const FormulaToken*  mpFunc;
-            int             mnCurArg;
+            const FormulaToken* mpFunc;
+            int                 mnCurArg;
 
                     void    Clear() { mpFunc = NULL; mnCurArg = 0; }
             inline  bool    AddDefaultArg( FormulaTokenArray* pNewArr, int nArg, double f ) const;
-    static  inline  bool    IsRewriteNeeded( OpCode eOp );
                     bool    AddMissingExternal( FormulaTokenArray* pNewArr ) const;
                     bool    AddMissing( FormulaTokenArray *pNewArr, const MissingConvention & rConv  ) const;
                     void    AddMoreArgs( FormulaTokenArray *pNewArr, const MissingConvention & rConv  ) const;
 };
+
 void FormulaMissingContext::AddMoreArgs( FormulaTokenArray *pNewArr, const MissingConvention & rConv  ) const
 {
-    if ( !mpFunc )

-        return;

-

-    switch (mpFunc->GetOpCode())

-    {

-        case ocGammaDist:

-            if (mnCurArg == 2)

-            {

-                pNewArr->AddOpCode( ocSep );

-                pNewArr->AddDouble( 1.0 );      // 4th, Cumulative=TRUE()

-            }

-            break;

-        case ocPoissonDist:

-            if (mnCurArg == 1)

-            {

-                pNewArr->AddOpCode( ocSep );

-                pNewArr->AddDouble( 1.0 );      // 3rd, Cumulative=TRUE()

-            }

-            break;

-        case ocLog:

-            if ( !rConv.isODFF() && mnCurArg == 0 )

-            {

-                pNewArr->AddOpCode( ocSep );

-                pNewArr->AddDouble( 10.0 );     // 2nd, basis 10

-            }

-            break;

-        default:

-            break;

+    if ( !mpFunc )
+        return;
+
+    switch (mpFunc->GetOpCode())
+    {
+        case ocGammaDist:
+            if (mnCurArg == 2)
+            {
+                pNewArr->AddOpCode( ocSep );
+                pNewArr->AddDouble( 1.0 );      // 4th, Cumulative=TRUE()
+            }
+            break;
+        case ocPoissonDist:
+            if (mnCurArg == 1)
+            {
+                pNewArr->AddOpCode( ocSep );
+                pNewArr->AddDouble( 1.0 );      // 3rd, Cumulative=TRUE()
+            }
+            break;
+        case ocLog:
+            if ( !rConv.isODFF() && mnCurArg == 0 )
+            {
+                pNewArr->AddOpCode( ocSep );
+                pNewArr->AddDouble( 10.0 );     // 2nd, basis 10
+            }
+            break;
+        default:
+            break;
     }
 }
 
@@ -970,21 +965,10 @@ inline bool FormulaMissingContext::AddDefaultArg( FormulaTokenArray* pNewArr, in
     return false;
 }
 
-inline bool FormulaMissingContext::IsRewriteNeeded( OpCode eOp )
-{
-    switch (eOp)
-    {
-        case ocMissing:
-        case ocLog:
-        case ocAddress:
-            return true;
-        default:
-            return false;
-    }
-}
-
 bool FormulaMissingContext::AddMissingExternal( FormulaTokenArray *pNewArr ) const
 {
+    // Only called for PODF, not ODFF. No need to distinguish.
+
     const String &rName = mpFunc->GetExternal();
 
     // initial (fast) check:
@@ -1007,54 +991,63 @@ bool FormulaMissingContext::AddMissingExternal( FormulaTokenArray *pNewArr ) con
 
 bool FormulaMissingContext::AddMissing( FormulaTokenArray *pNewArr, const MissingConvention & rConv  ) const
 {
-    if ( !mpFunc )

-        return false;

-

-    bool bRet = false;

-    if (rConv.isODFF())

-    {

-    }

-    else

-    {

-        switch ( mpFunc->GetOpCode() )

-        {

-            case ocFixed:

-                return AddDefaultArg( pNewArr, 1, 2.0 );

-                //break;

-            case ocBetaDist:

-            case ocBetaInv:

-            case ocRMZ:  // PMT

-                return AddDefaultArg( pNewArr, 3, 0.0 );

-                //break;

-            case ocZinsZ: // IPMT

-            case ocKapz:  // PPMT

-                return AddDefaultArg( pNewArr, 4, 0.0 );

-                //break;

-            case ocBW: // PV

-            case ocZW: // FV

-                bRet |= AddDefaultArg( pNewArr, 2, 0.0 ); // pmt

-                bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // [fp]v

-                break;

-            case ocZins: // RATE

-                bRet |= AddDefaultArg( pNewArr, 1, 0.0 ); // pmt

-                bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // fv

-                bRet |= AddDefaultArg( pNewArr, 4, 0.0 ); // type

-                break;

-            case ocExternal:

-                return AddMissingExternal( pNewArr );

-                //break;

-

-                // --- more complex cases ---

-

-            case ocOffset:

-                // FIXME: rather tough.

-                // if arg 3 (height) ommitted, export arg1 (rows)

-                break;

-            default:

-                break;

-        }

-    }

-

+    if ( !mpFunc )
+        return false;
+
+    bool bRet = false;
+    const OpCode eOp = mpFunc->GetOpCode();
+
+    // Add for both, PODF and ODFF
+    switch (eOp)
+    {
+        case ocAddress:
+            return AddDefaultArg( pNewArr, 2, 1.0 );    // abs
+        default:
+            break;
+    }
+
+    if (rConv.isODFF())
+    {
+        // Add for ODFF
+    }
+    else
+    {
+        // Add for PODF
+        switch (eOp)
+        {
+            case ocFixed:
+                return AddDefaultArg( pNewArr, 1, 2.0 );
+            case ocBetaDist:
+            case ocBetaInv:
+            case ocRMZ:     // PMT
+                return AddDefaultArg( pNewArr, 3, 0.0 );
+            case ocZinsZ:   // IPMT
+            case ocKapz:    // PPMT
+                return AddDefaultArg( pNewArr, 4, 0.0 );
+            case ocBW:      // PV
+            case ocZW:      // FV
+                bRet |= AddDefaultArg( pNewArr, 2, 0.0 );   // pmt
+                bRet |= AddDefaultArg( pNewArr, 3, 0.0 );   // [fp]v
+                break;
+            case ocZins:    // RATE
+                bRet |= AddDefaultArg( pNewArr, 1, 0.0 );   // pmt
+                bRet |= AddDefaultArg( pNewArr, 3, 0.0 );   // fv
+                bRet |= AddDefaultArg( pNewArr, 4, 0.0 );   // type
+                break;
+            case ocExternal:
+                return AddMissingExternal( pNewArr );
+
+                // --- more complex cases ---
+
+            case ocOffset:
+                // FIXME: rather tough.
+                // if arg 3 (height) ommitted, export arg1 (rows)
+                break;
+            default:
+                break;
+        }
+    }
+
     return bRet;
 }
 
@@ -1113,8 +1106,8 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissingToPof( const MissingConvent
                 ++nFn;      // all following operations on _that_ function
                 pCtx[ nFn ].mpFunc = PeekPrevNoSpaces();
                 pCtx[ nFn ].mnCurArg = 0;
-                if (pCtx[ nFn ].mpFunc && pCtx[ nFn ].mpFunc->GetOpCode() == ocAddress)
-                    pOcas[ nOcas++ ] = nFn;     // entering ADDRESS()
+                if (pCtx[ nFn ].mpFunc && pCtx[ nFn ].mpFunc->GetOpCode() == ocAddress && !rConv.isODFF())
+                    pOcas[ nOcas++ ] = nFn;     // entering ADDRESS() if PODF
                 break;
             case ocClose:
                 pCtx[ nFn ].AddMoreArgs( pNewArr, rConv );