diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-02-14 20:39:18 -0500 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-02-15 04:55:53 +0000 |
| commit | b34c818bae7131c94f4a29257413c71536b8374d (patch) | |
| tree | 2f6a0b00e803afeaf0f289a84ba05dbbdbed6865 /sc/source/core/tool | |
| parent | 50a2ddc88f7b9f48fecd562ca0f4bd76c79f0cc3 (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/8064
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc/source/core/tool')
| -rw-r--r-- | sc/source/core/tool/token.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index ff456eb4a12d..fc9ad75e476d 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1146,6 +1146,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) { |