[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/lotus/op.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cc0ceb51e2e99eaa2ae90506ef4b26bdb7f28b39
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Wed Sep 19 00:37:55 2012 +0200

    import values and formulas from lotus-123, fdo#55066
    
    Change-Id: Ia403c849ef537c7f7804f907889110b8096c0bb6
    Signed-off-by: Michael Meeks <michael.me...@suse.com>

diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index bd94432..238e686 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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits