diff --git a/src/libs/vgeometry/vabstractarc.h b/src/libs/vgeometry/vabstractarc.h
index e4d9797b3..c16569dc6 100644
--- a/src/libs/vgeometry/vabstractarc.h
+++ b/src/libs/vgeometry/vabstractarc.h
@@ -62,7 +62,7 @@ public:
 #endif
 
     void Swap(VAbstractArc &arc) Q_DECL_NOTHROW
-    { std::swap(d, arc.d); }
+    { VAbstractCurve::Swap(arc); std::swap(d, arc.d); }
 
     QString       GetFormulaF1 () const;
     void          SetFormulaF1 (const QString &formula, qreal value);
diff --git a/src/libs/vgeometry/vabstractcurve.h b/src/libs/vgeometry/vabstractcurve.h
index 50b36b031..4ff9c838c 100644
--- a/src/libs/vgeometry/vabstractcurve.h
+++ b/src/libs/vgeometry/vabstractcurve.h
@@ -61,7 +61,7 @@ public:
 #endif
 
     void Swap(VAbstractCurve &curve) Q_DECL_NOTHROW
-    { std::swap(d, curve.d); }
+    { VGObject::Swap(curve); std::swap(d, curve.d); }
 
     virtual QVector<QPointF> GetPoints() const =0;
     static QVector<QPointF>  GetSegmentPoints(const QVector<QPointF> &points, const QPointF &begin, const QPointF &end,
diff --git a/src/libs/vgeometry/varc.h b/src/libs/vgeometry/varc.h
index dbb71bec4..70a94f6d0 100644
--- a/src/libs/vgeometry/varc.h
+++ b/src/libs/vgeometry/varc.h
@@ -70,7 +70,7 @@ public:
 #endif
 
     void Swap(VArc &arc) Q_DECL_NOTHROW
-    { std::swap(d, arc.d); }
+    { VAbstractArc::Swap(arc); std::swap(d, arc.d); }
 
     QString GetFormulaRadius () const;
     void    SetFormulaRadius (const QString &formula, qreal value);
diff --git a/src/libs/vgeometry/vcubicbezier.h b/src/libs/vgeometry/vcubicbezier.h
index 6695b8029..20ce93b51 100644
--- a/src/libs/vgeometry/vcubicbezier.h
+++ b/src/libs/vgeometry/vcubicbezier.h
@@ -61,7 +61,7 @@ public:
 #endif
 
     void Swap(VCubicBezier &curve) Q_DECL_NOTHROW
-    { std::swap(d, curve.d); }
+    { VAbstractCubicBezier::Swap(curve); std::swap(d, curve.d); }
 
     virtual VPointF GetP1() const Q_DECL_OVERRIDE;
     void            SetP1(const VPointF &p);
diff --git a/src/libs/vgeometry/vcubicbezierpath.h b/src/libs/vgeometry/vcubicbezierpath.h
index e58f06342..fe4789483 100644
--- a/src/libs/vgeometry/vcubicbezierpath.h
+++ b/src/libs/vgeometry/vcubicbezierpath.h
@@ -62,7 +62,7 @@ public:
 #endif
 
     void Swap(VCubicBezierPath &curve) Q_DECL_NOTHROW
-    { std::swap(d, curve.d); }
+    { VAbstractCubicBezierPath::Swap(curve); std::swap(d, curve.d); }
 
     VPointF &operator[](int indx);
 
diff --git a/src/libs/vgeometry/vellipticalarc.h b/src/libs/vgeometry/vellipticalarc.h
index 12b01eb02..919c3b728 100644
--- a/src/libs/vgeometry/vellipticalarc.h
+++ b/src/libs/vgeometry/vellipticalarc.h
@@ -73,7 +73,7 @@ public:
 #endif
 
     void Swap(VEllipticalArc &arc) Q_DECL_NOTHROW
-    { std::swap(d, arc.d); }
+    { VAbstractArc::Swap(arc); std::swap(d, arc.d); }
 
     QString GetFormulaRotationAngle () const;
     void    SetFormulaRotationAngle (const QString &formula, qreal value);
diff --git a/src/libs/vgeometry/vpointf.h b/src/libs/vgeometry/vpointf.h
index 33afcdc41..b84d8c48e 100644
--- a/src/libs/vgeometry/vpointf.h
+++ b/src/libs/vgeometry/vpointf.h
@@ -66,7 +66,7 @@ public:
 #endif
 
     void Swap(VPointF &point) Q_DECL_NOTHROW
-    { std::swap(d, point.d); }
+    { VGObject::Swap(point); std::swap(d, point.d); }
 
     explicit operator QPointF() const;
     VPointF Rotate(const QPointF &originPoint, qreal degrees, const QString &prefix = QString()) const;
diff --git a/src/libs/vgeometry/vspline.h b/src/libs/vgeometry/vspline.h
index 94270ed70..08e1df80c 100644
--- a/src/libs/vgeometry/vspline.h
+++ b/src/libs/vgeometry/vspline.h
@@ -71,7 +71,7 @@ public:
 #endif
 
     void Swap(VSpline &spline) Q_DECL_NOTHROW
-    { std::swap(d, spline.d); }
+    { VAbstractCubicBezier::Swap(spline); std::swap(d, spline.d); }
 
     virtual VPointF GetP1 () const Q_DECL_OVERRIDE;
     void            SetP1 (const VPointF &p);
diff --git a/src/libs/vgeometry/vsplinepath.h b/src/libs/vgeometry/vsplinepath.h
index 5c9bee2f1..7436836c6 100644
--- a/src/libs/vgeometry/vsplinepath.h
+++ b/src/libs/vgeometry/vsplinepath.h
@@ -71,7 +71,7 @@ public:
 #endif
 
     void Swap(VSplinePath &path) Q_DECL_NOTHROW
-    { std::swap(d, path.d); }
+    { VAbstractCubicBezierPath::Swap(path); std::swap(d, path.d); }
 
     void   append(const VSplinePoint &point);
 
diff --git a/src/libs/vlayout/vlayoutpiece.h b/src/libs/vlayout/vlayoutpiece.h
index 14573ad62..9f37428ce 100644
--- a/src/libs/vlayout/vlayoutpiece.h
+++ b/src/libs/vlayout/vlayoutpiece.h
@@ -68,7 +68,7 @@ public:
 #endif
 
     void Swap(VLayoutPiece &detail) Q_DECL_NOTHROW
-    { std::swap(d, detail.d); }
+    { VAbstractPiece::Swap(detail); std::swap(d, detail.d); }
 
     static VLayoutPiece Create(const VPiece &piece, const VContainer *pattern);
 
diff --git a/src/libs/vpatterndb/floatItemData/vgrainlinedata.h b/src/libs/vpatterndb/floatItemData/vgrainlinedata.h
index 909c6341e..9ed897407 100644
--- a/src/libs/vpatterndb/floatItemData/vgrainlinedata.h
+++ b/src/libs/vpatterndb/floatItemData/vgrainlinedata.h
@@ -55,7 +55,7 @@ public:
 #endif
 
     void Swap(VGrainlineData &data) Q_DECL_NOTHROW
-    { std::swap(d, data.d); }
+    { VAbstractFloatItemData::Swap(data); std::swap(d, data.d); }
 
     // methods, which set and return values of different parameters
     QString GetLength() const;
diff --git a/src/libs/vpatterndb/floatItemData/vpatternlabeldata.h b/src/libs/vpatterndb/floatItemData/vpatternlabeldata.h
index 7a8742df6..4dae667dd 100644
--- a/src/libs/vpatterndb/floatItemData/vpatternlabeldata.h
+++ b/src/libs/vpatterndb/floatItemData/vpatternlabeldata.h
@@ -52,7 +52,7 @@ public:
 #endif
 
     void Swap(VPatternLabelData &data) Q_DECL_NOTHROW
-    { std::swap(d, data.d); }
+    { VAbstractFloatItemData::Swap(data); std::swap(d, data.d); }
 
     // methods, which set up label parameters
     QString GetLabelWidth() const;
diff --git a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h
index f58d99382..5831c2626 100644
--- a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h
+++ b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h
@@ -54,7 +54,7 @@ public:
 #endif
 
     void Swap(VPieceLabelData &data) Q_DECL_NOTHROW
-    { std::swap(d, data.d); }
+    { VPatternLabelData::Swap(data); std::swap(d, data.d); }
 
     // methods, which operate on MaterialCutPlacement container
     void                        Append(const MaterialCutPlacement& rMCP);
diff --git a/src/libs/vpatterndb/variables/vcurvevariable.h b/src/libs/vpatterndb/variables/vcurvevariable.h
index a8e268c8b..ef2d93db9 100644
--- a/src/libs/vpatterndb/variables/vcurvevariable.h
+++ b/src/libs/vpatterndb/variables/vcurvevariable.h
@@ -53,7 +53,7 @@ public:
 #endif
 
     void Swap(VCurveVariable &var) Q_DECL_NOTHROW
-    { std::swap(d, var.d); }
+    { VInternalVariable::Swap(var); std::swap(d, var.d); }
 
     virtual bool Filter(quint32 id) Q_DECL_OVERRIDE;
 
diff --git a/src/libs/vpatterndb/variables/vincrement.h b/src/libs/vpatterndb/variables/vincrement.h
index a6b62e01b..56505bdac 100644
--- a/src/libs/vpatterndb/variables/vincrement.h
+++ b/src/libs/vpatterndb/variables/vincrement.h
@@ -59,7 +59,7 @@ public:
 #endif
 
     void Swap(VIncrement &incr) Q_DECL_NOTHROW
-    { std::swap(d, incr.d); }
+    { VVariable::Swap(incr); std::swap(d, incr.d); }
 
     quint32     getIndex() const;
     QString     GetFormula() const;
diff --git a/src/libs/vpatterndb/variables/vlineangle.h b/src/libs/vpatterndb/variables/vlineangle.h
index d7457187c..3c2338a08 100644
--- a/src/libs/vpatterndb/variables/vlineangle.h
+++ b/src/libs/vpatterndb/variables/vlineangle.h
@@ -54,7 +54,7 @@ public:
 #endif
 
     void Swap(VLineAngle &var) Q_DECL_NOTHROW
-    { std::swap(d, var.d); }
+    { VInternalVariable::Swap(var); std::swap(d, var.d); }
 
     virtual bool Filter(quint32 id) Q_DECL_OVERRIDE;
     void         SetValue(const VPointF *p1, const VPointF *p2);
diff --git a/src/libs/vpatterndb/variables/vlinelength.h b/src/libs/vpatterndb/variables/vlinelength.h
index 59f33d983..9deff5bc0 100644
--- a/src/libs/vpatterndb/variables/vlinelength.h
+++ b/src/libs/vpatterndb/variables/vlinelength.h
@@ -56,7 +56,7 @@ public:
 #endif
 
     void Swap(VLengthLine &var) Q_DECL_NOTHROW
-    { std::swap(d, var.d); }
+    { VInternalVariable::Swap(var); std::swap(d, var.d); }
 
     virtual bool Filter(quint32 id) Q_DECL_OVERRIDE;
     void         SetValue(const VPointF *p1, const VPointF *p2);
diff --git a/src/libs/vpatterndb/variables/vmeasurement.h b/src/libs/vpatterndb/variables/vmeasurement.h
index bd6fb197d..444b8307a 100644
--- a/src/libs/vpatterndb/variables/vmeasurement.h
+++ b/src/libs/vpatterndb/variables/vmeasurement.h
@@ -66,7 +66,7 @@ public:
 #endif
 
     void Swap(VMeasurement &m) Q_DECL_NOTHROW
-    { std::swap(d, m.d); }
+    { VVariable::Swap(m); std::swap(d, m.d); }
 
     QString GetGuiText() const;
 
diff --git a/src/libs/vpatterndb/variables/vvariable.h b/src/libs/vpatterndb/variables/vvariable.h
index b98a1ac20..02c41d395 100644
--- a/src/libs/vpatterndb/variables/vvariable.h
+++ b/src/libs/vpatterndb/variables/vvariable.h
@@ -58,7 +58,7 @@ public:
 #endif
 
     void Swap(VVariable &var) Q_DECL_NOTHROW
-    { std::swap(d, var.d); }
+    { VInternalVariable::Swap(var); std::swap(d, var.d); }
 
     qreal   GetBase() const;
     void    SetBase(const qreal &value);
diff --git a/src/libs/vpatterndb/vpiece.h b/src/libs/vpatterndb/vpiece.h
index bec6a9489..d2b1e7c55 100644
--- a/src/libs/vpatterndb/vpiece.h
+++ b/src/libs/vpatterndb/vpiece.h
@@ -60,7 +60,7 @@ public:
 #endif
 
     void Swap(VPiece &piece) Q_DECL_NOTHROW
-    { std::swap(d, piece.d); }
+    { VAbstractPiece::Swap(piece); std::swap(d, piece.d); }
 
     VPiecePath GetPath() const;
     VPiecePath &GetPath();