[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source

[Eike Rathke]

 sc/source/ui/docshell/impex.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c5dbd79f37cb76a638af2c409acb200ea4ef5ffc
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Aug 31 15:26:35 2017 +0200

    SYLK import: init nRefCol,nRefRow with start col,row instead of 1,1
    
    So in a malformed document that does not specify ;X;Y;C;R before ;M a 1x1
    matrix formula is created at nStartCol,nStartRow instead of 2x2
    
    Change-Id: Idcc0f9d8c65bb142587fa6419af6f4dcb6209a0e
    (cherry picked from commit 13787b61d2fa4ef5e61a41e4bb0424a870dc03bf)
    Reviewed-on: https://gerrit.libreoffice.org/42279
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index f1e74326e3f0..62b6663d50bf 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1729,8 +1729,8 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm )
         OString aByteLine;
         SCCOL nCol = nStartCol;
         SCROW nRow = nStartRow;
-        SCCOL nRefCol = 1;
-        SCROW nRefRow = 1;
+        SCCOL nRefCol = nCol;
+        SCROW nRefRow = nRow;
         rStrm.Seek( nOldPos );
         for( ;; )
         {