diff options
author | Eike Rathke <erack@redhat.com> | 2020-07-08 18:36:59 +0200 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-07-09 16:51:47 +0200 |
commit | e2713a0a5677dd92e3a88edc534a2e35ce91a0fb (patch) | |
tree | c166bae0f86f1e3161d7178e41df44d8f10903f0 /sc | |
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>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/tool/scmatrix.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 34ee65302349..4c81a803b110 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 |