editeng/source/items/justifyitem.cxx | 6 ----
editeng/source/items/writingmodeitem.cxx | 6 ----
include/editeng/autokernitem.hxx | 6 ----
include/editeng/blinkitem.hxx | 5 ---
include/editeng/charhiddenitem.hxx | 5 ---
include/editeng/charreliefitem.hxx | 6 ----
include/editeng/charrotateitem.hxx | 13 ----------
include/editeng/charscaleitem.hxx | 7 -----
include/editeng/charsetcoloritem.hxx | 7 -----
include/editeng/cmapitem.hxx | 6 ----
include/editeng/emphasismarkitem.hxx | 6 ----
include/editeng/escapementitem.hxx | 7 -----
include/editeng/forbiddenruleitem.hxx | 7 -----
include/editeng/hngpnctitem.hxx | 7 -----
include/editeng/hyphenzoneitem.hxx | 10 -------
include/editeng/justifyitem.hxx | 2 -
include/editeng/kernitem.hxx | 5 ---
include/editeng/nhypitem.hxx | 6 ----
include/editeng/optitems.hxx | 7 -----
include/editeng/orphitem.hxx | 6 ----
include/editeng/paravertalignitem.hxx | 6 ----
include/editeng/pbinitem.hxx | 8 ------
include/editeng/prntitem.hxx | 8 ------
include/editeng/scriptspaceitem.hxx | 7 -----
include/editeng/spltitem.hxx | 13 +++-------
include/editeng/twolinesitem.hxx | 13 +++-------
include/editeng/widwitem.hxx | 6 ----
include/editeng/writingmodeitem.hxx | 5 +++
include/editeng/wrlmitem.hxx | 6 ----
include/svx/grfcrop.hxx | 12 +++------
include/svx/postattr.hxx | 24 -------------------
svx/source/inc/fmitems.hxx | 10 -------
sw/inc/fmtfordr.hxx | 7 -----
sw/inc/fmtfsize.hxx | 1
sw/inc/fmtsrnd.hxx | 10 -------
sw/inc/fmtwrapinfluenceonobjpos.hxx | 6 +++-
sw/inc/grfatr.hxx | 13 ----------
sw/inc/paratr.hxx | 18 --------------
sw/inc/tgrditem.hxx | 7 +++--
sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx | 7 -----
sw/source/core/layout/atrfrm.cxx | 29 -----------------------
41 files changed, 28 insertions(+), 318 deletions(-)
New commits:
commit 727878a7d8ae25342db75173cc314fa330ccc077
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jul 26 16:42:16 2018 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jul 27 08:29:44 2018 +0200
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: Stephan Bergmann <sberg...@redhat.com>
diff --git a/editeng/source/items/justifyitem.cxx
b/editeng/source/items/justifyitem.cxx
index f940950bede4..c22b989bfc0e 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -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: */
diff --git a/editeng/source/items/writingmodeitem.cxx
b/editeng/source/items/writingmodeitem.cxx
index d4cd8a385d3b..25e6bfb1cb22 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -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: */
diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx
index b841f79e0be6..e357b01c0d0b 100644
--- a/include/editeng/autokernitem.hxx
+++ b/include/editeng/autokernitem.hxx
@@ -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
diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx
index 658c783171bd..62e0f05c124e 100644
--- a/include/editeng/blinkitem.hxx
+++ b/include/editeng/blinkitem.hxx
@@ -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
diff --git a/include/editeng/charhiddenitem.hxx
b/include/editeng/charhiddenitem.hxx
index ec2b1400adaf..625675dc2a89 100644
--- a/include/editeng/charhiddenitem.hxx
+++ b/include/editeng/charhiddenitem.hxx
@@ -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
diff --git a/include/editeng/charreliefitem.hxx
b/include/editeng/charreliefitem.hxx
index 5284040fcb86..fd6607070852 100644
--- a/include/editeng/charreliefitem.hxx
+++ b/include/editeng/charreliefitem.hxx
@@ -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
diff --git a/include/editeng/charrotateitem.hxx
b/include/editeng/charrotateitem.hxx
index 848815ca098c..1c0b82ffc8b8 100644
--- a/include/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
@@ -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; }
diff --git a/include/editeng/charscaleitem.hxx
b/include/editeng/charscaleitem.hxx
index 1a18f30e1393..cd116334d005 100644
--- a/include/editeng/charscaleitem.hxx
+++ b/include/editeng/charscaleitem.hxx
@@ -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
diff --git a/include/editeng/charsetcoloritem.hxx
b/include/editeng/charsetcoloritem.hxx
index 5a1b86f7b06a..33ff2c2fa522 100644
--- a/include/editeng/charsetcoloritem.hxx
+++ b/include/editeng/charsetcoloritem.hxx
@@ -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
diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx
index b3e8536bc4ed..dace57245fe2 100644
--- a/include/editeng/cmapitem.hxx
+++ b/include/editeng/cmapitem.hxx
@@ -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;
diff --git a/include/editeng/emphasismarkitem.hxx
b/include/editeng/emphasismarkitem.hxx
index 9bc5ce883b58..67019d7d29c5 100644
--- a/include/editeng/emphasismarkitem.hxx
+++ b/include/editeng/emphasismarkitem.hxx
@@ -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()); }
diff --git a/include/editeng/escapementitem.hxx
b/include/editeng/escapementitem.hxx
index 6269d1322434..77c8eb1cb2b7 100644
--- a/include/editeng/escapementitem.hxx
+++ b/include/editeng/escapementitem.hxx
@@ -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;
diff --git a/include/editeng/forbiddenruleitem.hxx
b/include/editeng/forbiddenruleitem.hxx
index 768ed4af33c9..6213eab66a64 100644
--- a/include/editeng/forbiddenruleitem.hxx
+++ b/include/editeng/forbiddenruleitem.hxx
@@ -43,13 +43,6 @@ public:
MapUnit ePresMetric,
OUString &rText,
const IntlWrapper& ) const override;
-
- SvxForbiddenRuleItem& operator=(
- const SvxForbiddenRuleItem& rItem )
- {
- SetValue( rItem.GetValue() );
- return *this;
- }
};
#endif
diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx
index 9c0736dc47d4..dea50716f29d 100644
--- a/include/editeng/hngpnctitem.hxx
+++ b/include/editeng/hngpnctitem.hxx
@@ -42,13 +42,6 @@ public:
MapUnit ePresMetric,
OUString &rText,
const IntlWrapper& ) const override;
-
- SvxHangingPunctuationItem& operator=(
- const SvxHangingPunctuationItem& rItem )
- {
- SetValue( rItem.GetValue() );
- return *this;
- }
};
#endif
diff --git a/include/editeng/hyphenzoneitem.hxx
b/include/editeng/hyphenzoneitem.hxx
index b3c12a226860..9d04c8a3b744 100644
--- a/include/editeng/hyphenzoneitem.hxx
+++ b/include/editeng/hyphenzoneitem.hxx
@@ -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
diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx
index a4513a76e257..59d4182f2c01 100644
--- a/include/editeng/justifyitem.hxx
+++ b/include/editeng/justifyitem.hxx
@@ -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
diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx
index b6a3259f568d..1abd3c880faa 100644
--- a/include/editeng/kernitem.hxx
+++ b/include/editeng/kernitem.hxx
@@ -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;
};
diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx
index 2e6a9f39b6f7..b05569f0599f 100644
--- a/include/editeng/nhypitem.hxx
+++ b/include/editeng/nhypitem.hxx
@@ -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
diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx
index ccf91408aeb7..f85095962bb9 100644
--- a/include/editeng/optitems.hxx
+++ b/include/editeng/optitems.hxx
@@ -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
diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx
index a9df24573541..d40e5144b494 100644
--- a/include/editeng/orphitem.hxx
+++ b/include/editeng/orphitem.hxx
@@ -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
diff --git a/include/editeng/paravertalignitem.hxx
b/include/editeng/paravertalignitem.hxx
index 1059343268ab..57f82c6d8e44 100644
--- a/include/editeng/paravertalignitem.hxx
+++ b/include/editeng/paravertalignitem.hxx
@@ -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;
};
diff --git a/include/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx
index 324bda43e5f9..d65bd53dbbcb 100644
--- a/include/editeng/pbinitem.hxx
+++ b/include/editeng/pbinitem.hxx
@@ -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: */
diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx
index 47cd59d0158f..a5d5e9c1fa5a 100644
--- a/include/editeng/prntitem.hxx
+++ b/include/editeng/prntitem.hxx
@@ -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: */
diff --git a/include/editeng/scriptspaceitem.hxx
b/include/editeng/scriptspaceitem.hxx
index 09776ba13510..46d3be6c7315 100644
--- a/include/editeng/scriptspaceitem.hxx
+++ b/include/editeng/scriptspaceitem.hxx
@@ -44,13 +44,6 @@ public:
MapUnit ePresMetric,
OUString &rText,
const IntlWrapper& ) const override;
-
- SvxScriptSpaceItem& operator=(const SvxScriptSpaceItem& rItem )
- {
- SetValue( rItem.GetValue() );
- return *this;
- }
-
};
#endif
diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx
index 623dca2bfda6..081d8b8ee87a 100644
--- a/include/editeng/spltitem.hxx
+++ b/include/editeng/spltitem.hxx
@@ -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: */
diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx
index 6386844ca466..2833d49e9df6 100644
--- a/include/editeng/twolinesitem.hxx
+++ b/include/editeng/twolinesitem.hxx
@@ -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; }
diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx
index 3f5966864e19..32d255731c33 100644
--- a/include/editeng/widwitem.hxx
+++ b/include/editeng/widwitem.hxx
@@ -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
diff --git a/include/editeng/writingmodeitem.hxx
b/include/editeng/writingmodeitem.hxx
index c7a823d8c6bd..737de29f3269 100644
--- a/include/editeng/writingmodeitem.hxx
+++ b/include/editeng/writingmodeitem.hxx
@@ -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;
diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx
index 15230e10386e..648b2fca61e5 100644
--- a/include/editeng/wrlmitem.hxx
+++ b/include/editeng/wrlmitem.hxx
@@ -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
diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx
index 96fc7d5c802f..73693e65123d 100644
--- a/include/svx/grfcrop.hxx
+++ b/include/svx/grfcrop.hxx
@@ -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
diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx
index 65dee15106d5..1e5da716376e 100644
--- a/include/svx/postattr.hxx
+++ b/include/svx/postattr.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
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
index 10dcebfe73fc..7947b9e75028 100644
--- a/svx/source/inc/fmitems.hxx
+++ b/svx/source/inc/fmitems.hxx
@@ -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: */
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; }
diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index 7e051c7b76b9..bda1f3d136a5 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -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));
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index a7324f78c9c0..1f122224b490 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
