[Libreoffice-commits] core.git: sc/inc sc/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Mon Dec 2 10:32:12 UTC 2019
sc/inc/markdata.hxx | 18 +++++++++---------
sc/source/core/data/markdata.cxx | 10 +++++-----
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit ae63347262401cbb7010fd2939afdae90ee7b102
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Dec 2 09:01:04 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Dec 2 11:31:27 2019 +0100
use initializer list
Change-Id: Ida6d710ceb4722029c9d0e07df47e621dd4a4053
Reviewed-on: https://gerrit.libreoffice.org/84192
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx
index 5929586036d4..52fed46bb07a 100644
--- a/sc/inc/markdata.hxx
+++ b/sc/inc/markdata.hxx
@@ -50,17 +50,17 @@ private:
ScRange aMarkRange; // area
ScRange aMultiRange; // maximum area altogether
ScMultiSel aMultiSel; // multi selection
- bool bMarked:1; // rectangle marked
- bool bMultiMarked:1;
-
- bool bMarking:1; // area is being marked -> no MarkToMulti
- bool bMarkIsNeg:1; // cancel if multi selection
- ScRangeList aTopEnvelope; // list of ranges in the top envelope of the multi selection
- 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
+ ScRangeList aTopEnvelope; // list of ranges in the top envelope of the multi selection
+ 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;
+ bool bMarked:1; // rectangle marked
+ bool bMultiMarked:1;
+
+ bool bMarking:1; // area is being marked -> no MarkToMulti
+ bool bMarkIsNeg:1; // cancel if multi selection
public:
ScMarkData(SCROW nMaxRow, SCCOL nMaxCol);
diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx
index 469e169a9c03..047fe7002ff2 100644
--- a/sc/source/core/data/markdata.cxx
+++ b/sc/source/core/data/markdata.cxx
@@ -51,12 +51,12 @@ ScMarkData::ScMarkData(const ScMarkData& rData) :
aLeftEnvelope( rData.aLeftEnvelope ),
aRightEnvelope( rData.aRightEnvelope ),
mnMaxRow( rData.mnMaxRow ),
- mnMaxCol( rData.mnMaxCol )
+ mnMaxCol( rData.mnMaxCol ),
+ bMarked( rData.bMarked ),
+ bMultiMarked( rData.bMultiMarked ),
+ bMarking( rData.bMarking ),
+ bMarkIsNeg( rData.bMarkIsNeg )
{
- bMarked = rData.bMarked;
- bMultiMarked = rData.bMultiMarked;
- bMarking = rData.bMarking;
- bMarkIsNeg = rData.bMarkIsNeg;
}
ScMarkData& ScMarkData::operator=(const ScMarkData& rData)
More information about the Libreoffice-commits
mailing list