summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-02-14 20:39:18 -0500
committerEike Rathke <erack@redhat.com>2014-03-06 14:45:01 -0600
commitebdf24c6731ccffb6dbd6e3487cd919890c844b3 (patch)
treec0460ed4a9928f4b95e241a2cfcf0bfb3c25a52d /sc
parentb6df2950db8394e6bd73fe708dbc20f3d8f4e5c2 (diff)
fdo#72691: Allow overwriting of string value with numeric one.
This can legitimately happen when you have a matrix with a reference to another cell inside, and the referenced cell originally contained a string value then later overwritten by a numeric value. Example. Put a "Text" in A1, and in B1 put a 1x1 matrix {=A1}. It displays "Text" in B1. Then put 11 in A1. Prior to this change, B1 would become blank. With this change, B1 will display 11. Change-Id: I3feba3a8658e1a5ebf6f9e5ac34de2d579464ddb (cherry picked from commit 9bf907a8278cecd816368db7b8c4ab745a914a59) Reviewed-on: https://gerrit.libreoffice.org/8066 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/token.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 3dff6a930804..cd14c4cb3812 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1084,6 +1084,9 @@ void ScMatrixFormulaCellToken::SetUpperLeftDouble( double f )
case svDouble:
const_cast<FormulaToken*>(xUpperLeft.get())->GetDoubleAsReference() = f;
break;
+ case svString:
+ xUpperLeft = new FormulaDoubleToken( f);
+ break;
case svUnknown:
if (!xUpperLeft)
{