summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2012-06-27 16:15:05 +0200
committerEike Rathke <erack@redhat.com>2012-06-27 16:54:41 +0200
commit72b4cb18a402338dd65d24d9da8da7fe0fa33db0 (patch)
treee4aa5c0a467e316a6d3308fd099b0e83997cb00f
parentc793a57f54d3649198928f928180515e0dd1bfad (diff)
propagate error in ScInterpreter::GetDoubleOrStringFromMatrix()
Change-Id: Iadba0f3a28b0a3bda9b99833510e68679d915514
-rw-r--r--sc/source/core/tool/interpr4.cxx7
1 files changed, 7 insertions, 0 deletions
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;
}