diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-11 13:10:57 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-12 08:46:04 +0200 |
commit | b0a2ab4c68fa11b0a713583946718a60fda19c0c (patch) | |
tree | a7ef8c410ccebd4a97d4d03566934f90d655d15d /svx/inc/sdr/properties | |
parent | d1ae2387c729ac8a0e616c57075174eb0d06d389 (diff) |
make BaseProperties::Clone return std::unique_ptr
Change-Id: Iab4fb31c975bc19ccd895df9de79c0ad055027c0
Reviewed-on: https://gerrit.libreoffice.org/52746
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/inc/sdr/properties')
19 files changed, 19 insertions, 19 deletions
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; |