[Libreoffice-commits] core.git: drawinglayer/source

Noel Grandin noel at peralex.com
Thu Aug 25 10:33:14 UTC 2016


 drawinglayer/source/attribute/sdrlineattribute.cxx |   11 +++++++++--
 drawinglayer/source/attribute/strokeattribute.cxx  |   11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 37ffcb1ce74d08ccbca1545714bbf81669cd3d03
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Aug 25 12:29:44 2016 +0200

    fix windows build, doesn't like default move methods
    
    Change-Id: I6e756a11aa07722ff18ed13219b780f3db3bc4a0

diff --git a/drawinglayer/source/attribute/sdrlineattribute.cxx b/drawinglayer/source/attribute/sdrlineattribute.cxx
index 21da3a2..1da16445 100644
--- a/drawinglayer/source/attribute/sdrlineattribute.cxx
+++ b/drawinglayer/source/attribute/sdrlineattribute.cxx
@@ -124,7 +124,10 @@ namespace drawinglayer
         {
         }
 
-        SdrLineAttribute::SdrLineAttribute(SdrLineAttribute&& rCandidate) = default;
+        SdrLineAttribute::SdrLineAttribute(SdrLineAttribute&& rCandidate)
+        :   mpSdrLineAttribute(std::move(rCandidate.mpSdrLineAttribute))
+        {
+        }
 
         SdrLineAttribute::~SdrLineAttribute()
         {
@@ -141,7 +144,11 @@ namespace drawinglayer
             return *this;
         }
 
-        SdrLineAttribute& SdrLineAttribute::operator=(SdrLineAttribute&& rCandidate) = default;
+        SdrLineAttribute& SdrLineAttribute::operator=(SdrLineAttribute&& rCandidate)
+        {
+            mpSdrLineAttribute = std::move(rCandidate.mpSdrLineAttribute);
+            return *this;
+        }
 
         bool SdrLineAttribute::operator==(const SdrLineAttribute& rCandidate) const
         {
diff --git a/drawinglayer/source/attribute/strokeattribute.cxx b/drawinglayer/source/attribute/strokeattribute.cxx
index 7c152c8..05e9ba5 100644
--- a/drawinglayer/source/attribute/strokeattribute.cxx
+++ b/drawinglayer/source/attribute/strokeattribute.cxx
@@ -92,7 +92,10 @@ namespace drawinglayer
         {
         }
 
-        StrokeAttribute::StrokeAttribute(StrokeAttribute&& rCandidate) = default;
+        StrokeAttribute::StrokeAttribute(StrokeAttribute&& rCandidate)
+        :   mpStrokeAttribute(std::move(rCandidate.mpStrokeAttribute))
+        {
+        }
 
         StrokeAttribute::~StrokeAttribute()
         {
@@ -109,7 +112,11 @@ namespace drawinglayer
             return *this;
         }
 
-        StrokeAttribute& StrokeAttribute::operator=(StrokeAttribute&& rCandidate) = default;
+        StrokeAttribute& StrokeAttribute::operator=(StrokeAttribute&& rCandidate)
+        {
+            mpStrokeAttribute = std::move(rCandidate.mpStrokeAttribute);
+            return *this;
+        }
 
         bool StrokeAttribute::operator==(const StrokeAttribute& rCandidate) const
         {


More information about the Libreoffice-commits mailing list