diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-11 10:35:58 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-11 13:28:35 +0200 |
commit | 1c0e591accda7669bec9ccfc23977ce3f7386930 (patch) | |
tree | 9d7ae6738b9bbbe3790d6803b5b927f3cdade9ab /include | |
parent | make EditPosition::Clone return std::unique_ptr (diff) | |
download | core-1c0e591accda7669bec9ccfc23977ce3f7386930.tar.gz core-1c0e591accda7669bec9ccfc23977ce3f7386930.zip |
SvxFieldData wants to be held by tools::SvRef
Change-Id: If4f098341ed4f0b47a755a4722f0eace56235502
Reviewed-on: https://gerrit.libreoffice.org/52713
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/editeng/CustomPropertyField.hxx | 2 | ||||
-rw-r--r-- | include/editeng/flditem.hxx | 30 | ||||
-rw-r--r-- | include/editeng/measfld.hxx | 2 | ||||
-rw-r--r-- | include/svx/ClassificationField.hxx | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/include/editeng/CustomPropertyField.hxx b/include/editeng/CustomPropertyField.hxx index 2a06592b9c36..5ee612cc74a7 100644 --- a/include/editeng/CustomPropertyField.hxx +++ b/include/editeng/CustomPropertyField.hxx @@ -36,7 +36,7 @@ public: SV_DECL_PERSIST1(CustomPropertyField, css::text::textfield::Type::DOCINFO_CUSTOM) - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==(const SvxFieldData&) const override; virtual MetaAction* createBeginComment() const override; diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 06424ee34418..413d59148c2b 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -52,7 +52,7 @@ public: SvxFieldData(); virtual ~SvxFieldData() override; - virtual SvxFieldData* Clone() const; + virtual tools::SvRef<SvxFieldData> Clone() const; virtual bool operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; @@ -124,7 +124,7 @@ public: OUString GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const; static OUString GetFormatted( Date const & rDate, SvxDateFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==( const SvxFieldData& ) const override; virtual MetaAction* createBeginComment() const override; @@ -163,7 +163,7 @@ public: SvxURLFormat GetFormat() const { return eFormat; } void SetFormat( SvxURLFormat eFmt ) { eFormat = eFmt; } - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==( const SvxFieldData& ) const override; virtual MetaAction* createBeginComment() const override; @@ -175,7 +175,7 @@ public: SV_DECL_PERSIST1( SvxPageField, css::text::textfield::Type::PAGE ) SvxPageField(); - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==( const SvxFieldData& ) const override; virtual MetaAction* createBeginComment() const override; @@ -187,7 +187,7 @@ public: SV_DECL_PERSIST1( SvxPageTitleField, css::text::textfield::Type::PAGE_NAME ) SvxPageTitleField(); - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==( const SvxFieldData& ) const override; virtual MetaAction* createBeginComment() const override; @@ -199,7 +199,7 @@ public: SV_DECL_PERSIST1( SvxPagesField, css::text::textfield::Type::PAGES ) SvxPagesField(); - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==( const SvxFieldData& ) const override; }; @@ -209,7 +209,7 @@ public: SV_DECL_PERSIST1( SvxTimeField, css::text::textfield::Type::TIME ) SvxTimeField(); - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==( const SvxFieldData& ) const override; virtual MetaAction* createBeginComment() const override; @@ -221,7 +221,7 @@ public: SV_DECL_PERSIST1( SvxFileField, css::text::textfield::Type::DOCINFO_TITLE ) SvxFileField(); - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==( const SvxFieldData& ) const override; }; @@ -236,7 +236,7 @@ public: void SetTab(int nTab); int GetTab() const { return mnTab;} - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==( const SvxFieldData& ) const override; }; @@ -288,7 +288,7 @@ public: OUString GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLanguage ) const; static OUString GetFormatted( tools::Time const & rTime, SvxTimeFormat eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==( const SvxFieldData& ) const override; virtual MetaAction* createBeginComment() const override; @@ -332,7 +332,7 @@ public: OUString GetFormatted() const; - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==( const SvxFieldData& ) const override; }; @@ -373,7 +373,7 @@ public: OUString GetFormatted() const; - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==( const SvxFieldData& ) const override; }; @@ -385,7 +385,7 @@ public: SV_DECL_PERSIST1( SvxHeaderField, css::text::textfield::Type::PRESENTATION_HEADER ) SvxHeaderField(); - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==( const SvxFieldData& ) const override; }; @@ -396,7 +396,7 @@ class EDITENG_DLLPUBLIC SvxFooterField final: public SvxFieldData public: SV_DECL_PERSIST1( SvxFooterField, css::text::textfield::Type::PRESENTATION_FOOTER ) SvxFooterField(); - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==( const SvxFieldData& ) const override; }; @@ -412,7 +412,7 @@ public: SvxDateFormat eDateFormat, SvxTimeFormat eTimeFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage ); - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==( const SvxFieldData& ) const override; }; diff --git a/include/editeng/measfld.hxx b/include/editeng/measfld.hxx index c7f9107c6a5e..40715662566f 100644 --- a/include/editeng/measfld.hxx +++ b/include/editeng/measfld.hxx @@ -35,7 +35,7 @@ public: SV_DECL_PERSIST1(SdrMeasureField, css::text::textfield::Type::MEASURE) SdrMeasureField(SdrMeasureFieldKind eNewKind): eMeasureFieldKind(eNewKind) {} virtual ~SdrMeasureField() override; - virtual SvxFieldData* Clone() const override; + virtual tools::SvRef<SvxFieldData> Clone() const override; virtual bool operator==(const SvxFieldData&) const override; SdrMeasureFieldKind GetMeasureFieldKind() const { return eMeasureFieldKind; } }; diff --git a/include/svx/ClassificationField.hxx b/include/svx/ClassificationField.hxx index 3eb4955dd1f1..b8e6ff71d382 100644 --- a/include/svx/ClassificationField.hxx +++ b/include/svx/ClassificationField.hxx @@ -74,7 +74,7 @@ public: , msIdentifier(sIdentifier) {} - ClassificationField* Clone() const override + tools::SvRef<SvxFieldData> Clone() const override { return new ClassificationField(meType, msDescription, msFullClassName, msIdentifier); } |