Kaydet (Commit) 6267b56f authored tarafından Jochen Nitschke's avatar Jochen Nitschke Kaydeden (comit) Stephan Bergmann

move implementation of ScMatrixCellResultToken copy-constructor

from header to source file.

Revert "no matching function for call to 'intrusive_ptr_add_ref'"

This reverts commit a49be6bd.

Also reverts small part of
commit fd3fc84e

Change-Id: I5b48cf7e9f830ec411202c5364d0caac76449095
Reviewed-on: https://gerrit.libreoffice.org/47680Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 8eb014b4
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "refdata.hxx" #include "refdata.hxx"
#include <tools/mempool.hxx> #include <tools/mempool.hxx>
#include "scdllapi.h" #include "scdllapi.h"
#include "scmatrix.hxx"
#include <formula/IFunctionDescription.hxx> #include <formula/IFunctionDescription.hxx>
#include <formula/token.hxx> #include <formula/token.hxx>
#include "calcmacros.hxx" #include "calcmacros.hxx"
...@@ -44,6 +43,7 @@ struct RangeMatrix; ...@@ -44,6 +43,7 @@ struct RangeMatrix;
} }
class ScJumpMatrix; class ScJumpMatrix;
class ScMatrix;
typedef ::std::vector< ScComplexRefData > ScRefList; typedef ::std::vector< ScComplexRefData > ScRefList;
...@@ -299,6 +299,7 @@ protected: ...@@ -299,6 +299,7 @@ protected:
formula::FormulaConstTokenRef xUpperLeft; formula::FormulaConstTokenRef xUpperLeft;
public: public:
ScMatrixCellResultToken( const ScConstMatrixRef& pMat, const formula::FormulaToken* pUL ); ScMatrixCellResultToken( const ScConstMatrixRef& pMat, const formula::FormulaToken* pUL );
ScMatrixCellResultToken( const ScMatrixCellResultToken& );
virtual ~ScMatrixCellResultToken() override; virtual ~ScMatrixCellResultToken() override;
virtual double GetDouble() const override; virtual double GetDouble() const override;
virtual svl::SharedString GetString() const override; virtual svl::SharedString GetString() const override;
......
...@@ -1010,6 +1010,8 @@ bool ScEmptyCellToken::operator==( const FormulaToken& r ) const ...@@ -1010,6 +1010,8 @@ bool ScEmptyCellToken::operator==( const FormulaToken& r ) const
ScMatrixCellResultToken::ScMatrixCellResultToken( const ScConstMatrixRef& pMat, const formula::FormulaToken* pUL ) : ScMatrixCellResultToken::ScMatrixCellResultToken( const ScConstMatrixRef& pMat, const formula::FormulaToken* pUL ) :
FormulaToken(formula::svMatrixCell), xMatrix(pMat), xUpperLeft(pUL) {} FormulaToken(formula::svMatrixCell), xMatrix(pMat), xUpperLeft(pUL) {}
ScMatrixCellResultToken::ScMatrixCellResultToken( const ScMatrixCellResultToken& ) = default;
double ScMatrixCellResultToken::GetDouble() const { return xUpperLeft->GetDouble(); } double ScMatrixCellResultToken::GetDouble() const { return xUpperLeft->GetDouble(); }
ScMatrixCellResultToken::~ScMatrixCellResultToken() {} ScMatrixCellResultToken::~ScMatrixCellResultToken() {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment