drawinglayer/source/attribute/sdrlineattribute.cxx | 11 ++--------- drawinglayer/source/attribute/strokeattribute.cxx | 8 +++----- include/connectivity/FValue.hxx | 11 +++++++++++ include/drawinglayer/attribute/strokeattribute.hxx | 1 + 4 files changed, 17 insertions(+), 14 deletions(-)
New commits: commit 9fda8f5ad61c11d72718a50a175b23cb43bfa9ab Author: Noel Grandin <n...@peralex.com> Date: Thu Aug 25 11:53:50 2016 +0200 fix move operator= and add move constructors followup to: 19828cc0 "cid#1371315 Missing move assignment operator" and 0e748707 "cid#1371320 Missing move assignment operator" Change-Id: Id2479fef41cf8d98eef9246f3a86e6c9289c3d58 diff --git a/drawinglayer/source/attribute/sdrlineattribute.cxx b/drawinglayer/source/attribute/sdrlineattribute.cxx index 8541aa4..21da3a2 100644 --- a/drawinglayer/source/attribute/sdrlineattribute.cxx +++ b/drawinglayer/source/attribute/sdrlineattribute.cxx @@ -124,10 +124,7 @@ namespace drawinglayer { } - SdrLineAttribute::SdrLineAttribute(SdrLineAttribute&& rCandidate) - : mpSdrLineAttribute(rCandidate.mpSdrLineAttribute) - { - } + SdrLineAttribute::SdrLineAttribute(SdrLineAttribute&& rCandidate) = default; SdrLineAttribute::~SdrLineAttribute() { @@ -144,11 +141,7 @@ namespace drawinglayer return *this; } - SdrLineAttribute& SdrLineAttribute::operator=(SdrLineAttribute&& rCandidate) - { - mpSdrLineAttribute = rCandidate.mpSdrLineAttribute; - return *this; - } + SdrLineAttribute& SdrLineAttribute::operator=(SdrLineAttribute&& rCandidate) = default; bool SdrLineAttribute::operator==(const SdrLineAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/strokeattribute.cxx b/drawinglayer/source/attribute/strokeattribute.cxx index c5b2d8d..7c152c8 100644 --- a/drawinglayer/source/attribute/strokeattribute.cxx +++ b/drawinglayer/source/attribute/strokeattribute.cxx @@ -92,6 +92,8 @@ namespace drawinglayer { } + StrokeAttribute::StrokeAttribute(StrokeAttribute&& rCandidate) = default; + StrokeAttribute::~StrokeAttribute() { } @@ -107,11 +109,7 @@ namespace drawinglayer return *this; } - StrokeAttribute& StrokeAttribute::operator=(StrokeAttribute&& rCandidate) - { - mpStrokeAttribute = rCandidate.mpStrokeAttribute; - return *this; - } + StrokeAttribute& StrokeAttribute::operator=(StrokeAttribute&& rCandidate) = default; bool StrokeAttribute::operator==(const StrokeAttribute& rCandidate) const { diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx index 3964f3a..aeac0c1 100644 --- a/include/connectivity/FValue.hxx +++ b/include/connectivity/FValue.hxx @@ -98,6 +98,17 @@ namespace connectivity operator=(_rRH); } + ORowSetValue(ORowSetValue&& _rRH) + :m_eTypeKind(css::sdbc::DataType::VARCHAR) + ,m_bNull(true) + ,m_bBound(true) + ,m_bModified(false) + ,m_bSigned(true) + { + m_aValue.m_pString = nullptr; + operator=(_rRH); + } + ORowSetValue(const OUString& _rRH) :m_eTypeKind(css::sdbc::DataType::VARCHAR) ,m_bNull(true) diff --git a/include/drawinglayer/attribute/strokeattribute.hxx b/include/drawinglayer/attribute/strokeattribute.hxx index 4ca3955..5404158 100644 --- a/include/drawinglayer/attribute/strokeattribute.hxx +++ b/include/drawinglayer/attribute/strokeattribute.hxx @@ -51,6 +51,7 @@ namespace drawinglayer double fFullDotDashLen = 0.0); StrokeAttribute(); StrokeAttribute(const StrokeAttribute& rCandidate); + StrokeAttribute(StrokeAttribute&& rCandidate); StrokeAttribute& operator=(const StrokeAttribute& rCandidate); StrokeAttribute& operator=(StrokeAttribute&& rCandidate); ~StrokeAttribute(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits