diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-12-02 17:08:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-12-03 22:14:56 +0100 |
| commit | 41b8d8eb67a6f19ae1e19e74d055ba4c7869af8d (patch) | |
| tree | 3fe8a11f748d93614b90e9259e57adbaafa78435 | |
| parent | c10182573e2d29cb43fe763ec4e97e04a7d55d9b (diff) | |
cid#1456145 Missing move assignment operator
Change-Id: I55ed7d87def93a66668f5cf4f90fed1e1e5bcbee
Reviewed-on: https://gerrit.libreoffice.org/84256
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/inc/markdata.hxx | 1 | ||||
| -rw-r--r-- | sc/inc/markmulti.hxx | 7 | ||||
| -rw-r--r-- | sc/source/core/data/markmulti.cxx | 15 |
3 files changed, 5 insertions, 18 deletions
diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx index 10403066e5e8..485dcfbf9b12 100644 --- a/sc/inc/markdata.hxx +++ b/sc/inc/markdata.hxx @@ -68,6 +68,7 @@ public: ScMarkData(const ScMarkData& rData) = default; ScMarkData(ScMarkData&& rData) = default; ScMarkData& operator=(const ScMarkData& rData) = default; + ScMarkData& operator=(ScMarkData&& rData) = default; ~ScMarkData(); void ResetMark(); diff --git a/sc/inc/markmulti.hxx b/sc/inc/markmulti.hxx index c6ae44701059..ac43e73cbdd5 100644 --- a/sc/inc/markmulti.hxx +++ b/sc/inc/markmulti.hxx @@ -40,11 +40,12 @@ friend class ScMultiSelIter; public: ScMultiSel(SCROW nMaxRow); - ScMultiSel( const ScMultiSel& rMultiSel ); + ScMultiSel(const ScMultiSel& rMultiSel) = default; + ScMultiSel(ScMultiSel&& rMultiSel) = default; ~ScMultiSel(); - ScMultiSel& operator=(const ScMultiSel& rMultiSel); - ScMultiSel& operator=(const ScMultiSel&& rMultiSel) = delete; + ScMultiSel& operator=(const ScMultiSel& rMultiSel) = default; + ScMultiSel& operator=(ScMultiSel&& rMultiSel) = default; SCCOL GetMultiSelectionCount() const; bool HasMarks( SCCOL nCol ) const; diff --git a/sc/source/core/data/markmulti.cxx b/sc/source/core/data/markmulti.cxx index fa9262024339..1c8c38cc3584 100644 --- a/sc/source/core/data/markmulti.cxx +++ b/sc/source/core/data/markmulti.cxx @@ -32,25 +32,10 @@ ScMultiSel::ScMultiSel(SCROW nMaxRow) { } -ScMultiSel::ScMultiSel( const ScMultiSel& rOther ) - : aRowSel(rOther.aRowSel) -{ - aMultiSelContainer = rOther.aMultiSelContainer; - mnMaxRow = rOther.mnMaxRow; -} - ScMultiSel::~ScMultiSel() { } -ScMultiSel& ScMultiSel::operator=(const ScMultiSel& rOther) -{ - aRowSel = rOther.aRowSel; - aMultiSelContainer = rOther.aMultiSelContainer; - mnMaxRow = rOther.mnMaxRow; - return *this; -} - void ScMultiSel::Clear() { aMultiSelContainer.clear(); |