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

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

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 and destructors
on such items.

Also removing copy constructors of pool item members
SvxClipboardFormatItem_Impl and SvxColumnItem.

Change-Id: Ic0f39c992d1fd7b667cb56134fd7c953681a3131
Reviewed-on: https://gerrit.libreoffice.org/43143Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 75a88182
...@@ -79,7 +79,6 @@ public: ...@@ -79,7 +79,6 @@ public:
SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop /*= 0*/, SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop /*= 0*/,
sal_Int16 nRight /*= 0*/, sal_Int16 nBottom /*= 0*/, sal_Int16 nRight /*= 0*/, sal_Int16 nBottom /*= 0*/,
const sal_uInt16 nId ); const sal_uInt16 nId );
SvxMarginItem( const SvxMarginItem& );
virtual bool GetPresentation( SfxItemPresentation ePres, virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric, MapUnit eCoreMetric,
......
...@@ -32,7 +32,6 @@ private: ...@@ -32,7 +32,6 @@ private:
public: public:
OfaPtrItem( sal_uInt16 nWhich, void *pPtr ); OfaPtrItem( sal_uInt16 nWhich, void *pPtr );
OfaPtrItem( const OfaPtrItem& );
virtual bool operator==( const SfxPoolItem& ) const override; virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
...@@ -51,9 +50,6 @@ public: ...@@ -51,9 +50,6 @@ public:
OfaRefItem( sal_uInt16 _nWhich, const rtl::Reference<reference_type> &xRef ) OfaRefItem( sal_uInt16 _nWhich, const rtl::Reference<reference_type> &xRef )
: SfxPoolItem( _nWhich ), mxRef( xRef ) : SfxPoolItem( _nWhich ), mxRef( xRef )
{} {}
OfaRefItem( const OfaRefItem& rItem )
: SfxPoolItem( rItem.Which() ), mxRef( rItem.mxRef )
{}
virtual bool operator==( const SfxPoolItem& rItem ) const override virtual bool operator==( const SfxPoolItem& rItem ) const override
{ {
return mxRef == static_cast<OfaRefItem<reference_type> const &>(rItem).mxRef; return mxRef == static_cast<OfaRefItem<reference_type> const &>(rItem).mxRef;
......
...@@ -79,7 +79,6 @@ class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem ...@@ -79,7 +79,6 @@ class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem
public: public:
SvxGridItem( sal_uInt16 _nWhich) : SfxPoolItem(_nWhich){}; SvxGridItem( sal_uInt16 _nWhich) : SfxPoolItem(_nWhich){};
SvxGridItem( const SvxGridItem& pTestItem );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override; virtual bool operator==( const SfxPoolItem& ) const override;
......
...@@ -48,7 +48,6 @@ private: ...@@ -48,7 +48,6 @@ private:
public: public:
static SfxPoolItem* CreateDefault(); static SfxPoolItem* CreateDefault();
SvxLongLRSpaceItem(long lLeft, long lRight, sal_uInt16 nId); SvxLongLRSpaceItem(long lLeft, long lRight, sal_uInt16 nId);
SvxLongLRSpaceItem(const SvxLongLRSpaceItem &);
SvxLongLRSpaceItem(); SvxLongLRSpaceItem();
long GetLeft() const { return mlLeft;} long GetLeft() const { return mlLeft;}
...@@ -81,7 +80,6 @@ private: ...@@ -81,7 +80,6 @@ private:
public: public:
static SfxPoolItem* CreateDefault(); static SfxPoolItem* CreateDefault();
SvxLongULSpaceItem(long lUpper, long lLower, sal_uInt16 nId); SvxLongULSpaceItem(long lUpper, long lLower, sal_uInt16 nId);
SvxLongULSpaceItem(const SvxLongULSpaceItem &);
SvxLongULSpaceItem(); SvxLongULSpaceItem();
long GetUpper() const { return mlLeft;} long GetUpper() const { return mlLeft;}
...@@ -112,7 +110,6 @@ private: ...@@ -112,7 +110,6 @@ private:
public: public:
static SfxPoolItem* CreateDefault(); static SfxPoolItem* CreateDefault();
SvxPagePosSizeItem(const Point &rPos, long lWidth, long lHeight); SvxPagePosSizeItem(const Point &rPos, long lWidth, long lHeight);
SvxPagePosSizeItem(const SvxPagePosSizeItem &);
SvxPagePosSizeItem(); SvxPagePosSizeItem();
const Point &GetPos() const { return aPos; } const Point &GetPos() const { return aPos; }
...@@ -131,8 +128,6 @@ struct SVX_DLLPUBLIC SvxColumnDescription ...@@ -131,8 +128,6 @@ struct SVX_DLLPUBLIC SvxColumnDescription
SvxColumnDescription(); SvxColumnDescription();
SvxColumnDescription(const SvxColumnDescription &rCopy);
SvxColumnDescription(long start, long end, bool bVis); SvxColumnDescription(long start, long end, bool bVis);
SvxColumnDescription(long start, long end, SvxColumnDescription(long start, long end,
...@@ -184,10 +179,6 @@ public: ...@@ -184,10 +179,6 @@ public:
// nLeft, nRight each the distance to the surrounding frame // nLeft, nRight each the distance to the surrounding frame
SvxColumnItem(sal_uInt16 nAct = 0); SvxColumnItem(sal_uInt16 nAct = 0);
SvxColumnItem(sal_uInt16 nActCol, sal_uInt16 nLeft, sal_uInt16 nRight); // Table with borders SvxColumnItem(sal_uInt16 nActCol, sal_uInt16 nLeft, sal_uInt16 nRight); // Table with borders
SvxColumnItem(const SvxColumnItem& aItem);
virtual ~SvxColumnItem() override;
SvxColumnItem &operator=(const SvxColumnItem &);
SvxColumnDescription& operator[](sal_uInt16 index); SvxColumnDescription& operator[](sal_uInt16 index);
const SvxColumnDescription& operator[](sal_uInt16 index) const; const SvxColumnDescription& operator[](sal_uInt16 index) const;
...@@ -239,7 +230,6 @@ public: ...@@ -239,7 +230,6 @@ public:
static SfxPoolItem* CreateDefault(); static SfxPoolItem* CreateDefault();
SvxObjectItem(long nStartX, long nEndX, SvxObjectItem(long nStartX, long nEndX,
long nStartY, long nEndY); long nStartY, long nEndY);
SvxObjectItem(const SvxObjectItem& rCopy);
long GetStartX() const { return nStartX;} long GetStartX() const { return nStartX;}
long GetEndX() const { return nEndX;} long GetEndX() const { return nEndX;}
......
...@@ -31,8 +31,6 @@ class SVX_DLLPUBLIC SvxGraphicItem: public SfxPoolItem ...@@ -31,8 +31,6 @@ class SVX_DLLPUBLIC SvxGraphicItem: public SfxPoolItem
public: public:
SvxGraphicItem( const Graphic& rGraphic); SvxGraphicItem( const Graphic& rGraphic);
SvxGraphicItem( const SvxGraphicItem& );
virtual bool operator==( const SfxPoolItem& ) const override; virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
......
...@@ -35,8 +35,6 @@ public: ...@@ -35,8 +35,6 @@ public:
static SfxPoolItem* CreateDefault(); static SfxPoolItem* CreateDefault();
SvxZoomSliderItem( sal_uInt16 nCurrentZoom = 100, sal_uInt16 nMinZoom = 20, sal_uInt16 nMaxZoom = 600, sal_uInt16 nWhich = SID_ATTR_ZOOMSLIDER ); SvxZoomSliderItem( sal_uInt16 nCurrentZoom = 100, sal_uInt16 nMinZoom = 20, sal_uInt16 nMaxZoom = 600, sal_uInt16 nWhich = SID_ATTR_ZOOMSLIDER );
SvxZoomSliderItem( const SvxZoomSliderItem& );
virtual ~SvxZoomSliderItem() override;
void AddSnappingPoint( sal_Int32 nNew ); void AddSnappingPoint( sal_Int32 nNew );
const css::uno::Sequence < sal_Int32 >& GetSnappingPoints() const { return maValues;} const css::uno::Sequence < sal_Int32 >& GetSnappingPoints() const { return maValues;}
......
...@@ -58,23 +58,6 @@ SvxOptionsGrid::SvxOptionsGrid() : ...@@ -58,23 +58,6 @@ SvxOptionsGrid::SvxOptionsGrid() :
{ {
} }
SvxGridItem::SvxGridItem( const SvxGridItem& rItem )
: SvxOptionsGrid()
, SfxPoolItem(rItem)
{
bUseGridsnap = rItem.bUseGridsnap ;
bSynchronize = rItem.bSynchronize ;
bGridVisible = rItem.bGridVisible ;
bEqualGrid = rItem.bEqualGrid ;
nFldDrawX = rItem.nFldDrawX ;
nFldDivisionX= rItem.nFldDivisionX;
nFldDrawY = rItem.nFldDrawY ;
nFldDivisionY= rItem.nFldDivisionY;
nFldSnapX = rItem.nFldSnapX ;
nFldSnapY = rItem.nFldSnapY ;
};
SfxPoolItem* SvxGridItem::Clone( SfxItemPool* ) const SfxPoolItem* SvxGridItem::Clone( SfxItemPool* ) const
{ {
return new SvxGridItem( *this ); return new SvxGridItem( *this );
......
...@@ -143,13 +143,6 @@ SvxLongLRSpaceItem::SvxLongLRSpaceItem() : ...@@ -143,13 +143,6 @@ SvxLongLRSpaceItem::SvxLongLRSpaceItem() :
mlRight (0) mlRight (0)
{} {}
SvxLongLRSpaceItem::SvxLongLRSpaceItem(const SvxLongLRSpaceItem &rCpy) :
SfxPoolItem (rCpy),
mlLeft (rCpy.mlLeft),
mlRight (rCpy.mlRight)
{}
void SvxLongLRSpaceItem::SetLeft(long lArgLeft) void SvxLongLRSpaceItem::SetLeft(long lArgLeft)
{ {
mlLeft = lArgLeft; mlLeft = lArgLeft;
...@@ -263,12 +256,6 @@ SvxLongULSpaceItem::SvxLongULSpaceItem(long lLeft, long lRight, sal_uInt16 nId) ...@@ -263,12 +256,6 @@ SvxLongULSpaceItem::SvxLongULSpaceItem(long lLeft, long lRight, sal_uInt16 nId)
mlRight (lRight) mlRight (lRight)
{} {}
SvxLongULSpaceItem::SvxLongULSpaceItem(const SvxLongULSpaceItem &rCpy) :
SfxPoolItem (rCpy),
mlLeft (rCpy.mlLeft),
mlRight (rCpy.mlRight)
{}
SvxLongULSpaceItem::SvxLongULSpaceItem() : SvxLongULSpaceItem::SvxLongULSpaceItem() :
SfxPoolItem (0), SfxPoolItem (0),
mlLeft (0), mlLeft (0),
...@@ -385,13 +372,6 @@ SvxPagePosSizeItem::SvxPagePosSizeItem(const Point &rP, long lW, long lH) : ...@@ -385,13 +372,6 @@ SvxPagePosSizeItem::SvxPagePosSizeItem(const Point &rP, long lW, long lH) :
lHeight (lH) lHeight (lH)
{} {}
SvxPagePosSizeItem::SvxPagePosSizeItem(const SvxPagePosSizeItem &rCpy) :
SfxPoolItem (rCpy),
aPos (rCpy.aPos),
lWidth (rCpy.lWidth),
lHeight (rCpy.lHeight)
{}
SvxPagePosSizeItem::SvxPagePosSizeItem() : SvxPagePosSizeItem::SvxPagePosSizeItem() :
SfxPoolItem (0), SfxPoolItem (0),
aPos (0, 0), aPos (0, 0),
...@@ -439,21 +419,6 @@ SvxColumnItem::SvxColumnItem( sal_uInt16 nActCol, sal_uInt16 left, sal_uInt16 ri ...@@ -439,21 +419,6 @@ SvxColumnItem::SvxColumnItem( sal_uInt16 nActCol, sal_uInt16 left, sal_uInt16 ri
bOrtho (true) bOrtho (true)
{} {}
SvxColumnItem::SvxColumnItem( const SvxColumnItem& rCopy ) :
SfxPoolItem (rCopy),
nLeft (rCopy.nLeft),
nRight (rCopy.nRight),
nActColumn (rCopy.nActColumn),
bTable (rCopy.bTable),
bOrtho (rCopy.bOrtho)
{
aColumns.resize(rCopy.aColumns.size());
std::copy(rCopy.aColumns.begin(), rCopy.aColumns.end(), aColumns.begin());
}
SvxColumnItem::~SvxColumnItem()
{}
bool SvxColumnItem::GetPresentation( bool SvxColumnItem::GetPresentation(
SfxItemPresentation /*ePres*/, SfxItemPresentation /*ePres*/,
MapUnit /*eCoreUnit*/, MapUnit /*eCoreUnit*/,
...@@ -469,19 +434,6 @@ SfxPoolItem* SvxColumnItem::Clone(SfxItemPool* /*pPool*/) const ...@@ -469,19 +434,6 @@ SfxPoolItem* SvxColumnItem::Clone(SfxItemPool* /*pPool*/) const
return new SvxColumnItem(*this); return new SvxColumnItem(*this);
} }
SvxColumnItem& SvxColumnItem::operator=(const SvxColumnItem& rCopy)
{
nLeft = rCopy.nLeft;
nRight = rCopy.nRight;
bTable = rCopy.bTable;
nActColumn = rCopy.nActColumn;
aColumns.resize(rCopy.aColumns.size());
std::copy(rCopy.aColumns.begin(), rCopy.aColumns.end(), aColumns.begin());
return *this;
}
bool SvxColumnItem::CalcOrtho() const bool SvxColumnItem::CalcOrtho() const
{ {
const sal_uInt16 nCount = Count(); const sal_uInt16 nCount = Count();
...@@ -624,14 +576,6 @@ SvxColumnDescription::SvxColumnDescription() : ...@@ -624,14 +576,6 @@ SvxColumnDescription::SvxColumnDescription() :
nEndMax (0) nEndMax (0)
{} {}
SvxColumnDescription::SvxColumnDescription(const SvxColumnDescription &rCopy) :
nStart (rCopy.nStart),
nEnd (rCopy.nEnd),
bVisible (rCopy.bVisible),
nEndMin (rCopy.nEndMin),
nEndMax (rCopy.nEndMax)
{}
SvxColumnDescription::SvxColumnDescription(long start, long end, bool bVis) : SvxColumnDescription::SvxColumnDescription(long start, long end, bool bVis) :
nStart (start), nStart (start),
nEnd (end), nEnd (end),
...@@ -714,15 +658,6 @@ SvxObjectItem::SvxObjectItem( long nSX, long nEX, ...@@ -714,15 +658,6 @@ SvxObjectItem::SvxObjectItem( long nSX, long nEX,
bLimits (false) bLimits (false)
{} {}
SvxObjectItem::SvxObjectItem( const SvxObjectItem& rCopy ) :
SfxPoolItem (rCopy),
nStartX (rCopy.nStartX),
nEndX (rCopy.nEndX),
nStartY (rCopy.nStartY),
nEndY (rCopy.nEndY),
bLimits (rCopy.bLimits)
{}
bool SvxObjectItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const bool SvxObjectItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const
{ {
nMemberId &= ~CONVERT_TWIPS; nMemberId &= ~CONVERT_TWIPS;
......
...@@ -24,10 +24,6 @@ SvxGraphicItem::SvxGraphicItem( const Graphic& rGraphic ) ...@@ -24,10 +24,6 @@ SvxGraphicItem::SvxGraphicItem( const Graphic& rGraphic )
: SfxPoolItem( SID_GRAPHIC ), aGraphic( rGraphic ) : SfxPoolItem( SID_GRAPHIC ), aGraphic( rGraphic )
{ {
}
SvxGraphicItem::SvxGraphicItem( const SvxGraphicItem& rItem)
: SfxPoolItem( rItem.Which() ), aGraphic( rItem.aGraphic )
{
} }
bool SvxGraphicItem::operator==( const SfxPoolItem& rItem) const bool SvxGraphicItem::operator==( const SfxPoolItem& rItem) const
......
...@@ -187,17 +187,6 @@ SvxMarginItem::SvxMarginItem( sal_Int16 nLeft, ...@@ -187,17 +187,6 @@ SvxMarginItem::SvxMarginItem( sal_Int16 nLeft,
} }
SvxMarginItem::SvxMarginItem( const SvxMarginItem& rItem ) :
SfxPoolItem( rItem.Which() )
{
nLeftMargin = rItem.nLeftMargin;
nTopMargin = rItem.nTopMargin;
nRightMargin = rItem.nRightMargin;
nBottomMargin = rItem.nBottomMargin;
}
bool SvxMarginItem::GetPresentation bool SvxMarginItem::GetPresentation
( (
SfxItemPresentation ePres, SfxItemPresentation ePres,
......
...@@ -30,18 +30,10 @@ struct SvxClipboardFormatItem_Impl ...@@ -30,18 +30,10 @@ struct SvxClipboardFormatItem_Impl
std::vector<SotClipboardFormatId> aFmtIds; std::vector<SotClipboardFormatId> aFmtIds;
SvxClipboardFormatItem_Impl() {} SvxClipboardFormatItem_Impl() {}
SvxClipboardFormatItem_Impl( const SvxClipboardFormatItem_Impl& );
}; };
SfxPoolItem* SvxClipboardFormatItem::CreateDefault() { return new SvxClipboardFormatItem(0); }; SfxPoolItem* SvxClipboardFormatItem::CreateDefault() { return new SvxClipboardFormatItem(0); };
SvxClipboardFormatItem_Impl::SvxClipboardFormatItem_Impl(
const SvxClipboardFormatItem_Impl& rCpy )
: aFmtNms(rCpy.aFmtNms)
, aFmtIds(rCpy.aFmtIds)
{
}
SvxClipboardFormatItem::SvxClipboardFormatItem( sal_uInt16 nId ) SvxClipboardFormatItem::SvxClipboardFormatItem( sal_uInt16 nId )
: SfxPoolItem( nId ), pImpl( new SvxClipboardFormatItem_Impl ) : SfxPoolItem( nId ), pImpl( new SvxClipboardFormatItem_Impl )
{ {
......
...@@ -78,9 +78,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, ...@@ -78,9 +78,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) : SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) :
SfxPoolItem ( rItem ),
SfxPoolItem( rItem.Which() ),
pFormatter ( rItem.pFormatter ), pFormatter ( rItem.pFormatter ),
eValueType ( rItem.eValueType ), eValueType ( rItem.eValueType ),
aStringVal ( rItem.aStringVal ), aStringVal ( rItem.aStringVal ),
......
...@@ -24,10 +24,6 @@ OfaPtrItem::OfaPtrItem( sal_uInt16 _nWhich, void *_pPtr ) ...@@ -24,10 +24,6 @@ OfaPtrItem::OfaPtrItem( sal_uInt16 _nWhich, void *_pPtr )
: SfxPoolItem( _nWhich ), pPtr( _pPtr ) : SfxPoolItem( _nWhich ), pPtr( _pPtr )
{ {
}
OfaPtrItem::OfaPtrItem( const OfaPtrItem& rItem)
: SfxPoolItem( rItem.Which() ), pPtr( rItem.pPtr )
{
} }
bool OfaPtrItem::operator==( const SfxPoolItem& rItem) const bool OfaPtrItem::operator==( const SfxPoolItem& rItem) const
......
...@@ -40,20 +40,6 @@ SvxZoomSliderItem::SvxZoomSliderItem( sal_uInt16 nCurrentZoom, sal_uInt16 nMinZo ...@@ -40,20 +40,6 @@ SvxZoomSliderItem::SvxZoomSliderItem( sal_uInt16 nCurrentZoom, sal_uInt16 nMinZo
} }
SvxZoomSliderItem::SvxZoomSliderItem( const SvxZoomSliderItem& rOrig )
: SfxUInt16Item( rOrig.Which(), rOrig.GetValue() )
, maValues( rOrig.maValues )
, mnMinZoom( rOrig.mnMinZoom )
, mnMaxZoom( rOrig.mnMaxZoom )
{
}
SvxZoomSliderItem::~SvxZoomSliderItem()
{
}
SfxPoolItem* SvxZoomSliderItem::Clone( SfxItemPool * /*pPool*/ ) const SfxPoolItem* SvxZoomSliderItem::Clone( SfxItemPool * /*pPool*/ ) const
{ {
return new SvxZoomSliderItem( *this ); return new SvxZoomSliderItem( *this );
......
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