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

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

remove default-able copy constructors/assignments
and a non-virtual default dtor.

Change-Id: I3fcc23a480031a9ede00ea22ae8f5ac5e892fd9c
Reviewed-on: https://gerrit.libreoffice.org/44657Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 8d4a44d1
......@@ -163,8 +163,6 @@ private:
public:
ContentAttribs( SfxItemPool& rItemPool );
ContentAttribs( const ContentAttribs& );
~ContentAttribs(); // only for larger Tabs
void dumpAsXml(struct _xmlTextWriter* pWriter) const;
......@@ -311,7 +309,6 @@ private:
public:
EditPaM();
EditPaM(const EditPaM& r);
EditPaM(ContentNode* p, sal_Int32 n);
const ContentNode* GetNode() const { return pNode;}
......@@ -323,7 +320,6 @@ public:
bool DbgIsBuggy( EditDoc const & rDoc );
EditPaM& operator = ( const EditPaM& rPaM );
friend bool operator == ( const EditPaM& r1, const EditPaM& r2 );
friend bool operator != ( const EditPaM& r1, const EditPaM& r2 );
bool operator !() const { return !pNode && !nIndex; }
......
......@@ -1114,7 +1114,6 @@ void EditLineList::Insert(sal_Int32 nPos, EditLine* p)
}
EditPaM::EditPaM() : pNode(nullptr), nIndex(0) {}
EditPaM::EditPaM(const EditPaM& r) : pNode(r.pNode), nIndex(r.nIndex) {}
EditPaM::EditPaM(ContentNode* p, sal_Int32 n) : pNode(p), nIndex(n) {}
......@@ -1190,13 +1189,6 @@ bool operator == ( const EditPaM& r1, const EditPaM& r2 )
( r1.GetIndex() == r2.GetIndex() );
}
EditPaM& EditPaM::operator = ( const EditPaM& rPaM )
{
nIndex = rPaM.nIndex;
pNode = rPaM.pNode;
return *this;
}
bool operator != ( const EditPaM& r1, const EditPaM& r2 )
{
return !( r1 == r2 );
......@@ -1821,15 +1813,6 @@ ContentAttribs::ContentAttribs( SfxItemPool& rPool )
{
}
ContentAttribs::ContentAttribs( const ContentAttribs& rRef )
: pStyle(rRef.pStyle)
, aAttribSet( rRef.aAttribSet )
{
}
ContentAttribs::~ContentAttribs()
{
}
SvxTabStop ContentAttribs::FindTabStop( sal_Int32 nCurPos, sal_uInt16 nDefTab )
{
......
......@@ -24,7 +24,6 @@ class FieldUpdaterImpl
EditTextObjectImpl& mrObj;
public:
explicit FieldUpdaterImpl(EditTextObject const & rObj) : mrObj(*rObj.mpImpl) {}
FieldUpdaterImpl(const FieldUpdaterImpl& r) : mrObj(r.mrObj) {}
void updateTableFields(int nTab)
{
......
......@@ -399,30 +399,6 @@ BorderWidthImpl SvxBorderLine::getWidthImpl( SvxBorderLineStyle nStyle )
return aImpl;
}
SvxBorderLine::SvxBorderLine( const SvxBorderLine& r )
{
*this = r;
}
SvxBorderLine& SvxBorderLine::operator=( const SvxBorderLine& r )
{
aColor = r.aColor;
m_nWidth = r.m_nWidth;
m_aWidthImpl = r.m_aWidthImpl;
m_bMirrorWidths = r.m_bMirrorWidths;
m_nMult = r.m_nMult;
m_nDiv = r.m_nDiv;
m_nStyle = r.m_nStyle;
m_bUseLeftTop = r.m_bUseLeftTop;
m_pColorOutFn = r.m_pColorOutFn;
m_pColorInFn = r.m_pColorInFn;
m_pColorGapFn = r.m_pColorGapFn;
return *this;
}
void SvxBorderLine::ScaleMetrics( long nMult, long nDiv )
{
m_nMult = nMult;
......
......@@ -32,16 +32,6 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const sal_uInt16 nId ) :
}
SfxHyphenRegionItem::SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ) :
SfxPoolItem ( rItem ),
nMinLead ( rItem.GetMinLead() ),
nMinTrail ( rItem.GetMinTrail() )
{
}
bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
......
......@@ -748,13 +748,6 @@ SvxTabStopItem::SvxTabStopItem( const sal_uInt16 nTabs,
}
SvxTabStopItem::SvxTabStopItem( const SvxTabStopItem& rTSI ) :
SfxPoolItem( rTSI.Which() ),
maTabStops( rTSI.maTabStops )
{
}
sal_uInt16 SvxTabStopItem::GetPos( const SvxTabStop& rTab ) const
{
SvxTabStopArr::const_iterator it = maTabStops.find( rTab );
......
......@@ -142,15 +142,6 @@ SvxFontListItem::SvxFontListItem( const FontList* pFontLst,
}
SvxFontListItem::SvxFontListItem( const SvxFontListItem& rItem ) :
SfxPoolItem( rItem ),
pFontList( rItem.GetFontList() ),
aFontNameSeq( rItem.aFontNameSeq )
{
}
SfxPoolItem* SvxFontListItem::Clone( SfxItemPool* ) const
{
return new SvxFontListItem( *this );
......@@ -1641,11 +1632,6 @@ SvxBackgroundColorItem::SvxBackgroundColorItem( const Color& rCol,
{
}
SvxBackgroundColorItem::SvxBackgroundColorItem( const SvxBackgroundColorItem& rCopy ) :
SvxColorItem( rCopy )
{
}
SfxPoolItem* SvxBackgroundColorItem::Clone( SfxItemPool * ) const
{
return new SvxBackgroundColorItem(*this);
......@@ -1718,12 +1704,6 @@ SvxColorItem::SvxColorItem( SvStream &rStrm, const sal_uInt16 nId ) :
mColor = aColor;
}
SvxColorItem::SvxColorItem( const SvxColorItem &rCopy ) :
SfxPoolItem( rCopy ),
mColor( rCopy.mColor )
{
}
SvxColorItem::~SvxColorItem()
{
}
......@@ -2456,14 +2436,6 @@ SvxTwoLinesItem::SvxTwoLinesItem( bool bFlag, sal_Unicode nStartBracket,
{
}
SvxTwoLinesItem::SvxTwoLinesItem( const SvxTwoLinesItem& rAttr )
: SfxPoolItem( rAttr.Which() ),
cStartBracket( rAttr.cStartBracket ),
cEndBracket( rAttr.cEndBracket ),
bOn( rAttr.bOn )
{
}
SvxTwoLinesItem::~SvxTwoLinesItem()
{
}
......
......@@ -75,57 +75,4 @@ SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
pSmartTagMgr = nullptr;
}
SvxSwAutoFormatFlags& SvxSwAutoFormatFlags::operator=( const SvxSwAutoFormatFlags& rAFFlags )
{
bAutoCorrect = rAFFlags.bAutoCorrect;
bCapitalStartSentence = rAFFlags.bCapitalStartSentence;
bCapitalStartWord = rAFFlags.bCapitalStartWord;
bChgUserColl = rAFFlags.bChgUserColl;
bChgEnumNum = rAFFlags.bChgEnumNum;
bDelEmptyNode = rAFFlags.bDelEmptyNode;
bSetNumRule = rAFFlags.bSetNumRule;
bAFormatByInput = rAFFlags.bAFormatByInput;
bAddNonBrkSpace = rAFFlags.bAddNonBrkSpace;
bChgOrdinalNumber = rAFFlags.bChgOrdinalNumber;
bChgToEnEmDash = rAFFlags.bChgToEnEmDash;
bChgWeightUnderl = rAFFlags.bChgWeightUnderl;
bSetINetAttr = rAFFlags.bSetINetAttr;
bSetBorder = rAFFlags.bSetBorder;
bCreateTable = rAFFlags.bCreateTable;
bReplaceStyles = rAFFlags.bReplaceStyles;
bAFormatDelSpacesAtSttEnd = rAFFlags.bAFormatDelSpacesAtSttEnd;
bAFormatDelSpacesBetweenLines = rAFFlags.bAFormatDelSpacesBetweenLines;
bAFormatByInpDelSpacesAtSttEnd = rAFFlags.bAFormatByInpDelSpacesAtSttEnd;
bAFormatByInpDelSpacesBetweenLines = rAFFlags.bAFormatByInpDelSpacesBetweenLines;
bWithRedlining = rAFFlags.bWithRedlining;
bRightMargin = rAFFlags.bRightMargin;
nRightMargin = rAFFlags.nRightMargin;
cBullet = rAFFlags.cBullet;
aBulletFont = rAFFlags.aBulletFont;
cByInputBullet = rAFFlags.cByInputBullet;
aByInputBulletFont = rAFFlags.aByInputBulletFont;
bAutoCompleteWords = rAFFlags.bAutoCompleteWords;
bAutoCmpltCollectWords = rAFFlags.bAutoCmpltCollectWords;
bAutoCmpltKeepList = rAFFlags.bAutoCmpltKeepList;
bAutoCmpltEndless = rAFFlags.bAutoCmpltEndless;
bAutoCmpltAppendBlanc = rAFFlags.bAutoCmpltAppendBlanc;
bAutoCmpltShowAsTip = rAFFlags.bAutoCmpltShowAsTip;
m_pAutoCompleteList = rAFFlags.m_pAutoCompleteList;
pSmartTagMgr = rAFFlags.pSmartTagMgr;
nAutoCmpltExpandKey = rAFFlags.nAutoCmpltExpandKey;
nAutoCmpltWordLen = rAFFlags.nAutoCmpltWordLen;
nAutoCmpltListLen = rAFFlags.nAutoCmpltListLen;
return *this;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -36,21 +36,6 @@ ParagraphData::ParagraphData()
{
}
ParagraphData::ParagraphData( const ParagraphData& r )
: nDepth( r.nDepth )
, mnNumberingStartValue( r.mnNumberingStartValue )
, mbParaIsNumberingRestart( r.mbParaIsNumberingRestart )
{
}
ParagraphData& ParagraphData::operator=( const ParagraphData& r)
{
nDepth = r.nDepth;
mnNumberingStartValue = r.mnNumberingStartValue;
mbParaIsNumberingRestart = r.mbParaIsNumberingRestart;
return *this;
}
bool ParagraphData::operator==(const ParagraphData& rCandidate) const
{
return (nDepth == rCandidate.nDepth
......
......@@ -161,9 +161,6 @@ public:
SvxBorderLineStyle nStyle = SvxBorderLineStyle::SOLID,
Color (*pColorOutFn)( Color ) = &darkColor,
Color (*pColorInFn)( Color ) = &darkColor );
SvxBorderLine( const SvxBorderLine& r );
SvxBorderLine& operator=( const SvxBorderLine& r );
const Color& GetColor() const { return aColor; }
Color GetColorOut( bool bLeftOrTop = true ) const;
......
......@@ -40,7 +40,6 @@ public:
explicit SvxColorItem(const sal_uInt16 nId);
SvxColorItem(const Color& aColor, const sal_uInt16 nId);
SvxColorItem(SvStream& rStream, const sal_uInt16 nId);
SvxColorItem(const SvxColorItem& rCopy);
virtual ~SvxColorItem() override;
// "pure virtual Methods" from SfxPoolItem
......@@ -78,7 +77,6 @@ class EDITENG_DLLPUBLIC SvxBackgroundColorItem : public SvxColorItem
SvxBackgroundColorItem(const sal_uInt16 nId);
SvxBackgroundColorItem(const Color& rCol, const sal_uInt16 nId);
SvxBackgroundColorItem(const SvxBackgroundColorItem& rCopy);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override;
......
......@@ -44,7 +44,6 @@ private:
public:
SvxFontListItem( const FontList* pFontLst,
const sal_uInt16 nId );
SvxFontListItem( const SvxFontListItem& rItem );
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
......
......@@ -40,7 +40,6 @@ public:
inline SvxFormatBreakItem( const SvxBreak eBrk /*= SvxBreak::NONE*/,
const sal_uInt16 nWhich );
inline SvxFormatBreakItem( const SvxFormatBreakItem& rBreak );
inline SvxFormatBreakItem& operator=( const SvxFormatBreakItem& rCpy );
// "pure virtual Methods" from SfxPoolItem
......@@ -69,9 +68,6 @@ inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxBreak eBreak,
SfxEnumItem( _nWhich, eBreak )
{}
inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxFormatBreakItem& rBreak ) :
SfxEnumItem( rBreak )
{}
inline SvxFormatBreakItem& SvxFormatBreakItem::operator=(
const SvxFormatBreakItem& rBreak )
......
......@@ -33,7 +33,6 @@ class EDITENG_DLLPUBLIC SfxHyphenRegionItem: public SfxPoolItem
public:
SfxHyphenRegionItem( const sal_uInt16 nId );
SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem );
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
......
......@@ -34,11 +34,8 @@ protected:
bool mbParaIsNumberingRestart;
public:
ParagraphData( const ParagraphData& );
ParagraphData();
ParagraphData& operator=( const ParagraphData& );
bool operator==(const ParagraphData& rCandidate) const;
sal_Int16 getDepth() const { return nDepth; }
......
......@@ -115,8 +115,6 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFormatFlags
bool bAutoCmpltKeepList : 1;
SvxSwAutoFormatFlags();
SvxSwAutoFormatFlags( const SvxSwAutoFormatFlags& rAFFlags ) { *this = rAFFlags; }
SvxSwAutoFormatFlags& operator=( const SvxSwAutoFormatFlags& );
};
#endif
......
......@@ -108,7 +108,6 @@ public:
const sal_uInt16 nDist,
const SvxTabAdjust eAdjst /*= SvxTabAdjust::Default*/,
sal_uInt16 nWhich );
SvxTabStopItem( const SvxTabStopItem& rTSI );
// Returns index of the tab or TAB_NOTFOUND
sal_uInt16 GetPos( const SvxTabStop& rTab ) const;
......
......@@ -34,7 +34,6 @@ public:
sal_Unicode nStartBracket /*= 0*/,
sal_Unicode nEndBracket /*= 0*/,
sal_uInt16 nId );
SvxTwoLinesItem( const SvxTwoLinesItem& rAttr );
virtual ~SvxTwoLinesItem() override;
// "pure virtual Methods" from SfxPoolItem
......
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