Put the matrix header back in for Windows build...

Change-Id: I676b3d9b702af51bf00dff9ef55d16e7fbdec65e

4 files changed, 22 insertions, 13 deletions

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 1f9b96073f89..a63025caf1f2 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -259,10 +259,7 @@ public:
                                     const formula::FormulaGrammar::Grammar eGrammar )
                         { aResult.SetHybridFormula( r); eTempGrammar = eGrammar; }
 
-    void SetResultMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef& pMat, formula::FormulaToken* pUL )
-    {
-        aResult.SetMatrix(nCols, nRows, pMat, pUL);
-    }
+    void SetResultMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef& pMat, formula::FormulaToken* pUL );
 
     /** For import only: set a double result.
         Use this instead of SetHybridDouble() if there is no (temporary)
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 116022a6a9a9..08393264dd22 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -30,7 +30,7 @@
 #include "scdllapi.h"
 #include "formula/IFunctionDescription.hxx"
 #include "formula/token.hxx"
-#include "types.hxx"
+#include "scmatrix.hxx"
 
 class ScJumpMatrix;
 
@@ -318,7 +318,7 @@ public:
     virtual const String &      GetString() const;
     virtual const ScMatrix*     GetMatrix() const;
     virtual bool                operator==( const formula::FormulaToken& rToken ) const;
-    virtual FormulaToken*       Clone() const { return new ScMatrixCellResultToken(*this); }
+    virtual FormulaToken*       Clone() const;
     formula::StackVar           GetUpperLeftType() const
                                     {
                                         return xUpperLeft ?
@@ -357,12 +357,9 @@ public:
             SCCOL               GetMatCols() const  { return nCols; }
             SCROW               GetMatRows() const  { return nRows; }
 
-                                /** Assign matrix result, keep matrix formula
-                                    dimension. */
-            void                Assign( const ScMatrixCellResultToken & r )
-                                    {
-                                        ScMatrixCellResultToken::Assign( r);
-                                    }
+    /** Assign matrix result, keep matrix formula
+        dimension. */
+    void Assign( const ScMatrixCellResultToken & r );
 
                                 /** Assign any result, keep matrix formula
                                     dimension. If token is of type
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index f2d72daf8e19..1e86cfc2d43e 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1591,6 +1591,11 @@ void ScFormulaCell::SetResultToken( const formula::FormulaToken* pToken )
     aResult.SetToken(pToken);
 }
 
+void ScFormulaCell::SetResultMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef& pMat, formula::FormulaToken* pUL )
+{
+    aResult.SetMatrix(nCols, nRows, pMat, pUL);
+}
+
 void ScFormulaCell::SetErrCode( sal_uInt16 n )
 {
     /* FIXME: check the numerous places where ScTokenArray::GetCodeError() is
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 55c051df9644..e25ef603cbe3 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -37,7 +37,6 @@
 #include "rangeseq.hxx"
 #include "externalrefmgr.hxx"
 #include "document.hxx"
-#include "scmatrix.hxx"
 
 using ::std::vector;
 
@@ -1060,6 +1059,11 @@ bool ScMatrixCellResultToken::operator==( const FormulaToken& r ) const
         xMatrix == static_cast<const ScMatrixCellResultToken &>(r).xMatrix;
 }
 
+FormulaToken* ScMatrixCellResultToken::Clone() const
+{
+    return new ScMatrixCellResultToken(*this);
+}
+
 void ScMatrixCellResultToken::Assign( const ScMatrixCellResultToken & r )
 {
     xMatrix = r.xMatrix;
@@ -1088,6 +1092,12 @@ bool ScMatrixFormulaCellToken::operator==( const FormulaToken& r ) const
     return p && ScMatrixCellResultToken::operator==( r ) &&
         nCols == p->nCols && nRows == p->nRows;
 }
+
+void ScMatrixFormulaCellToken::Assign( const ScMatrixCellResultToken & r )
+{
+    ScMatrixCellResultToken::Assign( r);
+}
+
 void ScMatrixFormulaCellToken::Assign( const formula::FormulaToken& r )
 {
     if (this == &r)