diff options
| author | Aron Budea <aron.budea@collabora.com> | 2019-10-25 08:21:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-25 12:43:11 +0200 |
| commit | 1bca91f086be08c41e51f5f7cc7616ce8c5cb799 (patch) | |
| tree | d2f00b0cdfee0ddc60c5823ace15fea49b25a39d /sc/source/filter/excel/xicontent.cxx | |
| parent | c8067df2fe03056c67bb1805e52b60b45dc3363b (diff) | |
sc: rowcol: tdf#50916 convert filter/excel for the most part
Change-Id: I8ae255de6fcd9d7fd379a48fb7e84adcbf7fa4ff
TODO: pieces in frmbase.cxx, xestream.cxx and xistyle.cxx
Reviewed-on: https://gerrit.libreoffice.org/81486
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source/filter/excel/xicontent.cxx')
| -rw-r--r-- | sc/source/filter/excel/xicontent.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 686fac1ae423..f2d3b67dc1a2 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -448,10 +448,10 @@ void XclImpLabelranges::ReadLabelranges( XclImpStream& rStrm ) { const ScRange & rScRange = aRowScRanges[ i ]; ScRange aDataRange( rScRange ); - if( aDataRange.aEnd.Col() < MAXCOL ) + if( aDataRange.aEnd.Col() < rDoc.MaxCol() ) { aDataRange.aStart.SetCol( aDataRange.aEnd.Col() + 1 ); - aDataRange.aEnd.SetCol( MAXCOL ); + aDataRange.aEnd.SetCol( rDoc.MaxCol() ); } else if( aDataRange.aStart.Col() > 0 ) { @@ -470,10 +470,10 @@ void XclImpLabelranges::ReadLabelranges( XclImpStream& rStrm ) { const ScRange & rScRange = aColScRanges[ i ]; ScRange aDataRange( rScRange ); - if( aDataRange.aEnd.Row() < MAXROW ) + if( aDataRange.aEnd.Row() < rDoc.MaxRow() ) { aDataRange.aStart.SetRow( aDataRange.aEnd.Row() + 1 ); - aDataRange.aEnd.SetRow( MAXROW ); + aDataRange.aEnd.SetRow( rDoc.MaxRow() ); } else if( aDataRange.aStart.Row() > 0 ) { |