[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/xml/XMLExportIterator.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f2c6156a90093d38e1ab304d11ffed90555d5fa1
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Wed Nov 14 15:57:36 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Nov 17 17:50:07 2018 +0100

    Resolves: tdf#119700 save correct table:last-row-spanned
    
    Regression from
    
        commit f6e6a6139e90d6e88fb65308e8592193ac602a8a
        CommitDate: Mon Nov 21 07:49:06 2016 +0000
    
            tdf#48140 Replace uno CellRangeAddress and CellAddress with direct calls
    
    that calculated endrow-startcol instead of endrow-startrow.
    
    Change-Id: Ie576f9abdcdc23fc5f0a06735caadc24e975360f
    Reviewed-on: https://gerrit.libreoffice.org/63374
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 6e566c2b2b23d457a9fd47c16df15ce11e84c8e8)
    Reviewed-on: https://gerrit.libreoffice.org/63382
    Reviewed-by: Xisco Faulí <xiscofauli 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/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx
index 11d88f004f01..a5dbaa0bc697 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -157,7 +157,7 @@ struct ScMyAreaLink
     ScMyAreaLink() : nRefresh( 0 ) {}
 
     sal_Int32            GetColCount() const { return aDestRange.aEnd.Col() - aDestRange.aStart.Col() + 1; }
-    sal_Int32            GetRowCount() const { return aDestRange.aEnd.Row() - aDestRange.aStart.Col() + 1; }
+    sal_Int32            GetRowCount() const { return aDestRange.aEnd.Row() - aDestRange.aStart.Row() + 1; }
 
     bool                        Compare( const ScMyAreaLink& rAreaLink ) const;
     bool                        operator<(const ScMyAreaLink& rAreaLink ) const;