diff options
| author | Eike Rathke <erack@redhat.com> | 2015-12-18 23:22:24 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-12-18 23:33:42 +0100 |
| commit | 9a9bf646cfc388324df017fb0b9e0f6ad71acabd (patch) | |
| tree | 3102cdb7a3ee6345fcb80fa5719d96b7d8caeac3 /reportdesign | |
| parent | d86e429f339131e05081132a6ef6aae41e5f6811 (diff) | |
Formula Wizard: evaluating expressions always in matrix context is wrong
Change-Id: I276f7bbf2bd6fa7c67d8691634ad9d79e4a08b1c
(cherry picked from commit dc89367a5622748dd7c37b89ac300a663b8b98e9)
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/Formula.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/Formula.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index dd1b33f68be5..03f4a7a04a17 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -107,7 +107,7 @@ void FormulaDialog::dispose() // Funktionen fuer rechte Seite -bool FormulaDialog::calculateValue( const OUString& rStrExp, OUString& rStrResult ) +bool FormulaDialog::calculateValue( const OUString& rStrExp, OUString& rStrResult, bool /*bMatrixFormula*/ ) { rStrResult = rStrExp; return false; diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index 227df6b477e6..60b1d5683433 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -73,7 +73,7 @@ public: // IFormulaEditorHelper virtual void notifyChange() override; virtual void fill() override; - virtual bool calculateValue(const OUString& _sExpression, OUString& _rResult) override; + virtual bool calculateValue(const OUString& _sExpression, OUString& _rResult, bool bMatrixFormula) override; virtual void doClose(bool _bOk) override; virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc) override; virtual void showReference(const OUString& _sFormula) override; |