Kaydet (Commit) 165d0a14 authored tarafından Jochen Nitschke's avatar Jochen Nitschke Kaydeden (comit) Noel Grandin

clang-tidy modernize-use-equals-default in svl

SfxPoolItem has a copy constructor and its copy assignment
operator is deleted. Derived classes have a implicit defined
copy constructor too, if all members are copy constructible.

This patch removes default able copy constructors on such items.

Note: clang-tidy only finds functions defined in source, inlined
functions in headers are picked manualy.

Change-Id: I7e642a2ecf139420c53f6fcb39208918dd1a8d52
Reviewed-on: https://gerrit.libreoffice.org/43003Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst df9edbcd
......@@ -28,8 +28,7 @@ class SVL_DLLPUBLIC SfxEnumItemInterface: public SfxPoolItem
protected:
explicit SfxEnumItemInterface(sal_uInt16 which): SfxPoolItem(which) {}
SfxEnumItemInterface(const SfxEnumItemInterface & rItem):
SfxPoolItem(rItem) {}
SfxEnumItemInterface(const SfxEnumItemInterface &) = default;
public:
......
......@@ -33,10 +33,6 @@ public:
CntByteItem(sal_uInt16 which, sal_uInt8 nTheValue):
SfxPoolItem(which), m_nValue(nTheValue) {}
CntByteItem(const CntByteItem & rItem):
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
{}
virtual bool operator ==(const SfxPoolItem & rItem) const override;
virtual bool GetPresentation(SfxItemPresentation,
......@@ -80,10 +76,6 @@ public:
CntUInt16Item(sal_uInt16 which, SvStream & rStream);
CntUInt16Item(const CntUInt16Item & rItem):
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
{}
virtual bool operator ==(const SfxPoolItem & rItem) const override;
virtual bool GetPresentation(SfxItemPresentation,
......@@ -127,10 +119,6 @@ public:
CntInt32Item(sal_uInt16 which, SvStream & rStream);
CntInt32Item(const CntInt32Item & rItem):
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
{}
virtual bool operator ==(const SfxPoolItem & rItem) const override;
virtual bool GetPresentation(SfxItemPresentation,
......@@ -174,10 +162,6 @@ public:
CntUInt32Item(sal_uInt16 nWhich, SvStream & rStream);
CntUInt32Item(const CntUInt32Item & rItem):
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
{}
virtual bool operator ==(const SfxPoolItem & rItem) const override;
virtual bool GetPresentation(SfxItemPresentation,
......
......@@ -37,10 +37,6 @@ public:
SfxPoolItem(which), m_aValue(rTheValue)
{}
CntUnencodedStringItem(const CntUnencodedStringItem & rItem):
SfxPoolItem(rItem), m_aValue(rItem.m_aValue)
{}
virtual bool operator ==(const SfxPoolItem & rItem) const override;
virtual bool GetPresentation(SfxItemPresentation,
......
......@@ -36,10 +36,7 @@ protected:
, m_nValue(nValue)
{ }
SfxEnumItem(const SfxEnumItem & rItem)
: SfxEnumItemInterface(rItem)
, m_nValue(rItem.m_nValue)
{ }
SfxEnumItem(const SfxEnumItem &) = default;
SfxEnumItem(sal_uInt16 const nWhich, SvStream & rStream)
: SfxEnumItemInterface(nWhich)
......@@ -95,11 +92,6 @@ public:
, m_bValue(bValue)
{ }
SfxBoolItem(SfxBoolItem const& rItem)
: SfxPoolItem(rItem)
, m_bValue(rItem.m_bValue)
{ }
SfxBoolItem(sal_uInt16 nWhich, SvStream & rStream);
bool GetValue() const { return m_bValue; }
......
......@@ -31,7 +31,6 @@ class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem
public:
explicit SfxFlagItem( sal_uInt16 nWhich = 0, sal_uInt16 nValue = 0 );
SfxFlagItem( const SfxFlagItem& );
virtual sal_uInt8 GetFlagCount() const;
......
......@@ -34,7 +34,6 @@ public:
SfxIntegerListItem();
SfxIntegerListItem( sal_uInt16 nWhich, const ::std::vector < sal_Int32 >& rList );
SfxIntegerListItem( sal_uInt16 nWhich, const css::uno::Sequence < sal_Int32 >& rList );
SfxIntegerListItem( const SfxIntegerListItem& rItem );
virtual ~SfxIntegerListItem() override;
const std::vector< sal_Int32 >& GetList() const { return m_aList; }
......
......@@ -20,7 +20,6 @@ class SVL_DLLPUBLIC SfxInt64Item : public SfxPoolItem
public:
SfxInt64Item( sal_uInt16 nWhich, sal_Int64 nVal );
SfxInt64Item( sal_uInt16 nWhich, SvStream & rStream );
SfxInt64Item( const SfxInt64Item& rItem );
virtual ~SfxInt64Item() override;
......
......@@ -51,10 +51,6 @@ public:
SfxInt16Item(sal_uInt16 nWhich, SvStream & rStream);
SfxInt16Item(const SfxInt16Item & rItem):
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
{}
virtual bool operator ==(const SfxPoolItem & rItem) const override;
virtual bool GetPresentation(SfxItemPresentation,
......
......@@ -31,7 +31,6 @@ public:
static SfxPoolItem* CreateDefault();
SfxLockBytesItem();
SfxLockBytesItem( sal_uInt16 nWhich, SvStream & );
SfxLockBytesItem( const SfxLockBytesItem& );
virtual ~SfxLockBytesItem() override;
virtual bool operator==( const SfxPoolItem& ) const override;
......
......@@ -137,17 +137,12 @@ public:
private:
SvxMacroTableDtor aMacroTable;
inline SvxMacroItem( const SvxMacroItem& );
SvxMacroItem &operator=( const SvxMacroItem & ) = delete;
SvxMacroItem( const SvxMacroItem& ) = default;
};
inline SvxMacroItem::SvxMacroItem( const sal_uInt16 nId )
: SfxPoolItem( nId )
{}
inline SvxMacroItem::SvxMacroItem( const SvxMacroItem &rCpy )
: SfxPoolItem( rCpy ),
aMacroTable( rCpy.GetMacroTable() )
{}
inline bool SvxMacroItem::HasMacro( SvMacroItemId nEvent ) const
{
......
......@@ -26,7 +26,6 @@ class SVL_DLLPUBLIC SfxMetricItem: public SfxInt32Item
{
public:
explicit SfxMetricItem( sal_uInt16 nWhich, sal_uInt32 nValue );
SfxMetricItem( const SfxMetricItem& );
virtual void ScaleMetrics( long lMult, long lDiv ) override;
virtual bool HasMetrics() const override;
......
......@@ -243,11 +243,9 @@ inline bool IsInvalidItem(const SfxPoolItem *pItem)
class SVL_DLLPUBLIC SfxVoidItem final: public SfxPoolItem
{
SfxVoidItem & operator=( const SfxVoidItem& ) = delete;
public:
static SfxPoolItem* CreateDefault();
explicit SfxVoidItem( sal_uInt16 nWhich );
SfxVoidItem( const SfxVoidItem& );
virtual ~SfxVoidItem() override;
virtual bool operator==( const SfxPoolItem& ) const override;
......
......@@ -33,7 +33,6 @@ public:
static SfxPoolItem* CreateDefault();
SfxPointItem();
SfxPointItem( sal_uInt16 nWhich, const Point& rVal );
SfxPointItem( const SfxPointItem& );
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
......
......@@ -34,7 +34,6 @@ public:
static SfxPoolItem* CreateDefault();
SfxRectangleItem();
SfxRectangleItem( sal_uInt16 nWhich, const tools::Rectangle& rVal );
SfxRectangleItem( const SfxRectangleItem& );
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
......
......@@ -33,7 +33,6 @@ private:
sal_uInt16 nTo;
public:
SfxRangeItem( sal_uInt16 nWID, sal_uInt16 nFrom, sal_uInt16 nTo );
SfxRangeItem( const SfxRangeItem& rItem );
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
......
......@@ -36,7 +36,6 @@ public:
SfxStringListItem();
SfxStringListItem( sal_uInt16 nWhich, const std::vector<OUString> *pList=nullptr );
SfxStringListItem( sal_uInt16 nWhich, SvStream& rStream );
SfxStringListItem( const SfxStringListItem& rItem );
virtual ~SfxStringListItem() override;
std::vector<OUString>& GetList();
......
......@@ -38,10 +38,6 @@ public:
SfxVisibilityItem(sal_uInt16 which, SvStream & rStream);
SfxVisibilityItem(const SfxVisibilityItem & rItem):
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
{}
virtual bool operator ==(const SfxPoolItem & rItem) const override;
virtual bool GetPresentation(SfxItemPresentation, MapUnit, MapUnit,
......
......@@ -30,13 +30,6 @@ SfxFlagItem::SfxFlagItem( sal_uInt16 nW, sal_uInt16 nV ) :
}
SfxFlagItem::SfxFlagItem( const SfxFlagItem& rItem ) :
SfxPoolItem( rItem ),
nVal( rItem.nVal )
{
}
SvStream& SfxFlagItem::Store(SvStream &rStream, sal_uInt16) const
{
rStream.WriteUInt16( nVal );
......
......@@ -46,12 +46,6 @@ SfxIntegerListItem::SfxIntegerListItem( sal_uInt16 which, const css::uno::Sequen
m_aList[n] = rList[n];
}
SfxIntegerListItem::SfxIntegerListItem( const SfxIntegerListItem& rItem )
: SfxPoolItem( rItem )
, m_aList( rItem.m_aList )
{
}
SfxIntegerListItem::~SfxIntegerListItem()
{
}
......
......@@ -44,7 +44,7 @@ SfxImageItem::SfxImageItem( sal_uInt16 which )
SfxImageItem::SfxImageItem( const SfxImageItem& rItem )
: SfxInt16Item( rItem ),
pImpl( new SfxImageItem_Impl( *(rItem.pImpl.get()) ) )
pImpl( new SfxImageItem_Impl( *rItem.pImpl ) )
{
}
......
......@@ -21,11 +21,6 @@ SfxInt64Item::SfxInt64Item( sal_uInt16 nWhich, SvStream& rStream ) :
rStream.ReadInt64(mnValue);
}
SfxInt64Item::SfxInt64Item( const SfxInt64Item& rItem ) :
SfxPoolItem(rItem), mnValue(rItem.mnValue)
{
}
SfxInt64Item::~SfxInt64Item() {}
bool SfxInt64Item::operator== ( const SfxPoolItem& rItem ) const
......
......@@ -153,11 +153,6 @@ SfxMetricItem::SfxMetricItem(sal_uInt16 which, sal_uInt32 nValue):
{
}
SfxMetricItem::SfxMetricItem(const SfxMetricItem & rItem):
SfxInt32Item(rItem)
{
}
// virtual
void SfxMetricItem::ScaleMetrics(long nMult, long nDiv)
{
......
......@@ -44,13 +44,6 @@ SfxLockBytesItem::SfxLockBytesItem( sal_uInt16 nW, SvStream &rStream )
}
SfxLockBytesItem::SfxLockBytesItem( const SfxLockBytesItem& rItem )
: SfxPoolItem( rItem ),
_xVal( rItem._xVal )
{
}
SfxLockBytesItem::~SfxLockBytesItem()
{
}
......
......@@ -149,12 +149,6 @@ SfxVoidItem::SfxVoidItem( sal_uInt16 which ):
{
}
SfxVoidItem::SfxVoidItem( const SfxVoidItem& rCopy):
SfxPoolItem(rCopy)
{
}
bool SfxVoidItem::operator==( const SfxPoolItem& rCmp ) const
{
assert(SfxPoolItem::operator==(rCmp));
......
......@@ -46,13 +46,6 @@ SfxPointItem::SfxPointItem( sal_uInt16 nW, const Point& rVal ) :
}
SfxPointItem::SfxPointItem( const SfxPointItem& rItem ) :
SfxPoolItem( rItem ),
aVal( rItem.aVal )
{
}
bool SfxPointItem::GetPresentation
(
SfxItemPresentation /*ePresentation*/,
......
......@@ -43,13 +43,6 @@ SfxRectangleItem::SfxRectangleItem( sal_uInt16 nW, const tools::Rectangle& rVal
}
SfxRectangleItem::SfxRectangleItem( const SfxRectangleItem& rItem ) :
SfxPoolItem( rItem ),
aVal( rItem.aVal )
{
}
bool SfxRectangleItem::GetPresentation
(
SfxItemPresentation /*ePresentation*/,
......
......@@ -32,14 +32,6 @@ SfxRangeItem::SfxRangeItem( sal_uInt16 which, sal_uInt16 from, sal_uInt16 to ):
}
SfxRangeItem::SfxRangeItem( const SfxRangeItem& rItem ) :
SfxPoolItem( rItem )
{
nFrom = rItem.nFrom;
nTo = rItem.nTo;
}
bool SfxRangeItem::GetPresentation
(
SfxItemPresentation /*ePresentation*/,
......
......@@ -42,7 +42,7 @@ SfxSetItem::SfxSetItem( sal_uInt16 which, std::unique_ptr<SfxItemSet> &&pS) :
SfxSetItem::SfxSetItem( const SfxSetItem& rCopy, SfxItemPool *pPool ) :
SfxPoolItem(rCopy.Which()),
SfxPoolItem(rCopy),
pSet(rCopy.pSet->Clone(true, pPool))
{
}
......
......@@ -64,14 +64,6 @@ SfxStringListItem::SfxStringListItem( sal_uInt16 which, SvStream& rStream ) :
}
}
SfxStringListItem::SfxStringListItem( const SfxStringListItem& rItem ) :
SfxPoolItem( rItem ),
mpList(rItem.mpList)
{
}
SfxStringListItem::~SfxStringListItem()
{
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment