diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-10-04 02:17:25 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-05 08:57:59 +0200 |
commit | 9051ceb9f2048a85772306573cb662ee14efd718 (patch) | |
tree | 5624b2875c61aaf277658d69fe05c2ef5ff835ec /svx | |
parent | 75a881829f19439245cdb859fc16d59461992f79 (diff) |
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/43143
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/optgrid.cxx | 17 | ||||
-rw-r--r-- | svx/source/dialog/rulritem.cxx | 65 | ||||
-rw-r--r-- | svx/source/dialog/svxgrahicitem.cxx | 4 | ||||
-rw-r--r-- | svx/source/items/algitem.cxx | 11 | ||||
-rw-r--r-- | svx/source/items/clipfmtitem.cxx | 8 | ||||
-rw-r--r-- | svx/source/items/numinf.cxx | 4 | ||||
-rw-r--r-- | svx/source/items/ofaitem.cxx | 4 | ||||
-rw-r--r-- | svx/source/items/zoomslideritem.cxx | 14 |
8 files changed, 1 insertions, 126 deletions
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 248d741e1c27..d517dd7fb6df 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -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 { return new SvxGridItem( *this ); diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index a74c55703c8f..145a552f8f87 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -143,13 +143,6 @@ SvxLongLRSpaceItem::SvxLongLRSpaceItem() : mlRight (0) {} -SvxLongLRSpaceItem::SvxLongLRSpaceItem(const SvxLongLRSpaceItem &rCpy) : - SfxPoolItem (rCpy), - mlLeft (rCpy.mlLeft), - mlRight (rCpy.mlRight) -{} - - void SvxLongLRSpaceItem::SetLeft(long lArgLeft) { mlLeft = lArgLeft; @@ -263,12 +256,6 @@ SvxLongULSpaceItem::SvxLongULSpaceItem(long lLeft, long lRight, sal_uInt16 nId) mlRight (lRight) {} -SvxLongULSpaceItem::SvxLongULSpaceItem(const SvxLongULSpaceItem &rCpy) : - SfxPoolItem (rCpy), - mlLeft (rCpy.mlLeft), - mlRight (rCpy.mlRight) -{} - SvxLongULSpaceItem::SvxLongULSpaceItem() : SfxPoolItem (0), mlLeft (0), @@ -385,13 +372,6 @@ SvxPagePosSizeItem::SvxPagePosSizeItem(const Point &rP, long lW, long lH) : lHeight (lH) {} -SvxPagePosSizeItem::SvxPagePosSizeItem(const SvxPagePosSizeItem &rCpy) : - SfxPoolItem (rCpy), - aPos (rCpy.aPos), - lWidth (rCpy.lWidth), - lHeight (rCpy.lHeight) -{} - SvxPagePosSizeItem::SvxPagePosSizeItem() : SfxPoolItem (0), aPos (0, 0), @@ -439,21 +419,6 @@ SvxColumnItem::SvxColumnItem( sal_uInt16 nActCol, sal_uInt16 left, sal_uInt16 ri 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( SfxItemPresentation /*ePres*/, MapUnit /*eCoreUnit*/, @@ -469,19 +434,6 @@ SfxPoolItem* SvxColumnItem::Clone(SfxItemPool* /*pPool*/) const 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 { const sal_uInt16 nCount = Count(); @@ -624,14 +576,6 @@ SvxColumnDescription::SvxColumnDescription() : 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) : nStart (start), nEnd (end), @@ -714,15 +658,6 @@ SvxObjectItem::SvxObjectItem( long nSX, long nEX, 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 { nMemberId &= ~CONVERT_TWIPS; diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx index d7bbd8a328f4..ff6bf9ec8085 100644 --- a/svx/source/dialog/svxgrahicitem.cxx +++ b/svx/source/dialog/svxgrahicitem.cxx @@ -25,10 +25,6 @@ SvxGraphicItem::SvxGraphicItem( const Graphic& rGraphic ) { } -SvxGraphicItem::SvxGraphicItem( const SvxGraphicItem& rItem) - : SfxPoolItem( rItem.Which() ), aGraphic( rItem.aGraphic ) -{ -} bool SvxGraphicItem::operator==( const SfxPoolItem& rItem) const { diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 3da88e3625b1..c8c3623dce5d 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -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 ( SfxItemPresentation ePres, diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index 2cd8929cfb92..08aa4782f376 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -30,18 +30,10 @@ struct SvxClipboardFormatItem_Impl std::vector<SotClipboardFormatId> aFmtIds; SvxClipboardFormatItem_Impl() {} - SvxClipboardFormatItem_Impl( const SvxClipboardFormatItem_Impl& ); }; 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 ) : SfxPoolItem( nId ), pImpl( new SvxClipboardFormatItem_Impl ) { diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index 56074beb0511..0dcf67964b1b 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -78,9 +78,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) : - - SfxPoolItem( rItem.Which() ), - + SfxPoolItem ( rItem ), pFormatter ( rItem.pFormatter ), eValueType ( rItem.eValueType ), aStringVal ( rItem.aStringVal ), diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx index 5b911ad8965d..b3b92c233abd 100644 --- a/svx/source/items/ofaitem.cxx +++ b/svx/source/items/ofaitem.cxx @@ -25,10 +25,6 @@ OfaPtrItem::OfaPtrItem( sal_uInt16 _nWhich, void *_pPtr ) { } -OfaPtrItem::OfaPtrItem( const OfaPtrItem& rItem) - : SfxPoolItem( rItem.Which() ), pPtr( rItem.pPtr ) -{ -} bool OfaPtrItem::operator==( const SfxPoolItem& rItem) const { diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index d03674e3316c..ed261b781b91 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -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 { return new SvxZoomSliderItem( *this ); |