summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-08-25 14:52:33 +0200
committerNoel Grandin <noel@peralex.com>2016-08-29 09:23:46 +0200
commitab0eecc0be4671c984dedf5a4941febcd5dec589 (patch)
tree751edfb014a328480ad935ab23cf04c84042a7f1
parent68697779cbe7fe3268e9cdb553688228c1efb97b (diff)
cid#1371256 Missing move assignment operator
Change-Id: Idf50c8f56e1d409fbd1306ee0fec20360bf99c86
-rw-r--r--include/svx/sdr/attribute/sdrtextattribute.hxx2
-rw-r--r--svx/source/sdr/attribute/sdrtextattribute.cxx11
2 files changed, 13 insertions, 0 deletions
diff --git a/include/svx/sdr/attribute/sdrtextattribute.hxx b/include/svx/sdr/attribute/sdrtextattribute.hxx
index efcb9524bf98..8aaaaf02989c 100644
--- a/include/svx/sdr/attribute/sdrtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrtextattribute.hxx
@@ -80,7 +80,9 @@ namespace drawinglayer
SdrTextAttribute();
SdrTextAttribute(const SdrTextAttribute& rCandidate);
+ SdrTextAttribute(SdrTextAttribute&& rCandidate);
SdrTextAttribute& operator=(const SdrTextAttribute& rCandidate);
+ SdrTextAttribute& operator=(SdrTextAttribute&& rCandidate);
~SdrTextAttribute();
// checks if the incarnation is default constructed
diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx
index 76f47517c365..7b9c5daf159a 100644
--- a/svx/source/sdr/attribute/sdrtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrtextattribute.cxx
@@ -282,6 +282,11 @@ namespace drawinglayer
{
}
+ SdrTextAttribute::SdrTextAttribute(SdrTextAttribute&& rCandidate)
+ : mpSdrTextAttribute(std::move(rCandidate.mpSdrTextAttribute))
+ {
+ }
+
SdrTextAttribute::~SdrTextAttribute()
{
}
@@ -297,6 +302,12 @@ namespace drawinglayer
return *this;
}
+ SdrTextAttribute& SdrTextAttribute::operator=(SdrTextAttribute&& rCandidate)
+ {
+ mpSdrTextAttribute = std::move(rCandidate.mpSdrTextAttribute);
+ return *this;
+ }
+
bool SdrTextAttribute::operator==(const SdrTextAttribute& rCandidate) const
{
// tdf#87509 default attr is always != non-default attr, even with same values