diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-11-08 19:49:10 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-11-08 19:51:50 -0500 |
| commit | 78bf3c9abd4a8cd939e7ba4399ae4aab9f3b2982 (patch) | |
| tree | ab7fb598750724641306584e8ccc62fc8520fa0b /sc | |
| parent | 45d196c0cc74a8c1ae702514d67ca09b3afb3d5d (diff) | |
fdo#56829: Correctly pass element values to matrix.
Change-Id: I20045ae0ddcec228b153c4005855dca9c4ddbfca
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/interpr5.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index 46fd6fc1649b..faa0db59aca9 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -453,7 +453,7 @@ ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const FormulaToken* pToken nGlobalError = 0; } - if (nThisRow == nPrevRow + 1) + if (!aBucket.maNumVals.empty() && nThisRow == nPrevRow + 1) { // Secondary numbers. aBucket.maNumVals.push_back(fVal); @@ -475,7 +475,7 @@ ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const FormulaToken* pToken double fVal = CreateDoubleError( nGlobalError); nGlobalError = 0; - if (nThisRow == nPrevRow + 1) + if (!aBucket.maNumVals.empty() && nThisRow == nPrevRow + 1) { // Secondary numbers. aBucket.maNumVals.push_back(fVal); @@ -490,7 +490,7 @@ ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const FormulaToken* pToken } else { - if (nThisRow == nPrevRow + 1) + if (!aBucket.maStrVals.empty() && nThisRow == nPrevRow + 1) { // Secondary numbers. aBucket.maStrVals.push_back(aStr); |