diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-27 10:45:33 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-28 07:40:21 +0100 |
commit | d337731d4f7017d51fab08f0edbac1effc9baf90 (patch) | |
tree | dc9396aecf2d93e5d7892584475a170c1ba17cbb /sw/inc | |
parent | 2115482443be58ca21b38ac06c69627fdd04ecc1 (diff) |
return by unique_ptr from SwFieldType::Copy
Change-Id: I145b55c9cd62a5853c0dd26cc9b805b9f3a0e436
Reviewed-on: https://gerrit.libreoffice.org/69854
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/authfld.hxx | 2 | ||||
-rw-r--r-- | sw/inc/chpfld.hxx | 2 | ||||
-rw-r--r-- | sw/inc/dbfld.hxx | 10 | ||||
-rw-r--r-- | sw/inc/ddefld.hxx | 2 | ||||
-rw-r--r-- | sw/inc/docufld.hxx | 32 | ||||
-rw-r--r-- | sw/inc/expfld.hxx | 8 | ||||
-rw-r--r-- | sw/inc/fldbas.hxx | 2 | ||||
-rw-r--r-- | sw/inc/flddat.hxx | 2 | ||||
-rw-r--r-- | sw/inc/flddropdown.hxx | 2 | ||||
-rw-r--r-- | sw/inc/reffld.hxx | 2 | ||||
-rw-r--r-- | sw/inc/usrfld.hxx | 2 |
11 files changed, 33 insertions, 33 deletions
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index df836c5889e2..ea92f4289d9b 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -75,7 +75,7 @@ public: SwAuthorityFieldType(SwDoc* pDoc); virtual ~SwAuthorityFieldType() override; - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; virtual void QueryValue( css::uno::Any& rVal, sal_uInt16 nWhichId ) const override; virtual void PutValue( const css::uno::Any& rVal, sal_uInt16 nWhichId ) override; diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx index db7f7d528c82..2eab37afe536 100644 --- a/sw/inc/chpfld.hxx +++ b/sw/inc/chpfld.hxx @@ -41,7 +41,7 @@ class SW_DLLPUBLIC SwChapterFieldType : public SwFieldType public: SwChapterFieldType(); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index ae974501d283..0145c9171d93 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -39,7 +39,7 @@ public: virtual ~SwDBFieldType() override; virtual OUString GetName() const override; - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; void AddRef() { m_nRefCnt++; } void ReleaseRef(); @@ -151,7 +151,7 @@ class SW_DLLPUBLIC SwDBNextSetFieldType : public SwFieldType public: SwDBNextSetFieldType(); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; // Next data record with condition. @@ -190,7 +190,7 @@ class SwDBNumSetFieldType : public SwFieldType public: SwDBNumSetFieldType(); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; // Data record with number xxx. @@ -238,7 +238,7 @@ public: SwDBNameFieldType(SwDoc*); OUString Expand() const; - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; // Database field. @@ -259,7 +259,7 @@ class SW_DLLPUBLIC SwDBSetNumberFieldType : public SwFieldType public: SwDBSetNumberFieldType(); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; // Database field. diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index b4c306c1d2a8..8334adbda7ad 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -70,7 +70,7 @@ public: void SetExpansion( const OUString& rStr ) { aExpansion = rStr; bCRLFFlag = false; } - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; virtual OUString GetName() const override; virtual void QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index d7316a224224..d6ff1692e5bf 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -135,7 +135,7 @@ public: sal_uInt16 const nMaxPage, const OUString&, LanguageType = LANGUAGE_NONE ) const; void ChangeExpansion( SwDoc* pDoc, bool bVirtPageNum, const SvxNumType* pNumFormat ); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; // Page numbering. @@ -177,7 +177,7 @@ public: SwAuthorFieldType(); static OUString Expand(sal_uLong); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; class SwAuthorField : public SwField @@ -203,7 +203,7 @@ public: SwFileNameFieldType(SwDoc*); OUString Expand(sal_uLong) const; - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; class SW_DLLPUBLIC SwFileNameField : public SwField @@ -229,7 +229,7 @@ public: SwTemplNameFieldType(SwDoc*); OUString Expand(sal_uLong) const; - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; class SW_DLLPUBLIC SwTemplNameField : public SwField @@ -252,7 +252,7 @@ class SwDocStatFieldType : public SwFieldType public: SwDocStatFieldType(SwDoc*); OUString Expand(sal_uInt16 nSubType, SvxNumType nFormat) const; - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; void SetNumFormat( SvxNumType eFormat ) { m_nNumberingType = eFormat; } }; @@ -282,7 +282,7 @@ class SwHiddenTextFieldType : public SwFieldType public: SwHiddenTextFieldType(bool bSetHidden = true); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; void SetHiddenFlag( bool bSetHidden ); bool GetHiddenFlag() const { return m_bHidden; } @@ -351,7 +351,7 @@ class SwHiddenParaFieldType : public SwFieldType public: SwHiddenParaFieldType(); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; class SwHiddenParaField : public SwField @@ -382,7 +382,7 @@ class SwMacroFieldType : public SwFieldType public: SwMacroFieldType(SwDoc*); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; class SW_DLLPUBLIC SwMacroField : public SwField @@ -430,7 +430,7 @@ private: public: SwPostItFieldType(SwDoc* pDoc); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; SwDoc* GetDoc() const { @@ -502,7 +502,7 @@ public: SwDocInfoFieldType(SwDoc* pDc); OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFormat, LanguageType nLang, const OUString& rName) const; - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; class SW_DLLPUBLIC SwDocInfoField : public SwValueField @@ -536,7 +536,7 @@ public: SwExtUserFieldType(); static OUString Expand(sal_uInt16 nSubType); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; class SwExtUserField : public SwField @@ -565,7 +565,7 @@ class SwRefPageSetFieldType : public SwFieldType public: SwRefPageSetFieldType(); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; protected: /// Overlay, because there is nothing to update! @@ -609,7 +609,7 @@ protected: virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) override; public: SwRefPageGetFieldType( SwDoc* pDoc ); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; bool MakeSetList(SetGetExpFields& rTmpLst, SwRootFrame const* pLayout); SwDoc* GetDoc() const { return m_pDoc; } }; @@ -641,7 +641,7 @@ class SwJumpEditFieldType : public SwFieldType public: SwJumpEditFieldType( SwDoc* pDoc ); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; SwCharFormat* GetCharFormat(); }; @@ -677,7 +677,7 @@ class SwScriptFieldType : public SwFieldType public: SwScriptFieldType( SwDoc* pDoc ); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; class SwScriptField : public SwField @@ -716,7 +716,7 @@ class SwCombinedCharFieldType : public SwFieldType public: SwCombinedCharFieldType(); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; // ScriptField diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 1f1c53c72d94..23d00b3d9fbb 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -71,7 +71,7 @@ class SwGetExpFieldType : public SwValueFieldType { public: SwGetExpFieldType(SwDoc* pDoc); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; /** Overlay, because get-field cannot be changed and therefore does not need to be updated. Update at changing of set-values! */ @@ -155,7 +155,7 @@ protected: public: SwSetExpFieldType( SwDoc* pDoc, const OUString& rName, sal_uInt16 nType = nsSwGetSetExpType::GSE_EXPR ); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; virtual OUString GetName() const override; inline void SetType(sal_uInt16 nTyp); @@ -274,7 +274,7 @@ class SwInputFieldType : public SwFieldType public: SwInputFieldType( SwDoc* pDoc ); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; SwDoc* GetDoc() const { return mpDoc; } }; @@ -368,7 +368,7 @@ class SwTableFieldType : public SwValueFieldType { public: SwTableFieldType(SwDoc* pDocPtr); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; class SwTableField : public SwValueField, public SwTableFormula diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 745c640e73ab..aafce0c4c718 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -258,7 +258,7 @@ public: /// Only in derived classes. virtual OUString GetName() const; - virtual SwFieldType* Copy() const = 0; + virtual std::unique_ptr<SwFieldType> Copy() const = 0; virtual void QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const; virtual void PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ); diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index b2896729b8bd..38ea963196b9 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -37,7 +37,7 @@ class SwDateTimeFieldType : public SwValueFieldType public: SwDateTimeFieldType(SwDoc* pDoc); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; }; class SW_DLLPUBLIC SwDateTimeField : public SwValueField diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx index b42445afa2ed..cc29a2e84c7f 100644 --- a/sw/inc/flddropdown.hxx +++ b/sw/inc/flddropdown.hxx @@ -46,7 +46,7 @@ public: @return a copy of this type */ - virtual SwFieldType * Copy () const override; + virtual std::unique_ptr<SwFieldType> Copy () const override; }; /** diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index 634642c4a47c..4adf0becfc31 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -68,7 +68,7 @@ protected: virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override; public: SwGetRefFieldType(SwDoc* pDoc ); - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; SwDoc* GetDoc() const { return m_pDoc; } diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index 80ab6c257c90..7723cf3a903c 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -47,7 +47,7 @@ public: SwUserFieldType( SwDoc* pDocPtr, const OUString& ); virtual OUString GetName() const override; - virtual SwFieldType* Copy() const override; + virtual std::unique_ptr<SwFieldType> Copy() const override; OUString Expand(sal_uInt32 nFormat, sal_uInt16 nSubType, LanguageType nLng); |