summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2020-07-08 18:36:59 +0200
committerEike Rathke <erack@redhat.com>2020-07-09 01:04:43 +0200
commitef0f60f28ac83c55f260f61346f03b5f928764d8 (patch)
treedeb388bcd7f3f144a988b10d7dcdaff487e1df27 /sc
parenteb85e5bd28b9101c7c475c8e7a86ea61af85806f (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/+/98338
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/scmatrix.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index b27f73a10b94..fdba2f1b7989 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -3367,7 +3367,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