summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-10-15 23:40:28 +0200
committerEike Rathke <erack@redhat.com>2015-10-16 00:27:04 +0200
commit07bc49b43187ecc691d98eec1b9b129cf92efd70 (patch)
tree5a7dc34497fd24a9d0d80e785069c7d9cf4e156c
parent468b55301f385771d65d2f15f9ad7879af29f1cf (diff)
Resolves: tdf#94869 propagate error from scalar double to matrix
Minimal invasive fix for the problem, further work on error propagation in array/matrix cases may be needed. Change-Id: Ia6a7fe8138b98b78ffbe89572eb51ab8e9c0fdca
-rw-r--r--sc/source/core/tool/scmatrix.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 21b4545a511c..b3f5f84adc92 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -2663,7 +2663,14 @@ public:
mpErrorInterpreter(pErrorInterpreter),
maString(rString),
mfVal(fVal)
- { }
+ {
+ if (mpErrorInterpreter)
+ {
+ sal_uInt16 nErr = mpErrorInterpreter->GetError();
+ if (nErr)
+ mfVal = CreateDoubleError( nErr);
+ }
+ }
TRet operator()(double fVal) const
{