#i10000#: fix merge conflicts (CWS frmdlg)

7 files changed, 22 insertions, 23 deletions

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 4c9abc4df4a7..7b128b4b1abd 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -319,7 +319,7 @@ public:
     inline void GetVars( SCCOL& nColP, SCROW& nRowP, SCTAB& nTabP ) const
     { nColP = nCol; nRowP = nRow; nTabP = nTab; }
 
-    USC_DLLPUBLIC USHORT Parse( const String&, ScDocument* = NULL,
+    SC_DLLPUBLIC USHORT Parse( const String&, ScDocument* = NULL,
                   const Details& rDetails = detailsOOOa1,
                   ExternalInfo* pExtInfo = NULL,
                   const ::com::sun::star::uno::Sequence<
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index a34933557c02..efad8fb749ef 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -379,8 +379,8 @@ private:
             The previous grammar that was active before SetFormulaLanguage().
      */
     void            SetGrammarAndRefConvention(
-                        const ScGrammar::Grammar eNewGrammar,
-                        const ScGrammar::Grammar eOldGrammar );
+                        const formula::FormulaGrammar::Grammar eNewGrammar,
+                        const formula::FormulaGrammar::Grammar eOldGrammar );
 public:
 
     /// Set external link info for ScAddress::CONV_XL_OOX.
@@ -465,7 +465,7 @@ private:
     virtual BOOL HandleDbData();
 
     virtual formula::FormulaTokenRef ExtendRangeReference( formula::FormulaToken & rTok1, formula::FormulaToken & rTok2, bool bReuseDoubleRef );
-    virtual void CreateStringFromExternal(rtl::OUStringBuffer& rBuffer, FormulaToken* pTokenP)
+    virtual void CreateStringFromExternal(rtl::OUStringBuffer& rBuffer, formula::FormulaToken* pTokenP);
     virtual void CreateStringFromSingleRef(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP);
     virtual void CreateStringFromDoubleRef(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP);
     virtual void CreateStringFromMatrix( rtl::OUStringBuffer& rBuffer, formula::FormulaToken* _pTokenP);
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 859a916e07e2..664c0afebda5 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -45,8 +45,13 @@
 #include <boost/shared_ptr.hpp>
 #include <vector>
 #include <list>
+#include <formula/ExternalReferenceHelper.hxx>
 
 class ScDocument;
+namespace formula
+{
+    class FormulaToken;
+}
 class ScToken;
 class ScMatrix;
 class ScTokenArray;
@@ -88,8 +93,8 @@ private:
 class ScExternalRefCache
 {
 public:
-    typedef ::boost::shared_ptr<ScToken>            TokenRef;
-    typedef ::boost::shared_ptr<ScTokenArray>       TokenArrayRef;
+    typedef ::boost::shared_ptr< formula::FormulaToken>     TokenRef;
+    typedef ::boost::shared_ptr<ScTokenArray>               TokenArrayRef;
 
     struct TableName
     {
@@ -252,7 +257,7 @@ private:
 
 // ============================================================================
 
-class ScExternalRefManager
+class ScExternalRefManager : public formula::ExternalReferenceHelper
 {
 public:
 
@@ -337,7 +342,7 @@ public:
     explicit ScExternalRefManager(ScDocument* pDoc);
     ~ScExternalRefManager();
 
-    String getCacheTableName(sal_uInt16 nFileId, size_t nTabIndex) const;
+    virtual String getCacheTableName(sal_uInt16 nFileId, size_t nTabIndex) const;
 
     /**
      * Get a cache table instance for specified table and table index.  Unlike
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 6413c8a77992..f9fdba19ade2 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -194,7 +194,7 @@ public:
     virtual const String&           GetString() const;
     virtual const ScSingleRefData&  GetSingleRef() const;
     virtual ScSingleRefData&          GetSingleRef();
-    virtual BOOL                    operator==( const ScToken& rToken ) const;
+    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
 };
 
 
@@ -219,7 +219,7 @@ public:
     virtual ScSingleRefData&       GetSingleRef2();
     virtual const ScComplexRefData&    GetDoubleRef() const;
     virtual ScComplexRefData&      GetDoubleRef();
-    virtual BOOL                   operator==( const ScToken& rToken ) const;
+    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
 };
 
 
@@ -236,7 +236,7 @@ public:
     virtual                     ~ScExternalNameToken();
     virtual USHORT              GetIndex() const;
     virtual const String&       GetString() const;
-    virtual BOOL                operator==( const ScToken& rToken ) const;
+    virtual BOOL                operator==( const formula::FormulaToken& rToken ) const;
 };
 
 
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 8c15f07c6c1b..59602b2f549d 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -41,17 +41,7 @@ struct ScSingleRefData;
 struct ScComplexRefData;
 class ScMatrix;
 
-class ScTokenArray : public formula::FormulaTokenArray
-{
-    bool    mbODFF;     /// TRUE: ODFF, FALSE: PODF
-public:
-        explicit    ScMissingConvention( bool bODFF ) : mbODFF(bODFF) {}
-    // Implementation and usage only in token.cxx
-    inline  bool    isRewriteNeeded( OpCode eOp ) const;
-    inline  bool    isODFF() const { return mbODFF; }
-};
-
-class SC_DLLPUBLIC ScTokenArray
+class SC_DLLPUBLIC ScTokenArray : public formula::FormulaTokenArray
 {
     friend class ScCompiler;
     BOOL                    ImplGetReference( ScRange& rRange, BOOL bValidOnly ) const;
@@ -76,7 +66,7 @@ public:
                                 const ScAddress& rPos, ScDirection );
 
     formula::FormulaToken* AddRawToken( const ScRawToken& );
-    virtual bool AddFormulaToken(const com::sun::star::sheet::FormulaToken& _aToken);
+    virtual bool AddFormulaToken(const com::sun::star::sheet::FormulaToken& _aToken,formula::ExternalReferenceHelper* _pRef);
     virtual formula::FormulaToken* AddOpCode( OpCode eCode );
     /** ScSingleRefToken with ocPush. */
     formula::FormulaToken* AddSingleReference( const ScSingleRefData& rRef );
diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index ee12febd5659..abb9d1d06a22 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -52,9 +52,11 @@ class ScTokenConversion
 {
 public:
     static bool ConvertToTokenArray(
+                        ScDocument& rDoc,
                         ScTokenArray& rTokenArray,
                         const com::sun::star::uno::Sequence< com::sun::star::sheet::FormulaToken >& rSequence );
     static bool ConvertToTokenSequence(
+                        ScDocument& rDoc,
                         com::sun::star::uno::Sequence< com::sun::star::sheet::FormulaToken >& rSequence,
                         const ScTokenArray& rTokenArray );
 };
@@ -68,6 +70,7 @@ class ScFormulaParserObj : public ::cppu::WeakImplHelper3<
 {
 private:
     ::com::sun::star::uno::Sequence< const ::com::sun::star::sheet::FormulaOpCodeMapEntry > maOpCodeMapping;
+    ::com::sun::star::uno::Sequence< const ::com::sun::star::sheet::ExternalLinkInfo > maExternalLinks;
     ScCompiler::OpCodeMapPtr    mxOpCodeMap;
     ScDocShell*         mpDocShell;
     ScAddress           maRefPos;
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 78f25b0b39dd..471dd5bca193 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -605,6 +605,7 @@
 #define SC_UNO_IGNORELEADING        "IgnoreLeadingSpaces"
 #define SC_UNO_OPCODEMAP            "OpCodeMap"
 #define SC_UNO_EXTERNALLINKS        "ExternalLinks"
+#define SC_UNO_COMPILEFAP           "CompileFAP"
 
 // Chart2
 #define SC_UNONAME_ISHIDDEN         "IsHidden"