From 4d37e0d5dd22343a3b7942649f460db544ae536c Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Tue, 26 Jun 2018 17:07:45 +0200 Subject: use optional ScInterpreterContext in ScColumn::GetString() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise calc's threading asserts with fdo#37765-1. Change-Id: Ic2500f2218bf62c4d05f1c5284e62a53c0598b53 Reviewed-on: https://gerrit.libreoffice.org/56484 Tested-by: Jenkins Reviewed-by: Luboš Luňák --- sc/inc/column.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sc/inc/column.hxx') diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 5da349006538..93d5384dfcc0 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -357,7 +357,7 @@ public: void SetValue( sc::ColumnBlockPosition& rBlockPos, SCROW nRow, double fVal, bool bBroadcast = true ); void SetError( SCROW nRow, const FormulaError nError); - void GetString( SCROW nRow, OUString& rString ) const; + void GetString( SCROW nRow, OUString& rString, const ScInterpreterContext* pContext = nullptr ) const; double* GetValueCell( SCROW nRow ); void GetInputString( SCROW nRow, OUString& rString ) const; double GetValue( SCROW nRow ) const; -- cgit