summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-11-11 11:08:55 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-11-11 17:24:53 +0100
commita8a064d11c05feed83f05b0ce8209f7054afd804 (patch)
tree3a64572d1d12d64b707c50607056f405c3615fcf /sc/inc
parent33d966ecc1f9fc44016cdeeed15dbaf6bda68eda (diff)
sc: rowcol: tdf#50916 convert mark data structures
Change-Id: I9b706c9bcc2925f72cc024142ffe72af5ddea82a Reviewed-on: https://gerrit.libreoffice.org/82419 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/markarr.hxx3
-rw-r--r--sc/inc/markdata.hxx6
-rw-r--r--sc/inc/markmulti.hxx4
3 files changed, 9 insertions, 4 deletions
diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx
index edc1d7962d9a..97b68b0ac86a 100644
--- a/sc/inc/markarr.hxx
+++ b/sc/inc/markarr.hxx
@@ -43,12 +43,13 @@ class ScMarkArray
SCSIZE nCount;
SCSIZE nLimit;
std::unique_ptr<ScMarkEntry[]> pData;
+ SCROW mnMaxRow;
friend class ScMarkArrayIter;
friend class ScDocument; // for FillInfo
public:
- ScMarkArray();
+ ScMarkArray(SCROW nMaxRow);
ScMarkArray( ScMarkArray&& rArray ) noexcept;
ScMarkArray( const ScMarkArray& rArray );
~ScMarkArray();
diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx
index b605c8a1bbf7..5929586036d4 100644
--- a/sc/inc/markdata.hxx
+++ b/sc/inc/markdata.hxx
@@ -59,11 +59,13 @@ private:
ScRangeList aBottomEnvelope; // list of ranges in the bottom envelope of the multi selection
ScRangeList aLeftEnvelope; // list of ranges in the left envelope of the multi selection
ScRangeList aRightEnvelope; // list of ranges in the right envelope of the multi selection
+ SCROW mnMaxRow;
+ SCCOL mnMaxCol;
public:
- ScMarkData();
+ ScMarkData(SCROW nMaxRow, SCCOL nMaxCol);
ScMarkData(const ScMarkData& rData);
- ScMarkData(const ScRangeList& rList);
+ ScMarkData(SCROW nMaxRow, SCCOL nMaxCol, const ScRangeList& rList);
~ScMarkData();
ScMarkData& operator=(const ScMarkData& rData);
diff --git a/sc/inc/markmulti.hxx b/sc/inc/markmulti.hxx
index 386f7b135f5a..cc0363edb798 100644
--- a/sc/inc/markmulti.hxx
+++ b/sc/inc/markmulti.hxx
@@ -34,11 +34,13 @@ private:
typedef std::vector<ScMarkArray> MapType;
MapType aMultiSelContainer;
ScMarkArray aRowSel;
+ SCROW mnMaxRow;
+ SCCOL mnMaxCol;
friend class ScMultiSelIter;
public:
- ScMultiSel();
+ ScMultiSel(SCROW nMaxRow, SCCOL nMaxCol);
ScMultiSel( const ScMultiSel& rMultiSel );
~ScMultiSel();