From 72b4cb18a402338dd65d24d9da8da7fe0fa33db0 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Wed, 27 Jun 2012 16:15:05 +0200
Subject: propagate error in ScInterpreter::GetDoubleOrStringFromMatrix()

Change-Id: Iadba0f3a28b0a3bda9b99833510e68679d915514
---
 sc/source/core/tool/interpr4.cxx | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'sc')

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 08d9acc80009..bca2977b8b92 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -2451,6 +2451,13 @@ ScMatValType ScInterpreter::GetDoubleOrStringFromMatrix( double& rDouble,
     else
         rString = nMatVal.GetString();
 
+    if (ScMatrix::IsValueType( nMatValType))
+    {
+        sal_uInt16 nError = nMatVal.GetError();
+        if (nError)
+            SetError( nError);
+    }
+
     return nMatValType;
 }
 
-- 
cgit