diff options
Diffstat (limited to 'svx/source')
23 files changed, 47 insertions, 47 deletions
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) |