diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-06-13 13:48:18 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-06-13 13:48:18 +0200 |
| commit | 889ea6a50fb8ee154b2816ba287f33f0a3ce239b (patch) | |
| tree | e2fd7798fde578b3a4f9e02127be7b8596744adf /include | |
| parent | Handle SUMPRODUCT with reference list and array of references, tdf#58874 (diff) | |
| download | core-889ea6a50fb8ee154b2816ba287f33f0a3ce239b.tar.gz core-889ea6a50fb8ee154b2816ba287f33f0a3ce239b.zip | |
Let BaseProperties::CreateObjectSpecificItemSet return unique_ptr
Change-Id: Ic734fe2a425ca1c821ba91df17aecac5ef40a000
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/sdr/properties/defaultproperties.hxx | 2 | ||||
| -rw-r--r-- | include/svx/sdr/properties/properties.hxx | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx index 8d2b90009353..da78dcd9053a 100644 --- a/include/svx/sdr/properties/defaultproperties.hxx +++ b/include/svx/sdr/properties/defaultproperties.hxx @@ -40,7 +40,7 @@ namespace sdr std::unique_ptr<SfxItemSet> mpItemSet; // create a new itemset - virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& rPool) override; + virtual std::unique_ptr<SfxItemSet> CreateObjectSpecificItemSet(SfxItemPool& rPool) override; // test changeability for a single item virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) const override; diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx index 3a49400f5d76..7755f4fbc3fb 100644 --- a/include/svx/sdr/properties/properties.hxx +++ b/include/svx/sdr/properties/properties.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_SVX_SDR_PROPERTIES_PROPERTIES_HXX #define INCLUDED_SVX_SDR_PROPERTIES_PROPERTIES_HXX +#include <sal/config.h> + +#include <memory> + #include <sal/types.h> #include <svx/svxdllapi.h> @@ -53,7 +57,7 @@ namespace sdr protected: // create a new object specific itemset with object specific ranges. - virtual SfxItemSet* CreateObjectSpecificItemSet(SfxItemPool& pPool) = 0; + virtual std::unique_ptr<SfxItemSet> CreateObjectSpecificItemSet(SfxItemPool& pPool) = 0; // internal access to SdrObject const SdrObject& GetSdrObject() const; |