diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-23 14:45:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-24 15:37:37 +0200 |
| commit | ac8a1a146fa362ebe6849ae1a592a0629801971d (patch) | |
| tree | 1da15025f0b2ef6416e5146250a44a1bedf8c7c8 /chart2/source/inc | |
| parent | tdf#86619 Reintroduce Insert Caption to the table context menu (diff) | |
| download | core-ac8a1a146fa362ebe6849ae1a592a0629801971d.tar.gz core-ac8a1a146fa362ebe6849ae1a592a0629801971d.zip | |
pass WrappedProperty around by std::unique_ptr
Change-Id: Ifcd9606541d1157027ca49a351dbbbe0bf153b12
Reviewed-on: https://gerrit.libreoffice.org/57875
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/inc')
| -rw-r--r-- | chart2/source/inc/WrappedIgnoreProperty.hxx | 8 | ||||
| -rw-r--r-- | chart2/source/inc/WrappedProperty.hxx | 3 | ||||
| -rw-r--r-- | chart2/source/inc/WrappedPropertySet.hxx | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx index 2dfed48aa838..185e06d663a5 100644 --- a/chart2/source/inc/WrappedIgnoreProperty.hxx +++ b/chart2/source/inc/WrappedIgnoreProperty.hxx @@ -51,11 +51,11 @@ private: class OOO_DLLPUBLIC_CHARTTOOLS WrappedIgnoreProperties { public: - static void addIgnoreLineProperties( std::vector< WrappedProperty* >& rList ); + static void addIgnoreLineProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ); - static void addIgnoreFillProperties( std::vector< WrappedProperty* >& rList ); - SAL_DLLPRIVATE static void addIgnoreFillProperties_without_BitmapProperties( std::vector< WrappedProperty* >& rList ); - SAL_DLLPRIVATE static void addIgnoreFillProperties_only_BitmapProperties( std::vector< WrappedProperty* >& rList ); + static void addIgnoreFillProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ); + SAL_DLLPRIVATE static void addIgnoreFillProperties_without_BitmapProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ); + SAL_DLLPRIVATE static void addIgnoreFillProperties_only_BitmapProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ); }; } //namespace chart diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index cae7f323652e..b11ee8af312b 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -24,6 +24,7 @@ #include "charttoolsdllapi.hxx" #include <map> +#include <memory> namespace chart { @@ -74,7 +75,7 @@ protected: OUString m_aInnerName; }; -typedef std::map< sal_Int32, const WrappedProperty* > tWrappedPropertyMap; +typedef std::map< sal_Int32, std::unique_ptr<const WrappedProperty> > tWrappedPropertyMap; } //namespace chart diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index a0398bafe180..25ea8f5cbf92 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -92,7 +92,7 @@ protected: //methods The base class 'WrappedPropertySet' will take ownership on the contained pointer. It is not allowed to have duplicate entries in this list. */ - virtual const std::vector< WrappedProperty* > createWrappedProperties()=0; + virtual std::vector< std::unique_ptr<WrappedProperty> > createWrappedProperties()=0; virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() = 0; SAL_DLLPRIVATE css::uno::Reference< css::beans::XPropertyState > getInnerPropertyState(); |