diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2018-01-10 22:11:08 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-12 08:49:16 +0100 |
| commit | 6267b56f2dfcbcf5a6b30698e3ead68ce1b724e7 (patch) | |
| tree | 43be9fbb4e2dc4dd9f19d9866df378a5cf321cf5 /sc | |
| parent | 8eb014b45961376b3c9a01eb2b24b9620c00f777 (diff) | |
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 a49be6bd585ac4610cbf04ca3525f2d90a770367.
Also reverts small part of
commit fd3fc84e590fc84f62ce3bace668fe40a25f54b5
Change-Id: I5b48cf7e9f830ec411202c5364d0caac76449095
Reviewed-on: https://gerrit.libreoffice.org/47680
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/token.hxx | 3 | ||||
| -rw-r--r-- | sc/source/core/tool/token.cxx | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index 065fb2affccd..5658dd0889ce 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -28,7 +28,6 @@ #include "refdata.hxx" #include <tools/mempool.hxx> #include "scdllapi.h" -#include "scmatrix.hxx" #include <formula/IFunctionDescription.hxx> #include <formula/token.hxx> #include "calcmacros.hxx" @@ -44,6 +43,7 @@ struct RangeMatrix; } class ScJumpMatrix; +class ScMatrix; typedef ::std::vector< ScComplexRefData > ScRefList; @@ -299,6 +299,7 @@ protected: formula::FormulaConstTokenRef xUpperLeft; public: ScMatrixCellResultToken( const ScConstMatrixRef& pMat, const formula::FormulaToken* pUL ); + ScMatrixCellResultToken( const ScMatrixCellResultToken& ); virtual ~ScMatrixCellResultToken() override; virtual double GetDouble() const override; virtual svl::SharedString GetString() const override; diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 9921df0517f2..6028ac2e1ab0 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1010,6 +1010,8 @@ bool ScEmptyCellToken::operator==( const FormulaToken& r ) const ScMatrixCellResultToken::ScMatrixCellResultToken( const ScConstMatrixRef& pMat, const formula::FormulaToken* pUL ) : FormulaToken(formula::svMatrixCell), xMatrix(pMat), xUpperLeft(pUL) {} +ScMatrixCellResultToken::ScMatrixCellResultToken( const ScMatrixCellResultToken& ) = default; + double ScMatrixCellResultToken::GetDouble() const { return xUpperLeft->GetDouble(); } ScMatrixCellResultToken::~ScMatrixCellResultToken() {} |