diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-11-11 12:31:58 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2013-11-20 18:23:04 +0000 |
| commit | feca57d41d515959e3f730eb372a3d33bb251a03 (patch) | |
| tree | ad276b0e8582704189fd7c9840223d150e7f4cca | |
| parent | e064677047d924074d327081eeb8c15f76d62e48 (diff) | |
Use the more generic CompiledFormula type
Change-Id: I91d2e956b76919c56d14712789198c3c10470742
| -rw-r--r-- | sc/inc/formulacell.hxx | 9 | ||||
| -rw-r--r-- | sc/source/core/data/formulacell.cxx | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index a6200c9ca0e8..4e56b6ab795d 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -33,6 +33,7 @@ namespace sc { class CLBuildKernelThread; +class CompiledFormula; class StartListeningContext; class EndListeningContext; struct RefUpdateContext; @@ -40,12 +41,6 @@ struct RefUpdateInsertTabContext; struct RefUpdateDeleteTabContext; struct RefUpdateMoveTabContext; -namespace opencl { - -class DynamicKernel; - -} - } class ScFormulaCell; @@ -58,7 +53,7 @@ struct SC_DLLPUBLIC ScFormulaCellGroup : boost::noncopyable mutable size_t mnRefCount; ScTokenArray* mpCode; - sc::opencl::DynamicKernel* mpDynamicKernel; + sc::CompiledFormula* mpCompiledFormula; ScFormulaCell *mpTopCell; SCROW mnLength; // How many of these do we have ? short mnFormatType; diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 3ab19a666476..e0ee5a75f710 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -406,7 +406,7 @@ rtl::Reference<sc::CLBuildKernelThread> ScFormulaCellGroup::mxCLKernelThread; ScFormulaCellGroup::ScFormulaCellGroup() : mnRefCount(0), mpCode(NULL), - mpDynamicKernel(NULL), + mpCompiledFormula(NULL), mpTopCell(NULL), mnLength(0), mnFormatType(NUMBERFORMAT_NUMBER), |