diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-06-05 18:46:44 +0200 |
|---|---|---|
| committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-06-06 11:38:33 +0200 |
| commit | 2f5d1fc88f5d8b302d5c777b1becaad2f8406f97 (patch) | |
| tree | 3afd69614bfffe934cd36cf44ff34c98e540b215 | |
| parent | 35cd5805c3052a1190cf98c0d7dd320f83fd3c5e (diff) | |
tdf#108287 perf regression changing background color
regression from commit 7c73c4605bb75b288e186b5de0ca12da1724353e
tdf#48140 replace ApiCellRangeList in xlsx import (3)
also added two nitpicks: reuse reference and use simpler ScRange ctor
Change-Id: I8bda3932dd6c575e021e031ea0c14b6d9f253064
Reviewed-on: https://gerrit.libreoffice.org/38417
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
| -rw-r--r-- | sc/source/filter/oox/sheetdatabuffer.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 52f29ac2b5b9..585a8a1bbcf6 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -656,7 +656,7 @@ void SheetDataBuffer::setCellFormat( const CellModel& rModel ) } else { - maXfIdRangeLists[ XfIdNumFmtKey (rModel.mnXfId, -1 ) ].Append(ScRange(rModel.maCellAddr, rModel.maCellAddr)); + rRangeList.Append(ScRange(rModel.maCellAddr)); pLastRange = rRangeList.back(); } @@ -669,7 +669,7 @@ void SheetDataBuffer::setCellFormat( const CellModel& rModel ) break; /* Try to merge this with the previous range */ - if (pLastRange->aStart.Row() == (pMergeRange->aStart.Row() + 1) && + if (pLastRange->aStart.Row() == (pMergeRange->aEnd.Row() + 1) && pLastRange->aStart.Col() == pMergeRange->aStart.Col() && pLastRange->aEnd.Col() == pMergeRange->aEnd.Col()) { |