diff options
author | Tor Lillqvist <tml@collabora.com> | 2013-11-20 16:41:51 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2013-11-20 18:23:07 +0000 |
commit | 0c7e7043bdeab5ad683e9621573441891ef4868b (patch) | |
tree | 23540757510ed503056244c4fc8d0d4bf78c14f7 /sc/source/filter/oox/formulabuffer.cxx | |
parent | 4787398ff07fe1bfe34ea878e9c8ee96e5d9994f (diff) |
Fix a few of my own thinkos, and add some assertions
Fix two obvious mistakes from 8c37bafbc5adc0c79f218f9db2dc25ca8e683125.
Add asserts to make sure the calls to ScFormulaCell::CreateCellGroup() that
now don't take the nStart parameter any more (but assume that the cell for
which this methoid is called is the start one) match the old ones in semantics.
Change-Id: I50cb0cdaf620253881225baf39ae9cd935917b27
Diffstat (limited to 'sc/source/filter/oox/formulabuffer.cxx')
-rw-r--r-- | sc/source/filter/oox/formulabuffer.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index ca48ecab3914..cb427f2dd97a 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -197,9 +197,11 @@ void applyCellFormulas( ScFormulaCell& rPrev = *p->mpCell; ScFormulaCellGroupRef xGroup = rPrev.GetCellGroup(); if (!xGroup) + { // Last cell is not grouped yet. Start a new group. - xGroup = rPrev.CreateCellGroup(p->mnRow, false); - + assert(rPrev.aPos.Row() == p->mnRow); + xGroup = rPrev.CreateCellGroup(1, false); + } ++xGroup->mnLength; pCell = new ScFormulaCell(&rDoc.getDoc(), aPos, xGroup); |