diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-02 14:21:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-04 10:07:00 +0200 |
| commit | 5ad5f5ec62cc259f054b7343d7b4edce372e95e2 (patch) | |
| tree | 3a7dc8956afc8841d7c7a30e37a7674496ce1557 /sd | |
| parent | 2bffccf7af58a4c076c597f847eed2068574e704 (diff) | |
make CreateStyleFamilies return std::unique_ptr
Change-Id: Ibb7bec9ede8045a6cea42c02f61f14ad36d2b434
Reviewed-on: https://gerrit.libreoffice.org/53730
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/sdmod.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/app/sdmod2.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 74160c6a512b..3196bafe07da 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -111,7 +111,7 @@ public: virtual std::unique_ptr<SfxItemSet> CreateItemSet( sal_uInt16 nId ) override; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override; virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override; - virtual SfxStyleFamilies* CreateStyleFamilies() override; + virtual std::unique_ptr<SfxStyleFamilies> CreateStyleFamilies() override; SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache; SdExtPropertySetInfoCache gImplDrawPropertySetInfoCache; diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 6392abf9bc5d..e3291634a35e 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -808,9 +808,9 @@ VclPtr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParen return pRet; } -SfxStyleFamilies* SdModule::CreateStyleFamilies() +std::unique_ptr<SfxStyleFamilies> SdModule::CreateStyleFamilies() { - SfxStyleFamilies *pStyleFamilies = new SfxStyleFamilies; + std::unique_ptr<SfxStyleFamilies> pStyleFamilies(new SfxStyleFamilies); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, SdResId(STR_GRAPHICS_STYLE_FAMILY), |