[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/core/tool/scmatrix.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 07bc49b43187ecc691d98eec1b9b129cf92efd70
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Oct 15 23:40:28 2015 +0200

    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

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 21b4545..b3f5f84 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
     {