diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-09-19 00:37:55 +0200 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-09-19 09:46:14 -0400 |
| commit | eff2d03eb41b7bbf7c8201e378785c04e6afe906 (patch) | |
| tree | 5fda55ceb9a23234efae7908ad2a1cf20f24b934 | |
| parent | 517f98528e27bbecc308ad98a830fce5dca60bb3 (diff) | |
import values and formulas from lotus-123, fdo#55066
Change-Id: Ia403c849ef537c7f7804f907889110b8096c0bb6
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
Signed-off-by: Fridrich Strba <fridrich.strba@graduateinstitute.ch>
Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
| -rw-r--r-- | sc/source/filter/lotus/op.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx index bd94432c27be..238e686c4d9d 100644 --- a/sc/source/filter/lotus/op.cxx +++ b/sc/source/filter/lotus/op.cxx @@ -400,7 +400,7 @@ void OP_Number123( SvStream& r, sal_uInt16 /*n*/ ) r >> nRow >> nTab >> nCol >> nValue; - if (ValidColRow( static_cast<SCCOL>(nCol), nRow) && nTab < pDoc->GetMaxTableNumber()) + if (ValidColRow( static_cast<SCCOL>(nCol), nRow) && nTab <= pDoc->GetMaxTableNumber()) { double fValue = Snum32ToDouble( nValue ); @@ -425,7 +425,7 @@ void OP_Formula123( SvStream& r, sal_uInt16 n ) aConv.Reset( aAddress ); aConv.Convert( pErg, nBytesLeft ); - if (ValidColRow( static_cast<SCCOL>(nCol), nRow) && nTab < pDoc->GetMaxTableNumber()) + if (ValidColRow( static_cast<SCCOL>(nCol), nRow) && nTab <= pDoc->GetMaxTableNumber()) { ScFormulaCell* pCell = new ScFormulaCell( pLotusRoot->pDoc, aAddress, pErg ); @@ -443,7 +443,7 @@ void OP_IEEENumber123( SvStream& r, sal_uInt16 /*n*/ ) r >> nRow >> nTab >> nCol >> dValue; - if (ValidColRow( static_cast<SCCOL>(nCol), nRow) && nTab < pDoc->GetMaxTableNumber()) + if (ValidColRow( static_cast<SCCOL>(nCol), nRow) && nTab <= pDoc->GetMaxTableNumber()) { ScValueCell *pCell = new ScValueCell(dValue); pDoc->PutCell( static_cast<SCCOL>(nCol), static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab), pCell, true ); |