CWS-TOOLING: integrate CWS calc66

2 files changed, 23 insertions, 0 deletions

diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx
index 30618c67381a..8a94b1005bc8 100644
--- a/formula/inc/formula/token.hxx
+++ b/formula/inc/formula/token.hxx
@@ -70,6 +70,7 @@ enum StackVarEnum
     svExternalSingleRef,
     svExternalDoubleRef,
     svExternalName,
+    svSubroutine,                       // A token with a subroutine token array.
     svError,                            // error token
     svMissing = 0x70,                   // 0 or ""
     svSep,                              // separator, ocSep, ocOpen, ocClose
@@ -89,6 +90,7 @@ class FormulaToken;
 typedef SimpleIntrusiveReference< class FormulaToken > FormulaTokenRef;
 typedef SimpleIntrusiveReference< const class FormulaToken > FormulaConstTokenRef;
 
+class FormulaTokenArray;
 
 class FORMULA_DLLPUBLIC FormulaToken : public IFormulaToken
 {
@@ -364,6 +366,23 @@ public:
 };
 
 
+class FORMULA_DLLPUBLIC FormulaSubroutineToken : public FormulaToken
+{
+public:
+    /** Takes ownership of pArray and deletes it upon destruction! */
+                                FormulaSubroutineToken( const FormulaTokenArray* pArray ) :
+                                    FormulaToken( svSubroutine, ocCall ), mpArray( pArray) {}
+                                FormulaSubroutineToken( const FormulaSubroutineToken& r );
+    virtual                     ~FormulaSubroutineToken();
+    virtual FormulaToken*       Clone() const { return new FormulaSubroutineToken(*this); }
+    virtual sal_Bool            operator==( const FormulaToken& rToken ) const;
+    const FormulaTokenArray*    GetTokenArray() const;
+
+private:
+    const FormulaTokenArray*    mpArray;
+};
+
+
 class FORMULA_DLLPUBLIC FormulaUnknownToken : public FormulaToken
 {
 public:
diff --git a/formula/inc/formula/tokenarray.hxx b/formula/inc/formula/tokenarray.hxx
index 31d780c81a79..bcd4061f5ac6 100644
--- a/formula/inc/formula/tokenarray.hxx
+++ b/formula/inc/formula/tokenarray.hxx
@@ -256,6 +256,7 @@ public:
     void    Reset();
     const   FormulaToken* First();
     const   FormulaToken* Next();
+    const   FormulaToken* PeekNextOperator();
     bool    IsEndOfPath() const;    /// if a jump or subroutine path is done
     bool    HasStacked() const { return pCur->pNext != 0; }
     short   GetPC() const { return pCur->nPC; }
@@ -276,6 +277,9 @@ public:
     void Jump( short nStart, short nNext, short nStop = SHRT_MAX );
     void Push( const FormulaTokenArray* );
     void Pop();
+
+private:
+    const FormulaToken* GetNonEndOfPathToken( short nIdx ) const;
 };
 // =============================================================================
 } // formula