diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2018-05-10 13:44:35 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2018-05-14 17:32:48 +0200 |
| commit | a9a0601e2af539ab8feed76279181339393ae633 (patch) | |
| tree | a6f9e9d44ea912858fb669ad344491e28c455b50 /sc/inc/formulacell.hxx | |
| parent | 6154d04d90b7b4f68e6c3629bf0c6306ef64a937 (diff) | |
use optional ScInterpreterContext if possible
Avoids assertion with threaded cell computations for tdf#100811/2.
Change-Id: I2dc0fd80595ccec1824c8675fc97cfc763b88659
Reviewed-on: https://gerrit.libreoffice.org/54080
Reviewed-by: Dennis Francis <dennis.francis@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'sc/inc/formulacell.hxx')
| -rw-r--r-- | sc/inc/formulacell.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 376b0d0fbf5a..458dc2e10b7c 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -202,11 +202,13 @@ public: ScFormulaVectorState GetVectorState() const; void GetFormula( OUString& rFormula, - const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; + const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT, + const ScInterpreterContext* pContext = nullptr ) const; void GetFormula( OUStringBuffer& rBuffer, - const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT ) const; + const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT, + const ScInterpreterContext* pContext = nullptr ) const; - OUString GetFormula( sc::CompileFormulaContext& rCxt ) const; + OUString GetFormula( sc::CompileFormulaContext& rCxt, const ScInterpreterContext* pContext = nullptr ) const; void SetDirty( bool bDirtyFlag=true ); void SetDirtyVar(); |