| commit | e2713a0a5677dd92e3a88edc534a2e35ce91a0fb | [log] |
|---|---|---|
| author | Eike Rathke <erack@redhat.com> | Wed Jul 08 18:36:59 2020 +0200 |
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | Thu Jul 09 16:51:47 2020 +0200 |
| tree | c166bae0f86f1e3161d7178e41df44d8f10903f0 | |
| parent | 989cdd0a5b2efa83ff0b4ca8bc2adb0b64bde1bb [diff] |
Resolves: tdf#124454 exec the matrix operator on values converted from strings Effectively a fallout from the matrix operations rework started for tdf#89387 that did not convert strings at all and subsequent work converted the string according to settings but did not apply the current operator on the result. Change-Id: I90c8963021396fd9a46b063f6aee96283f89271a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98385 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 7ead920f7015bb8e7a4343b863333bb26187d9a3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98339 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 34ee653..4c81a80 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx
@@ -3355,7 +3355,7 @@ public: double operator()(const svl::SharedString& rStr) const { return convertStringToValue( mpErrorInterpreter, rStr.getString()); return maOp( convertStringToValue( mpErrorInterpreter, rStr.getString()), mfVal); } TEmptyRes operator()(char) const