[Libreoffice-commits] core.git: editeng/source include/editeng include/svx sc/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Apr 11 11:28:58 UTC 2018
editeng/source/items/CustomPropertyField.cxx | 2 -
editeng/source/items/flditem.cxx | 30 +++++++++++++--------------
editeng/source/items/svdfield.cxx | 2 -
include/editeng/CustomPropertyField.hxx | 2 -
include/editeng/flditem.hxx | 30 +++++++++++++--------------
include/editeng/measfld.hxx | 2 -
include/svx/ClassificationField.hxx | 2 -
sc/source/ui/unoobj/fielduno.cxx | 6 ++---
8 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit 1c0e591accda7669bec9ccfc23977ce3f7386930
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Apr 11 10:35:58 2018 +0200
SvxFieldData wants to be held by tools::SvRef
Change-Id: If4f098341ed4f0b47a755a4722f0eace56235502
Reviewed-on: https://gerrit.libreoffice.org/52713
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/editeng/source/items/CustomPropertyField.cxx b/editeng/source/items/CustomPropertyField.cxx
index 621272150fac..e8ef53ceebb2 100644
--- a/editeng/source/items/CustomPropertyField.cxx
+++ b/editeng/source/items/CustomPropertyField.cxx
@@ -29,7 +29,7 @@ CustomPropertyField::~CustomPropertyField()
SV_IMPL_PERSIST1(CustomPropertyField);
-SvxFieldData* CustomPropertyField::Clone() const
+tools::SvRef<SvxFieldData> CustomPropertyField::Clone() const
{
return new CustomPropertyField(msName, msCurrentPresentation);
}
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 21baa1593ee6..d90fbc522688 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -252,7 +252,7 @@ SvxFieldData::~SvxFieldData()
}
-SvxFieldData* SvxFieldData::Clone() const
+tools::SvRef<SvxFieldData> SvxFieldData::Clone() const
{
return new SvxFieldData;
}
@@ -338,7 +338,7 @@ SvxDateField::SvxDateField( const Date& rDate, SvxDateType eT, SvxDateFormat eF
}
-SvxFieldData* SvxDateField::Clone() const
+tools::SvRef<SvxFieldData> SvxDateField::Clone() const
{
return new SvxDateField( *this );
}
@@ -449,7 +449,7 @@ SvxURLField::SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLF
}
-SvxFieldData* SvxURLField::Clone() const
+tools::SvRef<SvxFieldData> SvxURLField::Clone() const
{
return new SvxURLField( *this );
}
@@ -485,7 +485,7 @@ SV_IMPL_PERSIST1( SvxPageTitleField );
SvxPageTitleField::SvxPageTitleField() {}
-SvxFieldData* SvxPageTitleField::Clone() const
+tools::SvRef<SvxFieldData> SvxPageTitleField::Clone() const
{
return new SvxPageTitleField();
}
@@ -510,7 +510,7 @@ SV_IMPL_PERSIST1( SvxPageField );
SvxPageField::SvxPageField() {}
-SvxFieldData* SvxPageField::Clone() const
+tools::SvRef<SvxFieldData> SvxPageField::Clone() const
{
return new SvxPageField; // empty
}
@@ -530,7 +530,7 @@ SV_IMPL_PERSIST1( SvxPagesField );
SvxPagesField::SvxPagesField() {}
-SvxFieldData* SvxPagesField::Clone() const
+tools::SvRef<SvxFieldData> SvxPagesField::Clone() const
{
return new SvxPagesField; // empty
}
@@ -544,7 +544,7 @@ SV_IMPL_PERSIST1( SvxTimeField );
SvxTimeField::SvxTimeField() {}
-SvxFieldData* SvxTimeField::Clone() const
+tools::SvRef<SvxFieldData> SvxTimeField::Clone() const
{
return new SvxTimeField; // empty
}
@@ -563,7 +563,7 @@ SV_IMPL_PERSIST1( SvxFileField );
SvxFileField::SvxFileField() {}
-SvxFieldData* SvxFileField::Clone() const
+tools::SvRef<SvxFieldData> SvxFileField::Clone() const
{
return new SvxFileField; // empty
}
@@ -585,7 +585,7 @@ void SvxTableField::SetTab(int nTab)
}
-SvxFieldData* SvxTableField::Clone() const
+tools::SvRef<SvxFieldData> SvxTableField::Clone() const
{
return new SvxTableField(mnTab);
}
@@ -620,7 +620,7 @@ SvxExtTimeField::SvxExtTimeField( const tools::Time& rTime, SvxTimeType eT, SvxT
}
-SvxFieldData* SvxExtTimeField::Clone() const
+tools::SvRef<SvxFieldData> SvxExtTimeField::Clone() const
{
return new SvxExtTimeField( *this );
}
@@ -736,7 +736,7 @@ SvxExtFileField::SvxExtFileField( const OUString& rStr, SvxFileType eT, SvxFileF
}
-SvxFieldData* SvxExtFileField::Clone() const
+tools::SvRef<SvxFieldData> SvxExtFileField::Clone() const
{
return new SvxExtFileField( *this );
}
@@ -849,7 +849,7 @@ SvxAuthorField::SvxAuthorField( const OUString& rFirstName,
}
-SvxFieldData* SvxAuthorField::Clone() const
+tools::SvRef<SvxFieldData> SvxAuthorField::Clone() const
{
return new SvxAuthorField( *this );
}
@@ -898,7 +898,7 @@ SV_IMPL_PERSIST1( SvxHeaderField );
SvxHeaderField::SvxHeaderField() {}
-SvxFieldData* SvxHeaderField::Clone() const
+tools::SvRef<SvxFieldData> SvxHeaderField::Clone() const
{
return new SvxHeaderField; // empty
}
@@ -912,7 +912,7 @@ SV_IMPL_PERSIST1( SvxFooterField );
SvxFooterField::SvxFooterField() {}
-SvxFieldData* SvxFooterField::Clone() const
+tools::SvRef<SvxFieldData> SvxFooterField::Clone() const
{
return new SvxFooterField; // empty
}
@@ -924,7 +924,7 @@ bool SvxFooterField::operator==( const SvxFieldData& rCmp ) const
SV_IMPL_PERSIST1( SvxDateTimeField );
-SvxFieldData* SvxDateTimeField::Clone() const
+tools::SvRef<SvxFieldData> SvxDateTimeField::Clone() const
{
return new SvxDateTimeField; // empty
}
diff --git a/editeng/source/items/svdfield.cxx b/editeng/source/items/svdfield.cxx
index 9ff72de11fdd..e448126b5d39 100644
--- a/editeng/source/items/svdfield.cxx
+++ b/editeng/source/items/svdfield.cxx
@@ -26,7 +26,7 @@ SdrMeasureField::~SdrMeasureField()
{
}
-SvxFieldData* SdrMeasureField::Clone() const
+tools::SvRef<SvxFieldData> SdrMeasureField::Clone() const
{
return new SdrMeasureField(*this);
}
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);
}
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 6b00a69097e6..eeda77b2e53c 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -167,7 +167,7 @@ class ScUnoEditEngine : public ScEditEngineDefaulter
ScUnoCollectMode eMode;
sal_uInt16 nFieldCount;
sal_Int32 mnFieldType;
- std::unique_ptr<SvxFieldData>
+ tools::SvRef<SvxFieldData>
pFound; // local copy
sal_Int32 nFieldPar;
sal_Int32 nFieldPos;
@@ -214,14 +214,14 @@ OUString ScUnoEditEngine::CalcFieldValue( const SvxFieldItem& rField,
{
if ( eMode == SC_UNO_COLLECT_FINDINDEX && !pFound && nFieldCount == nFieldIndex )
{
- pFound.reset( pFieldData->Clone() );
+ pFound = pFieldData->Clone();
nFieldPar = nPara;
nFieldPos = nPos;
}
if ( eMode == SC_UNO_COLLECT_FINDPOS && !pFound &&
nPara == nFieldPar && nPos == nFieldPos )
{
- pFound.reset( pFieldData->Clone() );
+ pFound = pFieldData->Clone();
nFieldIndex = nFieldCount;
}
++nFieldCount;
More information about the Libreoffice-commits
mailing list