diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-11 09:56:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-11 14:08:27 +0200 |
| commit | e5246409cc384cd2ba321620e92250f7ddf153af (patch) | |
| tree | eae4b87b9df1918bc69e081d87449a34ef483a99 /include | |
| parent | SvxFieldData wants to be held by tools::SvRef (diff) | |
| download | core-e5246409cc384cd2ba321620e92250f7ddf153af.tar.gz core-e5246409cc384cd2ba321620e92250f7ddf153af.zip | |
return std::unique_ptr from SfxItemSet::Clone
Change-Id: Ie747b5c8ff0b82b9f8d268f9a60dbde41b5f022b
Reviewed-on: https://gerrit.libreoffice.org/52712
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/prnmon.hxx | 2 | ||||
| -rw-r--r-- | include/sfx2/tabdlg.hxx | 4 | ||||
| -rw-r--r-- | include/svl/itemset.hxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx index 22ff12fd2501..4f1bacd93e80 100644 --- a/include/sfx2/prnmon.hxx +++ b/include/sfx2/prnmon.hxx @@ -37,7 +37,7 @@ class SfxPrintOptionsDialog : public ModalDialog private: std::unique_ptr<SfxPrintOptDlg_Impl> pDlgImpl; SfxViewShell* pViewSh; - SfxItemSet* pOptions; + std::unique_ptr<SfxItemSet> pOptions; VclPtr<SfxTabPage> pPage; public: diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index ce7498c2182b..65eb615fe6f1 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -82,7 +82,7 @@ friend class SfxTabDialogUIObject; bool m_bOwnsBaseFmtBtn; SfxItemSet* m_pSet; - SfxItemSet* m_pOutSet; + std::unique_ptr<SfxItemSet> m_pOutSet; std::unique_ptr< TabDlg_Impl > m_pImpl; sal_uInt16* m_pRanges; sal_uInt16 m_nAppPageId; @@ -176,7 +176,7 @@ public: // may provide local slots converted by Map const sal_uInt16* GetInputRanges( const SfxItemPool& ); void SetInputSet( const SfxItemSet* pInSet ); - const SfxItemSet* GetOutputItemSet() const { return m_pOutSet; } + const SfxItemSet* GetOutputItemSet() const { return m_pOutSet.get(); } const PushButton& GetOKButton() const { return *m_pOKBtn; } PushButton& GetOKButton() { return *m_pOKBtn; } diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index c8e32863ba84..12daca908fbd 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -126,7 +126,7 @@ public: SfxItemSet( SfxItemPool&, const sal_uInt16* nWhichPairTable ); virtual ~SfxItemSet(); - virtual SfxItemSet * Clone(bool bItems = true, SfxItemPool *pToPool = nullptr) const; + virtual std::unique_ptr<SfxItemSet> Clone(bool bItems = true, SfxItemPool *pToPool = nullptr) const; // Get number of items sal_uInt16 Count() const { return m_nCount; } @@ -251,7 +251,7 @@ public: SfxAllItemSet( const SfxItemSet & ); SfxAllItemSet( const SfxAllItemSet & ); - virtual SfxItemSet * Clone( bool bItems = true, SfxItemPool *pToPool = nullptr ) const override; + virtual std::unique_ptr<SfxItemSet> Clone( bool bItems = true, SfxItemPool *pToPool = nullptr ) const override; virtual const SfxPoolItem* Put( const SfxPoolItem&, sal_uInt16 nWhich ) override; using SfxItemSet::Put; }; |