diff options
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/fmtfordr.hxx | 7 | ||||
-rw-r--r-- | sw/inc/fmtfsize.hxx | 1 | ||||
-rw-r--r-- | sw/inc/fmtsrnd.hxx | 10 | ||||
-rw-r--r-- | sw/inc/fmtwrapinfluenceonobjpos.hxx | 6 | ||||
-rw-r--r-- | sw/inc/grfatr.hxx | 13 | ||||
-rw-r--r-- | sw/inc/paratr.hxx | 18 | ||||
-rw-r--r-- | sw/inc/tgrditem.hxx | 7 |
7 files changed, 9 insertions, 53 deletions
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx index 2518995dbe3a..6c648123b8ae 100644 --- a/sw/inc/fmtfordr.hxx +++ b/sw/inc/fmtfordr.hxx @@ -37,19 +37,12 @@ class SwFormatFillOrder: public SfxEnumItem<SwFillOrder> { public: SwFormatFillOrder( SwFillOrder = ATT_TOP_DOWN ); - inline SwFormatFillOrder &operator=( const SwFormatFillOrder &rCpy ); /// "Pure virtual methods" of SfxPoolItem. virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; }; -inline SwFormatFillOrder &SwFormatFillOrder::operator=( const SwFormatFillOrder &rCpy ) -{ - SetValue( rCpy.GetValue() ); - return *this; -} - inline const SwFormatFillOrder &SwAttrSet::GetFillOrder(bool bInP) const { return Get( RES_FILL_ORDER,bInP); } diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index 44c891760277..a7059a932a68 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -66,7 +66,6 @@ class SW_DLLPUBLIC SwFormatFrameSize: public SvxSizeItem public: SwFormatFrameSize( SwFrameSize eSize = ATT_VAR_SIZE, SwTwips nWidth = 0, SwTwips nHeight = 0 ); - SwFormatFrameSize& operator=( const SwFormatFrameSize& rCpy ); virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index ae17719d32ff..03e943ff07ba 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -35,7 +35,6 @@ class SW_DLLPUBLIC SwFormatSurround: public SfxEnumItem<css::text::WrapTextMode> bool bOutside :1; public: SwFormatSurround( css::text::WrapTextMode eNew = css::text::WrapTextMode_PARALLEL ); - inline SwFormatSurround &operator=( const SwFormatSurround &rCpy ); // "Pure virtual Methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; @@ -61,15 +60,6 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; -inline SwFormatSurround &SwFormatSurround::operator=( const SwFormatSurround &rCpy ) -{ - bAnchorOnly = rCpy.IsAnchorOnly(); - bContour = rCpy.IsContour(); - bOutside = rCpy.IsOutside(); - SfxEnumItem::SetValue( rCpy.GetValue() ); - return *this; -} - inline const SwFormatSurround &SwAttrSet::GetSurround(bool bInP) const { return Get( RES_SURROUND,bInP); } diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index bff1bd2945d8..2b016a6f4979 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -36,8 +36,10 @@ public: sal_Int16 _nWrapInfluenceOnPosition = css::text::WrapInfluenceOnPosition::ONCE_CONCURRENT ); virtual ~SwFormatWrapInfluenceOnObjPos() override; - SwFormatWrapInfluenceOnObjPos& operator=( - const SwFormatWrapInfluenceOnObjPos& _rSource ); + SwFormatWrapInfluenceOnObjPos(SwFormatWrapInfluenceOnObjPos const &) = default; + SwFormatWrapInfluenceOnObjPos(SwFormatWrapInfluenceOnObjPos &&) = default; + SwFormatWrapInfluenceOnObjPos & operator =(SwFormatWrapInfluenceOnObjPos const &) = default; + SwFormatWrapInfluenceOnObjPos & operator =(SwFormatWrapInfluenceOnObjPos &&) = default; /// pure virtual methods of class <SfxPoolItem> virtual bool operator==( const SfxPoolItem& _rAttr ) const override; diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 024c91849a62..2b250a57e12b 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -62,13 +62,6 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SwMirrorGrf& operator=( const SwMirrorGrf& rMirrorGrf ) - { - SfxEnumItem::SetValue( rMirrorGrf.GetValue() ); - bGrfToggle = rMirrorGrf.IsGrfToggle(); - return *this; - } - bool IsGrfToggle() const { return bGrfToggle; } void SetGrfToggle( bool bNew ) { bGrfToggle = bNew; } }; @@ -199,12 +192,6 @@ public: : SfxPoolItem( RES_GRFATR_GAMMA ), nValue( rVal ) {} - SwGammaGrf& operator=( const SwGammaGrf& rCopy ) - { - nValue = rCopy.nValue; - return *this; - } - // pure virtual methods from SfxEnumItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 35a39a897202..a42788b6c20f 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -114,8 +114,6 @@ public: inline SwRegisterItem( const bool bRegister = false ); - inline SwRegisterItem& operator=( const SwRegisterItem& rRegister ); - /// "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, @@ -129,13 +127,6 @@ inline SwRegisterItem::SwRegisterItem( const bool bRegister ) : SfxBoolItem( RES_PARATR_REGISTER, bRegister ) {} -inline SwRegisterItem& SwRegisterItem::operator=( - const SwRegisterItem& rRegister ) -{ - SetValue( rRegister.GetValue() ); - return *this; -} - class SW_DLLPUBLIC SwNumRuleItem : public SfxStringItem { public: @@ -171,8 +162,6 @@ public: inline SwParaConnectBorderItem( const bool bConnect = true ); - inline SwParaConnectBorderItem& operator=( const SwParaConnectBorderItem& rConnect ); - /// "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, @@ -186,13 +175,6 @@ inline SwParaConnectBorderItem::SwParaConnectBorderItem( const bool bConnect ) : SfxBoolItem( RES_PARATR_CONNECT_BORDER, bConnect ) {} -inline SwParaConnectBorderItem& SwParaConnectBorderItem::operator=( - const SwParaConnectBorderItem& rConnect ) -{ - SetValue( rConnect.GetValue() ); - return *this; -} - // Implementation of paragraph-attributes methods of SwAttrSet inline const SvxLineSpacingItem &SwAttrSet::GetLineSpacing(bool bInP) const { return Get( RES_PARATR_LINESPACING,bInP); } diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index 30cf95066fb8..a668ed297d68 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -50,6 +50,11 @@ public: SwTextGridItem(); virtual ~SwTextGridItem() override; + SwTextGridItem(SwTextGridItem const &) = default; + SwTextGridItem(SwTextGridItem &&) = default; + SwTextGridItem & operator =(SwTextGridItem const &) = default; + SwTextGridItem & operator =(SwTextGridItem &&) = default; + // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; @@ -61,8 +66,6 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SwTextGridItem& operator=( const SwTextGridItem& ); - const Color& GetColor() const { return m_aColor; } void SetColor( const Color& rCol ) { m_aColor = rCol; } |