diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-06-20 13:01:15 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-06-24 16:51:37 -0400 |
| commit | 2a1c5aba7640416c78501116dd42d12e74fe4734 (patch) | |
| tree | f94a3694ac5fb26c0ada039784cf5963378e8a8d | |
| parent | df90b9eaa16a52d076658ffc2fd1f65f12d1a622 (diff) | |
Fix ScCellIterator, which also fixes matrix handling in the formula engine.
This one alone fixes 2 unit test failures.
Change-Id: I3392f4567888447d867ed29f7ecda2474fae1547
| -rw-r--r-- | sc/inc/scmatrix.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/dociter.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index 6ba2b7f53e62..66b271b5a759 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -28,7 +28,7 @@ #include <boost/intrusive_ptr.hpp> -#define DEBUG_MATRIX 1 +#define DEBUG_MATRIX 0 class ScInterpreter; class SvNumberFormatter; diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index fb9eb62dc297..b384ca2d7896 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -1035,7 +1035,7 @@ bool ScCellIterator::first() bool ScCellIterator::next() { - maCurPos.IncRow(); + incPos(); return getCurrent(); } @@ -1825,7 +1825,7 @@ void ScHorizontalCellIterator::Advance() return; } - if (nNextRow > MAXROW) + if (nNextRow > static_cast<size_t>(MAXROW)) { // No more blocks to search. bMore = false; |