diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-07-02 00:06:22 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-07-02 00:16:44 -0400 |
| commit | 07010b8ea2465406df8eea9341c8644a6f7fed81 (patch) | |
| tree | 62f752aea5131bd4e8a48d934bf616a5ec5abe90 /sc/inc/token.hxx | |
| parent | 93a5b7ee36818d60963e4fbe21f9e6c43c7c5a80 (diff) | |
Put the matrix header back in for Windows build...
Change-Id: I676b3d9b702af51bf00dff9ef55d16e7fbdec65e
Diffstat (limited to 'sc/inc/token.hxx')
| -rw-r--r-- | sc/inc/token.hxx | 13 |
1 files changed, 5 insertions, 8 deletions
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 |