Kaydet (Commit) 727878a7 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Remove unused copy assignment ops of SfxPoolItem-derived classes

SfxPoolItem has the curious design of non-deleted copy ctor and deleted copy
assignment op.  Many derived classes then provide a non-deleted assignment op,
apparently more or less on an as-needed basis.  But some of those user-provided
assignment ops are actually unused (and their presence causes
-Werror=deprecated-copy with GCC trunk towards GCC 9 when the---implicitly-
defined---copy ctor of the derived class is used), so remove them.  In some
cases that would still cause -Werror=deprected-copy because of a user-declared
dtor, so in those cases explicitly default all the copy/move functions (some of
which will then be implicitly defined as deleted).

Change-Id: If0d9f1a9f3954263a39ffd27ba895d6202afa307
Reviewed-on: https://gerrit.libreoffice.org/58133
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 13502c0f
......@@ -393,10 +393,4 @@ sal_uInt16 SvxJustifyMethodItem::GetValueCount() const
return static_cast<sal_uInt16>(SvxCellJustifyMethod::Distribute) + 1; // Last Enum value + 1
}
SvxJustifyMethodItem& SvxJustifyMethodItem::operator=(const SvxJustifyMethodItem& r)
{
SetValue( r.GetValue() );
return *this;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -105,10 +105,4 @@ bool SvxWritingModeItem::QueryValue( css::uno::Any& rVal,
return true;
}
SvxWritingModeItem& SvxWritingModeItem::operator=( const SvxWritingModeItem& rItem )
{
SetValue( static_cast<sal_uInt16>(rItem.GetValue()) );
return *this;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -46,12 +46,6 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
SvxAutoKernItem& operator=(const SvxAutoKernItem& rAutoKern)
{
SetValue( rAutoKern.GetValue() );
return *this;
}
};
#endif
......
......@@ -45,11 +45,6 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
SvxBlinkItem& operator=(const SvxBlinkItem& rBlink) {
SetValue(rBlink.GetValue());
return *this;
}
};
#endif
......
......@@ -39,11 +39,6 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
SvxCharHiddenItem& operator=(const SvxCharHiddenItem& rHidden) {
SetValue(rHidden.GetValue());
return *this;
}
};
#endif
......
......@@ -53,12 +53,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;
SvxCharReliefItem& operator=( const SvxCharReliefItem& rItem )
{
SetValue( rItem.GetValue() );
return *this;
}
};
#endif
......
......@@ -48,12 +48,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;
SvxTextRotateItem& operator=(const SvxTextRotateItem& rItem)
{
SetValue(rItem.GetValue());
return *this;
}
virtual bool operator==(const SfxPoolItem&) const override;
// our currently only degree values
......@@ -100,13 +94,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;
SvxCharRotateItem& operator=( const SvxCharRotateItem& rItem )
{
SetValue( rItem.GetValue() );
SetFitToLine( rItem.IsFitToLine() );
return *this;
}
virtual bool operator==( const SfxPoolItem& ) const override;
bool IsFitToLine() const { return bFitToLine; }
......
......@@ -51,13 +51,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;
SvxCharScaleWidthItem& operator=(const SvxCharScaleWidthItem& rItem )
{
SetValue( rItem.GetValue() );
return *this;
}
};
#endif
......
......@@ -46,13 +46,6 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
rtl_TextEncoding GetCharSet() const { return eFrom; }
SvxCharSetColorItem& operator=(const SvxCharSetColorItem& rColor)
{
SetValue( rColor.GetValue() );
eFrom = rColor.GetCharSet();
return *this;
}
};
#endif
......
......@@ -50,12 +50,6 @@ public:
OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetValueCount() const override;
SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap)
{
SetValue( rMap.GetValue() );
return *this;
}
// enum cast
SvxCaseMap GetCaseMap() const { return GetValue(); }
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
......
......@@ -53,12 +53,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;
SvxEmphasisMarkItem& operator=(const SvxEmphasisMarkItem& rItem )
{
SetValue( rItem.GetValue() );
return *this;
}
// enum cast
FontEmphasisMark GetEmphasisMark() const
{ return static_cast<FontEmphasisMark>(GetValue()); }
......
......@@ -90,13 +90,6 @@ public:
sal_uInt8 &GetProportionalHeight() { return nProp; }
sal_uInt8 GetProportionalHeight() const { return nProp; }
SvxEscapementItem& operator=(const SvxEscapementItem& rEsc)
{
nEsc = rEsc.GetEsc();
nProp = rEsc.GetProportionalHeight();
return *this;
}
virtual sal_uInt16 GetValueCount() const override;
OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetEnumValue() const override;
......
......@@ -43,13 +43,6 @@ public:
MapUnit ePresMetric,
OUString &rText,
const IntlWrapper& ) const override;
SvxForbiddenRuleItem& operator=(
const SvxForbiddenRuleItem& rItem )
{
SetValue( rItem.GetValue() );
return *this;
}
};
#endif
......
......@@ -42,13 +42,6 @@ public:
MapUnit ePresMetric,
OUString &rText,
const IntlWrapper& ) const override;
SvxHangingPunctuationItem& operator=(
const SvxHangingPunctuationItem& rItem )
{
SetValue( rItem.GetValue() );
return *this;
}
};
#endif
......
......@@ -72,16 +72,6 @@ public:
sal_uInt8 &GetMaxHyphens() { return nMaxHyphens; }
sal_uInt8 GetMaxHyphens() const { return nMaxHyphens; }
SvxHyphenZoneItem &operator=( const SvxHyphenZoneItem &rNew )
{
bHyphen = rNew.IsHyphen();
bPageEnd = rNew.IsPageEnd();
nMinLead = rNew.GetMinLead();
nMinTrail = rNew.GetMinTrail();
nMaxHyphens = rNew.GetMaxHyphens();
return *this;
}
};
#endif
......
......@@ -107,8 +107,6 @@ public:
virtual sal_uInt16 GetValueCount() const override;
static OUString GetValueText( SvxCellJustifyMethod nVal );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
SvxJustifyMethodItem& operator=(const SvxJustifyMethodItem& r);
};
#endif
......
......@@ -51,11 +51,6 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
SvxKerningItem& operator=(const SvxKerningItem& rKern) {
SetValue( rKern.GetValue() );
return *this;
}
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;
};
......
......@@ -36,12 +36,6 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
SvxNoHyphenItem& operator=(const SvxNoHyphenItem& rNHH)
{
SetValue( rNHH.GetValue() );
return *this;
}
};
#endif
......
......@@ -47,13 +47,6 @@ public:
sal_uInt8 &GetMinTrail() { return nMinTrail; }
sal_uInt8 GetMinTrail() const { return nMinTrail; }
SfxHyphenRegionItem& operator=( const SfxHyphenRegionItem& rNew )
{
nMinLead = rNew.GetMinLead();
nMinTrail = rNew.GetMinTrail();
return *this;
}
};
#endif
......
......@@ -45,12 +45,6 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
SvxOrphansItem& operator=( const SvxOrphansItem& rOrphans )
{
SetValue( rOrphans.GetValue() );
return *this;
}
};
#endif
......
......@@ -55,12 +55,6 @@ public:
Align GetValue() const { return static_cast<Align>(SfxUInt16Item::GetValue()); }
void SetValue(Align n) { SfxUInt16Item::SetValue(static_cast<sal_uInt16>(n)); }
SvxParaVertAlignItem& operator=( const SvxParaVertAlignItem& rItem )
{
SetValue( rItem.GetValue() );
return *this;
}
virtual bool operator==( const SfxPoolItem& ) const override;
};
......
......@@ -40,7 +40,6 @@ public:
explicit inline SvxPaperBinItem( const sal_uInt16 nId ,
const sal_uInt8 nTray = PAPERBIN_PRINTER_SETTINGS );
inline SvxPaperBinItem &operator=( const SvxPaperBinItem &rCpy );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
......@@ -54,13 +53,6 @@ inline SvxPaperBinItem::SvxPaperBinItem( const sal_uInt16 nId, const sal_uInt8 n
: SfxByteItem( nId, nT )
{}
inline SvxPaperBinItem &SvxPaperBinItem::operator=(
const SvxPaperBinItem &rCpy )
{
SetValue( rCpy.GetValue() );
return *this;
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -36,7 +36,6 @@ class EDITENG_DLLPUBLIC SvxPrintItem : public SfxBoolItem
{
public:
explicit SvxPrintItem( const sal_uInt16 nId , const bool bPrt = true );
inline SvxPrintItem &operator=( const SvxPrintItem &rCpy );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
......@@ -51,13 +50,6 @@ inline SvxPrintItem::SvxPrintItem( const sal_uInt16 nId, const bool bPrt )
: SfxBoolItem( nId, bPrt )
{}
inline SvxPrintItem &SvxPrintItem::operator=( const SvxPrintItem &rCpy )
{
SetValue( rCpy.GetValue() );
return *this;
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -44,13 +44,6 @@ public:
MapUnit ePresMetric,
OUString &rText,
const IntlWrapper& ) const override;
SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem )
{
SetValue( rItem.GetValue() );
return *this;
}
};
#endif
......
......@@ -39,7 +39,11 @@ public:
inline SvxFormatSplitItem( const bool bSplit /*= true*/,
const sal_uInt16 nWh );
inline SvxFormatSplitItem& operator=( const SvxFormatSplitItem& rSplit );
SvxFormatSplitItem(SvxFormatSplitItem const &) = default;
SvxFormatSplitItem(SvxFormatSplitItem &&) = default;
SvxFormatSplitItem & operator =(SvxFormatSplitItem const &) = default;
SvxFormatSplitItem & operator =(SvxFormatSplitItem &&) = default;
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
......@@ -54,13 +58,6 @@ inline SvxFormatSplitItem::SvxFormatSplitItem( const bool bSplit, const sal_uInt
SfxBoolItem( nWh, bSplit )
{}
inline SvxFormatSplitItem& SvxFormatSplitItem::operator=(
const SvxFormatSplitItem& rSplit )
{
SetValue( rSplit.GetValue() );
return *this;
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -36,6 +36,11 @@ public:
sal_uInt16 nId );
virtual ~SvxTwoLinesItem() override;
SvxTwoLinesItem(SvxTwoLinesItem const &) = default;
SvxTwoLinesItem(SvxTwoLinesItem &&) = default;
SvxTwoLinesItem & operator =(SvxTwoLinesItem const &) = default;
SvxTwoLinesItem & operator =(SvxTwoLinesItem &&) = default;
// "pure virtual Methods" from SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
......@@ -50,14 +55,6 @@ public:
virtual sal_uInt16 GetVersion( sal_uInt16 nFFVer ) const override;
SvxTwoLinesItem& operator=( const SvxTwoLinesItem& rCpy )
{
SetValue( rCpy.GetValue() );
SetStartBracket( rCpy.GetStartBracket() );
SetEndBracket( rCpy.GetEndBracket() );
return *this;
}
bool GetValue() const { return bOn; }
void SetValue( bool bFlag ) { bOn = bFlag; }
......
......@@ -45,12 +45,6 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
SvxWidowsItem& operator=( const SvxWidowsItem& rWidows )
{
SetValue( rWidows.GetValue() );
return *this;
}
};
#endif
......
......@@ -32,7 +32,10 @@ public:
sal_uInt16 nWhich /*= SDRATTR_TEXTDIRECTION*/ );
virtual ~SvxWritingModeItem() override;
SvxWritingModeItem& operator=( const SvxWritingModeItem& rItem );
SvxWritingModeItem(SvxWritingModeItem const &) = default;
SvxWritingModeItem(SvxWritingModeItem &&) = default;
SvxWritingModeItem & operator =(SvxWritingModeItem const &) = default;
SvxWritingModeItem & operator =(SvxWritingModeItem &&) = default;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
......
......@@ -47,12 +47,6 @@ public:
MapUnit eCoreMetric,
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
SvxWordLineModeItem& operator=( const SvxWordLineModeItem& rWLM )
{
SetValue( rWLM.GetValue() );
return *this;
}
};
#endif
......
......@@ -36,6 +36,11 @@ public:
sal_uInt16 );
virtual ~SvxGrfCrop() override;
SvxGrfCrop(SvxGrfCrop const &) = default;
SvxGrfCrop(SvxGrfCrop &&) = default;
SvxGrfCrop & operator =(SvxGrfCrop const &) = default;
SvxGrfCrop & operator =(SvxGrfCrop &&) = default;
// "pure virtual methods" from SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
......@@ -57,13 +62,6 @@ public:
sal_Int32 GetRight() const { return nRight; }
sal_Int32 GetTop() const { return nTop; }
sal_Int32 GetBottom() const { return nBottom; }
SvxGrfCrop& operator=( const SvxGrfCrop& rCrop )
{
nLeft = rCrop.GetLeft(); nTop = rCrop.GetTop();
nRight = rCrop.GetRight(); nBottom = rCrop.GetBottom();
return *this;
}
};
#endif // INCLUDED_SVX_GRFCROP_HXX
......
......@@ -40,12 +40,6 @@ public:
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
SvxPostItAuthorItem& operator=( const SvxPostItAuthorItem& rAuthor )
{
SetValue( rAuthor.GetValue() );
return *this;
}
};
......@@ -66,12 +60,6 @@ public:
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
SvxPostItDateItem& operator=( const SvxPostItDateItem& rDate )
{
SetValue( rDate.GetValue() );
return *this;
}
};
/** The text of a note
......@@ -92,12 +80,6 @@ public:
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
SvxPostItTextItem& operator=( const SvxPostItTextItem& rText )
{
SetValue( rText.GetValue() );
return *this;
}
};
......@@ -112,12 +94,6 @@ public:
SvxPostItIdItem( sal_uInt16 nWhich );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
SvxPostItIdItem& operator=( const SvxPostItIdItem& rId )
{
SetValue( rId.GetValue() );
return *this;
}
};
#endif
......
......@@ -34,22 +34,12 @@ public:
,xInterface( rxInterface )
{}
inline FmInterfaceItem& operator=( const FmInterfaceItem &rCpy );
// "purely virtual methods" of the SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
};
inline FmInterfaceItem& FmInterfaceItem::operator=( const FmInterfaceItem &rCpy )
{
xInterface = rCpy.xInterface;
return *this;
}
#endif // INCLUDED_SVX_SOURCE_INC_FMITEMS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -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); }
......
......@@ -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;
......
......@@ -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); }
......
......@@ -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;
......
......@@ -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;
......
......@@ -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); }
......
......@@ -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; }
......
......@@ -36,13 +36,6 @@ SwFormatWrapInfluenceOnObjPos::~SwFormatWrapInfluenceOnObjPos()
{
}
SwFormatWrapInfluenceOnObjPos& SwFormatWrapInfluenceOnObjPos::operator=( const SwFormatWrapInfluenceOnObjPos& _rSource )
{
mnWrapInfluenceOnPosition = _rSource.GetWrapInfluenceOnObjPos();
return *this;
}
bool SwFormatWrapInfluenceOnObjPos::operator==( const SfxPoolItem& rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
......
......@@ -197,18 +197,6 @@ SwFormatFrameSize::SwFormatFrameSize( SwFrameSize eSize, SwTwips nWidth, SwTwips
m_nWidthPercent = m_eWidthPercentRelation = m_nHeightPercent = m_eHeightPercentRelation = 0;
}
SwFormatFrameSize& SwFormatFrameSize::operator=( const SwFormatFrameSize& rCpy )
{
SvxSizeItem::operator=(rCpy);
m_eFrameHeightType = rCpy.GetHeightSizeType();
m_eFrameWidthType = rCpy.GetWidthSizeType();
m_nHeightPercent = rCpy.GetHeightPercent();
m_eHeightPercentRelation = rCpy.GetHeightPercentRelation();
m_nWidthPercent = rCpy.GetWidthPercent();
m_eWidthPercentRelation = rCpy.GetWidthPercentRelation();
return *this;
}
bool SwFormatFrameSize::operator==( const SfxPoolItem& rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
......@@ -2218,23 +2206,6 @@ SfxPoolItem* SwTextGridItem::Clone( SfxItemPool* ) const
return new SwTextGridItem( *this );
}
SwTextGridItem& SwTextGridItem::operator=( const SwTextGridItem& rCpy )
{
m_aColor = rCpy.GetColor();
m_nLines = rCpy.GetLines();
m_nBaseHeight = rCpy.GetBaseHeight();
m_nRubyHeight = rCpy.GetRubyHeight();
m_eGridType = rCpy.GetGridType();
m_bRubyTextBelow = rCpy.GetRubyTextBelow();
m_bPrintGrid = rCpy.GetPrintGrid();
m_bDisplayGrid = rCpy.GetDisplayGrid();
m_nBaseWidth = rCpy.GetBaseWidth();
m_bSnapToChars = rCpy.GetSnapToChars();
m_bSquaredMode = rCpy.GetSquaredMode();
return *this;
}
bool SwTextGridItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
bool bRet = true;
......
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