[Libreoffice-commits] core.git: editeng/inc editeng/source include/editeng
Jochen Nitschke
j.nitschke+logerrit at ok.de
Mon Nov 13 06:12:23 UTC 2017
editeng/inc/editdoc.hxx | 4 --
editeng/source/editeng/editdoc.cxx | 17 ----------
editeng/source/editeng/fieldupdater.cxx | 1
editeng/source/items/borderline.cxx | 24 --------------
editeng/source/items/optitems.cxx | 10 ------
editeng/source/items/paraitem.cxx | 7 ----
editeng/source/items/textitem.cxx | 28 ----------------
editeng/source/misc/swafopt.cxx | 53 --------------------------------
editeng/source/outliner/paralist.cxx | 15 ---------
include/editeng/borderline.hxx | 3 -
include/editeng/colritem.hxx | 2 -
include/editeng/flstitem.hxx | 1
include/editeng/formatbreakitem.hxx | 4 --
include/editeng/optitems.hxx | 1
include/editeng/paragraphdata.hxx | 3 -
include/editeng/swafopt.hxx | 2 -
include/editeng/tstpitem.hxx | 1
include/editeng/twolinesitem.hxx | 1
18 files changed, 177 deletions(-)
New commits:
commit c8c5072a2f20d58807c233a1b62ded406931db78
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Sun Nov 12 20:00:46 2017 +0100
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/44657
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index c5f6f7ddf1fb..541ccca8b424 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -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; }
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index db5b4b28799d..8db5de5780d8 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -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 )
{
diff --git a/editeng/source/editeng/fieldupdater.cxx b/editeng/source/editeng/fieldupdater.cxx
index 318c057d3546..aab517773c41 100644
--- a/editeng/source/editeng/fieldupdater.cxx
+++ b/editeng/source/editeng/fieldupdater.cxx
@@ -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)
{
diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx
index 41b8eae938a3..3005e3161827 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -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;
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index fea69e09426b..1186192c088b 100644
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -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));
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 09b7e34106e8..b9a314be946a 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -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 );
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 54d065f48c8c..e9ec28a812ec 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -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()
{
}
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index a8e424a093a5..b68dcce37c3c 100644
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -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: */
diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index 837080fd7e66..6db6172ce078 100644
--- a/editeng/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -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
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index 848c4308ce33..b1133825b842 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -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;
diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index 0e4c60702d0c..d58ee5866817 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -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;
diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx
index 527a38544c0b..72948d94fc70 100644
--- a/include/editeng/flstitem.hxx
+++ b/include/editeng/flstitem.hxx
@@ -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;
diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx
index 64ca7346feed..495ff3bc975a 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -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 )
diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx
index 2ecf91e8e8f1..ccf91408aeb7 100644
--- a/include/editeng/optitems.hxx
+++ b/include/editeng/optitems.hxx
@@ -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,
diff --git a/include/editeng/paragraphdata.hxx b/include/editeng/paragraphdata.hxx
index 6ea49eb2ddf7..f0e859d6fe1a 100644
--- a/include/editeng/paragraphdata.hxx
+++ b/include/editeng/paragraphdata.hxx
@@ -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; }
diff --git a/include/editeng/swafopt.hxx b/include/editeng/swafopt.hxx
index 726d8a315350..e8d7d3a6facf 100644
--- a/include/editeng/swafopt.hxx
+++ b/include/editeng/swafopt.hxx
@@ -115,8 +115,6 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFormatFlags
bool bAutoCmpltKeepList : 1;
SvxSwAutoFormatFlags();
- SvxSwAutoFormatFlags( const SvxSwAutoFormatFlags& rAFFlags ) { *this = rAFFlags; }
- SvxSwAutoFormatFlags& operator=( const SvxSwAutoFormatFlags& );
};
#endif
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index 34c65604bc8c..291e1c72e9fc 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -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;
diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx
index 7a5fb62cf351..6386844ca466 100644
--- a/include/editeng/twolinesitem.hxx
+++ b/include/editeng/twolinesitem.hxx
@@ -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
More information about the Libreoffice-commits
mailing list