summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2018-07-07 09:29:38 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-07-07 12:42:37 +0200
commit363146254bd44ab82d657f2ca0293d03bd111280 (patch)
tree41e76c63ca1887e8171f9a4e15d7f138bf48bccc /include
parentd4b1f51f99fcb2a6d550f667df14e99983ab9d8c (diff)
use std::unique_ptr fo CreateObjectSpecificProperties
Change-Id: Ica82eca48719f12535757c81e95d788fe0aaa48e Reviewed-on: https://gerrit.libreoffice.org/57110 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r--include/svx/extrud3d.hxx2
-rw-r--r--include/svx/lathe3d.hxx2
-rw-r--r--include/svx/obj3d.hxx4
-rw-r--r--include/svx/scene3d.hxx2
-rw-r--r--include/svx/sphere3d.hxx2
-rw-r--r--include/svx/svdoashp.hxx2
-rw-r--r--include/svx/svdoattr.hxx2
-rw-r--r--include/svx/svdobj.hxx2
-rw-r--r--include/svx/svdocapt.hxx2
-rw-r--r--include/svx/svdocirc.hxx2
-rw-r--r--include/svx/svdoedge.hxx2
-rw-r--r--include/svx/svdograf.hxx2
-rw-r--r--include/svx/svdogrp.hxx2
-rw-r--r--include/svx/svdomeas.hxx2
-rw-r--r--include/svx/svdoole2.hxx2
-rw-r--r--include/svx/svdopage.hxx2
-rw-r--r--include/svx/svdorect.hxx2
-rw-r--r--include/svx/svdotable.hxx2
-rw-r--r--include/svx/svdotext.hxx2
19 files changed, 20 insertions, 20 deletions
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index 4bdb696decdf..d899b775c9dd 100644
--- a/include/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
@@ -39,7 +39,7 @@ private:
basegfx::B2DPolyPolygon maExtrudePolygon;
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
void SetDefaultAttributes(const E3dDefaultAttributes& rDefault);
private:
diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index 8875621dc4ea..fe240c1b22ca 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -38,7 +38,7 @@ class SVX_DLLPUBLIC E3dLatheObj final : public E3dCompoundObject
basegfx::B2DPolyPolygon maPolyPoly2D;
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
void SetDefaultAttributes(const E3dDefaultAttributes& rDefault);
private:
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index c452197053bd..6d24ed73fb59 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -79,7 +79,7 @@ private:
friend class E3dDragMethod;
protected:
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
basegfx::B3DRange maLocalBoundVol; // surrounding volume of the object (from the geometry generation)
basegfx::B3DHomMatrix maTransformation; // local transformation
@@ -173,7 +173,7 @@ private:
friend class sdr::properties::E3dSphereProperties;
protected:
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
// material of the object
Color aMaterialAmbientColor;
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index d3682c7369ff..0d81d44b9bc6 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -60,7 +60,7 @@ class Imp3DDepthRemapper;
class SVX_DLLPUBLIC E3dScene : public E3dObject, public SdrObjList
{
protected:
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
// transformations
diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx
index 490bf268942a..ae054923c9de 100644
--- a/include/svx/sphere3d.hxx
+++ b/include/svx/sphere3d.hxx
@@ -34,7 +34,7 @@ private:
basegfx::B3DVector aSize;
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
void SetDefaultAttributes(const E3dDefaultAttributes& rDefault);
private:
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index f88b67755257..ed90a91d79d0 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -84,7 +84,7 @@ protected:
virtual void impl_setUnoShape(const css::uno::Reference<css::uno::XInterface>& rxUnoShape) override;
public:
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
// to allow sdr::properties::CustomShapeProperties access
friend class sdr::properties::CustomShapeProperties;
diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx
index a39a91957841..ff0693f9759b 100644
--- a/include/svx/svdoattr.hxx
+++ b/include/svx/svdoattr.hxx
@@ -42,7 +42,7 @@ private:
friend class SdrOutliner;
protected:
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
tools::Rectangle maSnapRect;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index fa3a9cfff7b8..a7a80105122b 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -949,7 +949,7 @@ protected:
virtual ~SdrObject() override;
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties();
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties();
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact();
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index 6791cf95d218..b75d4867b8e1 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -47,7 +47,7 @@ private:
friend class SdrTextObj; // for ImpRecalcTail() during AutoGrow
protected:
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
private:
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index 62fa7c8be431..8ce5681094b4 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -48,7 +48,7 @@ private:
SdrObjKind GetCircleKind() const { return meCircleKind; }
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
SdrObjKind meCircleKind;
long nStartAngle;
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index 723741ef12a1..d1f84cb49f6d 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -137,7 +137,7 @@ private:
protected:
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
SdrObjConnection aCon1; // Connection status of the beginning of the line
SdrObjConnection aCon2; // Connection status of the end of the line
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 6a146934ad5d..c609df2ba2b1 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -86,7 +86,7 @@ private:
friend class SdrGraphicLink;
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
void ImpSetAttrToGrafInfo(); // Copy values from the pool
GraphicAttr aGrafInfo;
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index 351000746e0a..c0c6cabe6410 100644
--- a/include/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
@@ -33,7 +33,7 @@ class SVX_DLLPUBLIC SdrObjGroup final : public SdrObject, public SdrObjList
{
private:
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
Point aRefPoint; // Reference point inside the object group
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 6e3e6afdf455..409dbbf92d9c 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -53,7 +53,7 @@ private:
protected:
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
Point aPt1;
Point aPt2;
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index a0bb2c385df9..59adef7e4ca5 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -63,7 +63,7 @@ private:
protected:
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
// protected destructor
virtual ~SdrOle2Obj() override;
diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx
index c666e552e56e..994d523a1f4f 100644
--- a/include/svx/svdopage.hxx
+++ b/include/svx/svdopage.hxx
@@ -38,7 +38,7 @@ private:
protected:
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
// protected destructor
virtual ~SdrPageObj() override;
diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx
index ac015cb498c0..15d5c3672f9b 100644
--- a/include/svx/svdorect.hxx
+++ b/include/svx/svdorect.hxx
@@ -45,7 +45,7 @@ private:
protected:
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
std::unique_ptr<XPolygon> mpXPoly;
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 8d9c03a3c5da..6f52fde2a7dc 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -267,7 +267,7 @@ private:
void init( sal_Int32 nColumns, sal_Int32 nRows );
protected:
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
virtual SdrObjGeoData* NewGeoData() const override;
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index b7e606e11cfc..e89b0b340e11 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -147,7 +147,7 @@ private:
friend class sdr::properties::CustomShapeProperties;
protected:
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
+ virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override;
virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override;
private: