summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/svx/sdr/properties/defaultproperties.hxx2
-rw-r--r--include/svx/sdr/properties/properties.hxx2
-rw-r--r--svx/inc/sdr/properties/attributeproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/captionproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/circleproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/connectorproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/customshapeproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/e3dcompoundproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/e3dextrudeproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/e3dlatheproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/e3dproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/e3dsceneproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/e3dsphereproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/emptyproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/graphicproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/groupproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/measureproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/oleproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/pageproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/rectangleproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/textproperties.hxx2
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx4
-rw-r--r--svx/source/sdr/properties/captionproperties.cxx4
-rw-r--r--svx/source/sdr/properties/circleproperties.cxx4
-rw-r--r--svx/source/sdr/properties/connectorproperties.cxx4
-rw-r--r--svx/source/sdr/properties/customshapeproperties.cxx4
-rw-r--r--svx/source/sdr/properties/defaultproperties.cxx4
-rw-r--r--svx/source/sdr/properties/e3dcompoundproperties.cxx4
-rw-r--r--svx/source/sdr/properties/e3dextrudeproperties.cxx4
-rw-r--r--svx/source/sdr/properties/e3dlatheproperties.cxx4
-rw-r--r--svx/source/sdr/properties/e3dproperties.cxx4
-rw-r--r--svx/source/sdr/properties/e3dsceneproperties.cxx4
-rw-r--r--svx/source/sdr/properties/e3dsphereproperties.cxx4
-rw-r--r--svx/source/sdr/properties/emptyproperties.cxx4
-rw-r--r--svx/source/sdr/properties/graphicproperties.cxx4
-rw-r--r--svx/source/sdr/properties/groupproperties.cxx4
-rw-r--r--svx/source/sdr/properties/measureproperties.cxx4
-rw-r--r--svx/source/sdr/properties/oleproperties.cxx4
-rw-r--r--svx/source/sdr/properties/pageproperties.cxx4
-rw-r--r--svx/source/sdr/properties/rectangleproperties.cxx4
-rw-r--r--svx/source/sdr/properties/textproperties.cxx4
-rw-r--r--svx/source/svdraw/svdobj.cxx2
-rw-r--r--svx/source/table/cell.cxx6
-rw-r--r--svx/source/table/svdotable.cxx6
44 files changed, 68 insertions, 68 deletions
diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx
index b3395386f833..beff46818c30 100644
--- a/include/svx/sdr/properties/defaultproperties.hxx
+++ b/include/svx/sdr/properties/defaultproperties.hxx
@@ -70,7 +70,7 @@ namespace sdr
void dumpAsXml(struct _xmlTextWriter * pWriter) const;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// get itemset
virtual const SfxItemSet& GetObjectItemSet() const override;
diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx
index 3bfca7630efe..5f9a63484d43 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -115,7 +115,7 @@ namespace sdr
// Clone() operator, normally just calls the local copy constructor,
// see above.
- virtual BaseProperties& Clone(SdrObject& rObj) const = 0;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const = 0;
// Get the local ItemSet. This directly returns the local ItemSet of the object. No
// merging of ItemSets is done for e.g. Group objects.
diff --git a/svx/inc/sdr/properties/attributeproperties.hxx b/svx/inc/sdr/properties/attributeproperties.hxx
index d12374f31ee1..138d7a20b900 100644
--- a/svx/inc/sdr/properties/attributeproperties.hxx
+++ b/svx/inc/sdr/properties/attributeproperties.hxx
@@ -64,7 +64,7 @@ namespace sdr
AttributeProperties(const AttributeProperties& rProps, SdrObject& rObj);
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// Get the local ItemSet. This directly returns the local ItemSet of the object. No
// merging of ItemSets is done for e.g. Group objects.
diff --git a/svx/inc/sdr/properties/captionproperties.hxx b/svx/inc/sdr/properties/captionproperties.hxx
index 2fb7b8d1e6c2..67fd1dd77a3b 100644
--- a/svx/inc/sdr/properties/captionproperties.hxx
+++ b/svx/inc/sdr/properties/captionproperties.hxx
@@ -47,7 +47,7 @@ namespace sdr
virtual ~CaptionProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// set a new StyleSheet and broadcast
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override;
diff --git a/svx/inc/sdr/properties/circleproperties.hxx b/svx/inc/sdr/properties/circleproperties.hxx
index 5de1ac6c6e9e..a4a0cfdd7267 100644
--- a/svx/inc/sdr/properties/circleproperties.hxx
+++ b/svx/inc/sdr/properties/circleproperties.hxx
@@ -47,7 +47,7 @@ namespace sdr
virtual ~CircleProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// set a new StyleSheet and broadcast
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override;
diff --git a/svx/inc/sdr/properties/connectorproperties.hxx b/svx/inc/sdr/properties/connectorproperties.hxx
index 5ed60a3ad420..3ef330c31c57 100644
--- a/svx/inc/sdr/properties/connectorproperties.hxx
+++ b/svx/inc/sdr/properties/connectorproperties.hxx
@@ -47,7 +47,7 @@ namespace sdr
virtual ~ConnectorProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// set a new StyleSheet and broadcast
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override;
diff --git a/svx/inc/sdr/properties/customshapeproperties.hxx b/svx/inc/sdr/properties/customshapeproperties.hxx
index 4abe7a50861a..3bd0085931c9 100644
--- a/svx/inc/sdr/properties/customshapeproperties.hxx
+++ b/svx/inc/sdr/properties/customshapeproperties.hxx
@@ -75,7 +75,7 @@ namespace sdr
virtual ~CustomShapeProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// This is the notifier from SfxListener
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
diff --git a/svx/inc/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/sdr/properties/e3dcompoundproperties.hxx
index 271bbc4a0a3e..44adf9d97a80 100644
--- a/svx/inc/sdr/properties/e3dcompoundproperties.hxx
+++ b/svx/inc/sdr/properties/e3dcompoundproperties.hxx
@@ -45,7 +45,7 @@ namespace sdr
virtual ~E3dCompoundProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// Get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may
// be overridden e.g for group objects to return a merged ItemSet of the object.
diff --git a/svx/inc/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/sdr/properties/e3dextrudeproperties.hxx
index c8156ac3695f..bbc9bf06b015 100644
--- a/svx/inc/sdr/properties/e3dextrudeproperties.hxx
+++ b/svx/inc/sdr/properties/e3dextrudeproperties.hxx
@@ -44,7 +44,7 @@ namespace sdr
virtual ~E3dExtrudeProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
};
} // end of namespace properties
} // end of namespace sdr
diff --git a/svx/inc/sdr/properties/e3dlatheproperties.hxx b/svx/inc/sdr/properties/e3dlatheproperties.hxx
index 5c7cc4ff1780..1de98de9a75e 100644
--- a/svx/inc/sdr/properties/e3dlatheproperties.hxx
+++ b/svx/inc/sdr/properties/e3dlatheproperties.hxx
@@ -44,7 +44,7 @@ namespace sdr
virtual ~E3dLatheProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
};
} // end of namespace properties
} // end of namespace sdr
diff --git a/svx/inc/sdr/properties/e3dproperties.hxx b/svx/inc/sdr/properties/e3dproperties.hxx
index 0e6352079756..8b90440a9c5a 100644
--- a/svx/inc/sdr/properties/e3dproperties.hxx
+++ b/svx/inc/sdr/properties/e3dproperties.hxx
@@ -47,7 +47,7 @@ namespace sdr
virtual ~E3dProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// set a new StyleSheet and broadcast
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override;
diff --git a/svx/inc/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx
index 00d377766e01..e0cded4b1be3 100644
--- a/svx/inc/sdr/properties/e3dsceneproperties.hxx
+++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx
@@ -44,7 +44,7 @@ namespace sdr
virtual ~E3dSceneProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may
// be overridden e.g for group objects to return a merged ItemSet of the object.
diff --git a/svx/inc/sdr/properties/e3dsphereproperties.hxx b/svx/inc/sdr/properties/e3dsphereproperties.hxx
index c7e5068d08cd..4af384325e44 100644
--- a/svx/inc/sdr/properties/e3dsphereproperties.hxx
+++ b/svx/inc/sdr/properties/e3dsphereproperties.hxx
@@ -44,7 +44,7 @@ namespace sdr
virtual ~E3dSphereProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
};
} // end of namespace properties
} // end of namespace sdr
diff --git a/svx/inc/sdr/properties/emptyproperties.hxx b/svx/inc/sdr/properties/emptyproperties.hxx
index 8163eacfc4f0..821cde2a96b6 100644
--- a/svx/inc/sdr/properties/emptyproperties.hxx
+++ b/svx/inc/sdr/properties/emptyproperties.hxx
@@ -57,7 +57,7 @@ namespace sdr
explicit EmptyProperties(SdrObject& rObj);
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// get itemset
virtual const SfxItemSet& GetObjectItemSet() const override;
diff --git a/svx/inc/sdr/properties/graphicproperties.hxx b/svx/inc/sdr/properties/graphicproperties.hxx
index 860bc264ee7f..7f81ebd3d5dc 100644
--- a/svx/inc/sdr/properties/graphicproperties.hxx
+++ b/svx/inc/sdr/properties/graphicproperties.hxx
@@ -47,7 +47,7 @@ namespace sdr
virtual ~GraphicProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// set a new StyleSheet and broadcast
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override;
diff --git a/svx/inc/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx
index 9b6b28a73dc3..1c524f61eb1e 100644
--- a/svx/inc/sdr/properties/groupproperties.hxx
+++ b/svx/inc/sdr/properties/groupproperties.hxx
@@ -56,7 +56,7 @@ namespace sdr
virtual ~GroupProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// get itemset
virtual const SfxItemSet& GetObjectItemSet() const override;
diff --git a/svx/inc/sdr/properties/measureproperties.hxx b/svx/inc/sdr/properties/measureproperties.hxx
index 06cc0fd328f5..e133828e8265 100644
--- a/svx/inc/sdr/properties/measureproperties.hxx
+++ b/svx/inc/sdr/properties/measureproperties.hxx
@@ -47,7 +47,7 @@ namespace sdr
virtual ~MeasureProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// set a new StyleSheet and broadcast
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override;
diff --git a/svx/inc/sdr/properties/oleproperties.hxx b/svx/inc/sdr/properties/oleproperties.hxx
index 047af50289bc..3c932e3a6fe4 100644
--- a/svx/inc/sdr/properties/oleproperties.hxx
+++ b/svx/inc/sdr/properties/oleproperties.hxx
@@ -41,7 +41,7 @@ namespace sdr
virtual ~OleProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// force default attributes for a specific object type, called from
// DefaultProperties::GetObjectItemSet() if a new ItemSet is created
diff --git a/svx/inc/sdr/properties/pageproperties.hxx b/svx/inc/sdr/properties/pageproperties.hxx
index febdae9a2194..81c389f907cc 100644
--- a/svx/inc/sdr/properties/pageproperties.hxx
+++ b/svx/inc/sdr/properties/pageproperties.hxx
@@ -50,7 +50,7 @@ namespace sdr
virtual ~PageProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// get itemset. Override here to allow creating the empty itemset
// without asserting
diff --git a/svx/inc/sdr/properties/rectangleproperties.hxx b/svx/inc/sdr/properties/rectangleproperties.hxx
index 376b494eac93..5512ffb5b196 100644
--- a/svx/inc/sdr/properties/rectangleproperties.hxx
+++ b/svx/inc/sdr/properties/rectangleproperties.hxx
@@ -44,7 +44,7 @@ namespace sdr
virtual ~RectangleProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// set a new StyleSheet and broadcast
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override;
diff --git a/svx/inc/sdr/properties/textproperties.hxx b/svx/inc/sdr/properties/textproperties.hxx
index df6715cd51f0..5e6482a4faf0 100644
--- a/svx/inc/sdr/properties/textproperties.hxx
+++ b/svx/inc/sdr/properties/textproperties.hxx
@@ -58,7 +58,7 @@ namespace sdr
virtual ~TextProperties() override;
// Clone() operator, normally just calls the local copy constructor
- virtual BaseProperties& Clone(SdrObject& rObj) const override;
+ virtual std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
// set a new StyleSheet and broadcast
virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) override;
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index a30b818fd706..eab25a1526f8 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -227,9 +227,9 @@ namespace sdr
ImpRemoveStyleSheet();
}
- BaseProperties& AttributeProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> AttributeProperties::Clone(SdrObject& rObj) const
{
- return *(new AttributeProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new AttributeProperties(*this, rObj));
}
const SfxItemSet& AttributeProperties::GetObjectItemSet() const
diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx
index d092374003b0..5e7d2d3304f6 100644
--- a/svx/source/sdr/properties/captionproperties.cxx
+++ b/svx/source/sdr/properties/captionproperties.cxx
@@ -59,9 +59,9 @@ namespace sdr
{
}
- BaseProperties& CaptionProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> CaptionProperties::Clone(SdrObject& rObj) const
{
- return *(new CaptionProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new CaptionProperties(*this, rObj));
}
void CaptionProperties::ItemSetChanged(const SfxItemSet& rSet)
diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx
index d8eca6fc5ea2..e0469fb3e2c9 100644
--- a/svx/source/sdr/properties/circleproperties.cxx
+++ b/svx/source/sdr/properties/circleproperties.cxx
@@ -63,9 +63,9 @@ namespace sdr
{
}
- BaseProperties& CircleProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> CircleProperties::Clone(SdrObject& rObj) const
{
- return *(new CircleProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new CircleProperties(*this, rObj));
}
void CircleProperties::ItemSetChanged(const SfxItemSet& rSet)
diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx
index c8f825a5f013..e8847dcc9ab6 100644
--- a/svx/source/sdr/properties/connectorproperties.cxx
+++ b/svx/source/sdr/properties/connectorproperties.cxx
@@ -60,9 +60,9 @@ namespace sdr
{
}
- BaseProperties& ConnectorProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> ConnectorProperties::Clone(SdrObject& rObj) const
{
- return *(new ConnectorProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new ConnectorProperties(*this, rObj));
}
void ConnectorProperties::ItemSetChanged(const SfxItemSet& rSet)
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx
index 95ab71fbddef..4a1d5dd0df09 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -195,9 +195,9 @@ namespace sdr
{
}
- BaseProperties& CustomShapeProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> CustomShapeProperties::Clone(SdrObject& rObj) const
{
- return *(new CustomShapeProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new CustomShapeProperties(*this, rObj));
}
void CustomShapeProperties::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx
index 5a798b5b4e1c..3aa307bc3018 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -88,9 +88,9 @@ namespace sdr
}
}
- BaseProperties& DefaultProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> DefaultProperties::Clone(SdrObject& rObj) const
{
- return *(new DefaultProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new DefaultProperties(*this, rObj));
}
DefaultProperties::~DefaultProperties() {}
diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx
index 7da70b568254..c19377f8e2d4 100644
--- a/svx/source/sdr/properties/e3dcompoundproperties.cxx
+++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx
@@ -41,9 +41,9 @@ namespace sdr
{
}
- BaseProperties& E3dCompoundProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> E3dCompoundProperties::Clone(SdrObject& rObj) const
{
- return *(new E3dCompoundProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new E3dCompoundProperties(*this, rObj));
}
const SfxItemSet& E3dCompoundProperties::GetMergedItemSet() const
diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx
index c511471a4f1c..9755e2d623a1 100644
--- a/svx/source/sdr/properties/e3dextrudeproperties.cxx
+++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx
@@ -40,9 +40,9 @@ namespace sdr
{
}
- BaseProperties& E3dExtrudeProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> E3dExtrudeProperties::Clone(SdrObject& rObj) const
{
- return *(new E3dExtrudeProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new E3dExtrudeProperties(*this, rObj));
}
void E3dExtrudeProperties::PostItemChange(const sal_uInt16 nWhich)
diff --git a/svx/source/sdr/properties/e3dlatheproperties.cxx b/svx/source/sdr/properties/e3dlatheproperties.cxx
index b8847d061eab..a12270f07dd6 100644
--- a/svx/source/sdr/properties/e3dlatheproperties.cxx
+++ b/svx/source/sdr/properties/e3dlatheproperties.cxx
@@ -40,9 +40,9 @@ namespace sdr
{
}
- BaseProperties& E3dLatheProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> E3dLatheProperties::Clone(SdrObject& rObj) const
{
- return *(new E3dLatheProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new E3dLatheProperties(*this, rObj));
}
void E3dLatheProperties::PostItemChange(const sal_uInt16 nWhich)
diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx
index e22c10d2ed5f..8666191f0c54 100644
--- a/svx/source/sdr/properties/e3dproperties.cxx
+++ b/svx/source/sdr/properties/e3dproperties.cxx
@@ -58,9 +58,9 @@ namespace sdr
{
}
- BaseProperties& E3dProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> E3dProperties::Clone(SdrObject& rObj) const
{
- return *(new E3dProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new E3dProperties(*this, rObj));
}
void E3dProperties::ItemSetChanged(const SfxItemSet& rSet)
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index a5f59940d51e..52f1207ebd44 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -44,9 +44,9 @@ namespace sdr
{
}
- BaseProperties& E3dSceneProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> E3dSceneProperties::Clone(SdrObject& rObj) const
{
- return *(new E3dSceneProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new E3dSceneProperties(*this, rObj));
}
const SfxItemSet& E3dSceneProperties::GetMergedItemSet() const
diff --git a/svx/source/sdr/properties/e3dsphereproperties.cxx b/svx/source/sdr/properties/e3dsphereproperties.cxx
index 6190b4bcbaa0..0fefba58697c 100644
--- a/svx/source/sdr/properties/e3dsphereproperties.cxx
+++ b/svx/source/sdr/properties/e3dsphereproperties.cxx
@@ -40,9 +40,9 @@ namespace sdr
{
}
- BaseProperties& E3dSphereProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> E3dSphereProperties::Clone(SdrObject& rObj) const
{
- return *(new E3dSphereProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new E3dSphereProperties(*this, rObj));
}
void E3dSphereProperties::PostItemChange(const sal_uInt16 nWhich)
diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx
index 458cf3b98f64..9cde4ca1e2d6 100644
--- a/svx/source/sdr/properties/emptyproperties.cxx
+++ b/svx/source/sdr/properties/emptyproperties.cxx
@@ -46,9 +46,9 @@ namespace sdr
{
}
- BaseProperties& EmptyProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> EmptyProperties::Clone(SdrObject& rObj) const
{
- return *(new EmptyProperties(rObj));
+ return std::unique_ptr<BaseProperties>(new EmptyProperties(rObj));
}
const SfxItemSet& EmptyProperties::GetObjectItemSet() const
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index 8ea829f85c5b..6c624a4108d3 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -64,9 +64,9 @@ namespace sdr
{
}
- BaseProperties& GraphicProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> GraphicProperties::Clone(SdrObject& rObj) const
{
- return *(new GraphicProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new GraphicProperties(*this, rObj));
}
void GraphicProperties::ItemSetChanged(const SfxItemSet& rSet)
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index a79f7cc9059a..857eea1fed73 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -57,9 +57,9 @@ namespace sdr
{
}
- BaseProperties& GroupProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> GroupProperties::Clone(SdrObject& rObj) const
{
- return *(new GroupProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new GroupProperties(*this, rObj));
}
const SfxItemSet& GroupProperties::GetObjectItemSet() const
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index f000080a27d9..ddf0159437b9 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -67,9 +67,9 @@ namespace sdr
{
}
- BaseProperties& MeasureProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> MeasureProperties::Clone(SdrObject& rObj) const
{
- return *(new MeasureProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new MeasureProperties(*this, rObj));
}
void MeasureProperties::ItemSetChanged(const SfxItemSet& rSet)
diff --git a/svx/source/sdr/properties/oleproperties.cxx b/svx/source/sdr/properties/oleproperties.cxx
index 634ca771b441..f740e9cc259b 100644
--- a/svx/source/sdr/properties/oleproperties.cxx
+++ b/svx/source/sdr/properties/oleproperties.cxx
@@ -42,9 +42,9 @@ namespace sdr
{
}
- BaseProperties& OleProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> OleProperties::Clone(SdrObject& rObj) const
{
- return *(new OleProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new OleProperties(*this, rObj));
}
void OleProperties::ForceDefaultAttributes()
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index a3a567698cee..51e11fa4c419 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -52,9 +52,9 @@ namespace sdr
{
}
- BaseProperties& PageProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> PageProperties::Clone(SdrObject& rObj) const
{
- return *(new PageProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new PageProperties(*this, rObj));
}
// get itemset. Override here to allow creating the empty itemset
diff --git a/svx/source/sdr/properties/rectangleproperties.cxx b/svx/source/sdr/properties/rectangleproperties.cxx
index c1d9c381737f..fa6d8b39091e 100644
--- a/svx/source/sdr/properties/rectangleproperties.cxx
+++ b/svx/source/sdr/properties/rectangleproperties.cxx
@@ -39,9 +39,9 @@ namespace sdr
{
}
- BaseProperties& RectangleProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> RectangleProperties::Clone(SdrObject& rObj) const
{
- return *(new RectangleProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new RectangleProperties(*this, rObj));
}
void RectangleProperties::ItemSetChanged(const SfxItemSet& rSet)
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index f6e1aba0b791..aac5e1b59a2d 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -74,9 +74,9 @@ namespace sdr
{
}
- BaseProperties& TextProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> TextProperties::Clone(SdrObject& rObj) const
{
- return *(new TextProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new TextProperties(*this, rObj));
}
void TextProperties::ItemSetChanged(const SfxItemSet& rSet)
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 9c65c42447bb..5ec98ef00b9c 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -950,7 +950,7 @@ SdrObject& SdrObject::operator=(const SdrObject& rObj)
// The Clone() method uses the local copy constructor from the individual
// sdr::properties::BaseProperties class. Since the target class maybe for another
// draw object, an SdrObject needs to be provided, as in the normal constructor.
- mpProperties.reset( &rObj.GetProperties().Clone(*this) );
+ mpProperties = rObj.GetProperties().Clone(*this);
pPage = rObj.pPage;
aOutRect=rObj.aOutRect;
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 0f733d0c6e5d..5d8484944758 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -162,7 +162,7 @@ namespace sdr
CellProperties(const CellProperties& rProps, SdrObject& rObj, sdr::table::Cell* pCell);
// Clone() operator, normally just calls the local copy constructor
- BaseProperties& Clone(SdrObject& rObj) const override;
+ std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
void ForceDefaultAttributes() override;
@@ -212,10 +212,10 @@ namespace sdr
{
}
- BaseProperties& CellProperties::Clone(SdrObject& rObj) const
+ std::unique_ptr<BaseProperties> CellProperties::Clone(SdrObject& rObj) const
{
OSL_FAIL("CellProperties::Clone(), does not work yet!");
- return *(new CellProperties(*this, rObj,nullptr));
+ return std::unique_ptr<BaseProperties>(new CellProperties(*this, rObj,nullptr));
}
void CellProperties::ForceDefaultAttributes()
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index f8b23626b281..344faa784c11 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -96,7 +96,7 @@ public:
TableProperties(const TableProperties& rProps, SdrObject& rObj );
// Clone() operator, normally just calls the local copy constructor
- BaseProperties& Clone(SdrObject& rObj) const override;
+ std::unique_ptr<BaseProperties> Clone(SdrObject& rObj) const override;
virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override;
};
@@ -111,9 +111,9 @@ TableProperties::TableProperties(const TableProperties& rProps, SdrObject& rObj)
{
}
-BaseProperties& TableProperties::Clone(SdrObject& rObj) const
+std::unique_ptr<BaseProperties> TableProperties::Clone(SdrObject& rObj) const
{
- return *(new TableProperties(*this, rObj));
+ return std::unique_ptr<BaseProperties>(new TableProperties(*this, rObj));
}
void TableProperties::ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem)