[Libreoffice-commits] core.git: sw/inc sw/source
Jochen Nitschke
j.nitschke+logerrit at ok.de
Sun Dec 3 19:20:22 UTC 2017
sw/inc/SwRewriter.hxx | 1
sw/inc/cellfml.hxx | 8 -----
sw/inc/fmtautofmt.hxx | 8 -----
sw/inc/fmtftntx.hxx | 5 ---
sw/inc/fmtsrnd.hxx | 1
sw/inc/fmturl.hxx | 3 --
sw/inc/fmtwrapinfluenceonobjpos.hxx | 2 -
sw/inc/grfatr.hxx | 4 --
sw/inc/paratr.hxx | 5 ---
sw/inc/sortopt.hxx | 1
sw/source/core/access/accfrmobj.cxx | 15 -----------
sw/source/core/access/accfrmobj.hxx | 3 --
sw/source/core/access/accfrmobjslist.hxx | 6 ----
sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx | 6 ----
sw/source/core/doc/sortopt.cxx | 8 -----
sw/source/core/docnode/ndtbl.cxx | 3 --
sw/source/core/inc/swfont.hxx | 2 -
sw/source/core/layout/atrfrm.cxx | 8 -----
sw/source/core/layout/flycnt.cxx | 2 -
sw/source/core/txtnode/fmtatr2.cxx | 9 ------
sw/source/core/txtnode/swfont.cxx | 13 ---------
sw/source/core/undo/SwRewriter.cxx | 5 ---
sw/source/filter/basflt/fltshell.cxx | 22 ----------------
sw/source/filter/html/svxcss1.cxx | 5 ---
sw/source/filter/inc/fltshell.hxx | 23 -----------------
sw/source/filter/ww8/writerhelper.cxx | 20 --------------
sw/source/filter/ww8/writerhelper.hxx | 4 --
sw/source/filter/ww8/wrtw8esh.cxx | 12 --------
sw/source/filter/ww8/wrtww8.hxx | 2 -
sw/source/filter/ww8/wrtww8gr.cxx | 9 ------
sw/source/filter/ww8/ww8toolbar.cxx | 31 -----------------------
sw/source/filter/ww8/ww8toolbar.hxx | 2 -
32 files changed, 2 insertions(+), 246 deletions(-)
New commits:
commit 8759c6b5e57e7cf7574f04e9b4685a67d23fc6d5
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Wed Nov 29 21:23:30 2017 +0100
clang-tidy modernize-use-equals-default in sw
also removing an odd Swap function in sw::util::Setlayer
Change-Id: Ied4a4bb5a6ef3f6bdd29c40b19680600536407bc
Reviewed-on: https://gerrit.libreoffice.org/45740
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sw/inc/SwRewriter.hxx b/sw/inc/SwRewriter.hxx
index 59fb43caee72..4fc2658a801f 100644
--- a/sw/inc/SwRewriter.hxx
+++ b/sw/inc/SwRewriter.hxx
@@ -39,7 +39,6 @@ class SW_DLLPUBLIC SwRewriter
public:
SwRewriter();
- SwRewriter(const SwRewriter & rSrc);
~SwRewriter();
void AddRule(SwUndoArg eWhat, const OUString & rWith);
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index b79054e6f658..1828c1b1be4f 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -108,15 +108,7 @@ protected:
public:
- SwTableFormula( const SwTableFormula& rCpy ) { *this = rCpy; }
virtual ~SwTableFormula();
- SwTableFormula& operator=( const SwTableFormula& rCpy )
- {
- m_sFormula = rCpy.m_sFormula;
- m_eNmType = rCpy.m_eNmType;
- m_bValidValue = rCpy.m_bValidValue;
- return *this;
- }
/// create from the internal formula (for CORE) the external formula (for UI)
void PtrToBoxNm( const SwTable* pTable );
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 2d82ca27cc8d..cfdbfd9c2004 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -30,14 +30,6 @@ class SwFormatAutoFormat: public SfxPoolItem
public:
SwFormatAutoFormat( sal_uInt16 nWhich = RES_TXTATR_AUTOFMT );
- /// single argument ctors shall be explicit.
- virtual ~SwFormatAutoFormat() override;
-
- /// @@@ public copy ctor, but no copy assignment?
- SwFormatAutoFormat( const SwFormatAutoFormat& rAttr );
-private:
- /// @@@ public copy ctor, but no copy assignment?
- SwFormatAutoFormat & operator= (const SwFormatAutoFormat &) = delete;
public:
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 36e0fbfe2da3..5fc5832b224c 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -45,11 +45,6 @@ protected:
SwFormatFootnoteEndAtTextEnd( sal_uInt16 nWhichL, SwFootnoteEndPosEnum ePos )
: SfxEnumItem( nWhichL, ePos ), nOffset( 0 )
{}
- SwFormatFootnoteEndAtTextEnd( const SwFormatFootnoteEndAtTextEnd& rAttr )
- : SfxEnumItem( rAttr ), sPrefix( rAttr.sPrefix ),
- sSuffix( rAttr.sSuffix ), aFormat( rAttr.aFormat ),
- nOffset( rAttr.nOffset )
- {}
public:
virtual sal_uInt16 GetValueCount() const override;
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index bb491b0266c8..df4637842819 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 );
- SwFormatSurround( const SwFormatSurround & );
inline SwFormatSurround &operator=( const SwFormatSurround &rCpy );
// "Pure virtual Methods" of SfxPoolItem.
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index 3a0ea0ba8e16..f7f472b558bb 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -40,12 +40,9 @@ class SW_DLLPUBLIC SwFormatURL: public SfxPoolItem
bool bIsServerMap; ///< A ServerSideImageMap with the URL.
- SwFormatURL& operator=( const SwFormatURL& ) = delete;
-
public:
SwFormatURL();
- /// @@@ copy construction allowed, but assignment is not? @@@
SwFormatURL( const SwFormatURL& );
virtual ~SwFormatURL() override;
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index 516f2f329a05..7c9139d04dc7 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -34,8 +34,6 @@ public:
// #i35017# - constant name has changed
SwFormatWrapInfluenceOnObjPos(
sal_Int16 _nWrapInfluenceOnPosition = css::text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
- SwFormatWrapInfluenceOnObjPos(
- const SwFormatWrapInfluenceOnObjPos& _rCpy );
virtual ~SwFormatWrapInfluenceOnObjPos() override;
SwFormatWrapInfluenceOnObjPos& operator=(
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index b05c11b4dff9..306f9a9757fe 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -45,10 +45,6 @@ public:
SwMirrorGrf( MirrorGraph eMiro = MirrorGraph::Dont )
: SfxEnumItem( RES_GRFATR_MIRRORGRF, eMiro ), bGrfToggle( false )
{}
- SwMirrorGrf( const SwMirrorGrf &rMirrorGrf )
- : SfxEnumItem( RES_GRFATR_MIRRORGRF, rMirrorGrf.GetValue()),
- bGrfToggle( rMirrorGrf.IsGrfToggle() )
- {}
// pure virtual methods of SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 2f7e2305556e..7afb4eb00070 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -116,7 +116,6 @@ public:
inline SwRegisterItem( const bool bRegister = false );
- /// @@@ public copy assignment, but no copy ctor?
inline SwRegisterItem& operator=( const SwRegisterItem& rRegister );
/// "pure virtual methods" of SfxPoolItem
@@ -150,9 +149,6 @@ public:
SwNumRuleItem( const OUString& rRuleName )
: SfxStringItem( RES_PARATR_NUMRULE, rRuleName ) {}
- SwNumRuleItem( const SwNumRuleItem& rCpy )
- : SfxStringItem( RES_PARATR_NUMRULE, rCpy.GetValue() ) {}
-
SwNumRuleItem& operator=( const SwNumRuleItem& rCpy )
{ SetValue( rCpy.GetValue() ); return *this; }
@@ -177,7 +173,6 @@ public:
inline SwParaConnectBorderItem( const bool bConnect = true );
- /// @@@ public copy assignment, but no copy ctor?
inline SwParaConnectBorderItem& operator=( const SwParaConnectBorderItem& rConnect );
/// "pure virtual methods" of SfxPoolItem
diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx
index 2f1e5c064ecb..c641a415b06f 100644
--- a/sw/inc/sortopt.hxx
+++ b/sw/inc/sortopt.hxx
@@ -31,7 +31,6 @@ struct SW_DLLPUBLIC SwSortKey
{
SwSortKey();
SwSortKey( sal_uInt16 nId, const OUString& rSrtType, SwSortOrder eOrder );
- SwSortKey( const SwSortKey& rOld );
OUString sSortType;
SwSortOrder eSortOrder;
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index 00f8c244893f..32c87e82ebde 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -167,21 +167,6 @@ bool SwAccessibleChild::IsBoundAsChar() const
return bRet;
}
-SwAccessibleChild::SwAccessibleChild( const SwAccessibleChild& r )
- : mpFrame( r.mpFrame )
- , mpDrawObj( r.mpDrawObj )
- , mpWindow( r.mpWindow )
-{}
-
-SwAccessibleChild& SwAccessibleChild::operator=( const SwAccessibleChild& r )
-{
- mpDrawObj = r.mpDrawObj;
- mpFrame = r.mpFrame;
- mpWindow = r.mpWindow;
-
- return *this;
-}
-
SwAccessibleChild& SwAccessibleChild::operator=( const SdrObject* pDrawObj )
{
Init( pDrawObj );
diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx
index e05ddc100f45..4e1c90f6ce37 100644
--- a/sw/source/core/access/accfrmobj.hxx
+++ b/sw/source/core/access/accfrmobj.hxx
@@ -41,9 +41,6 @@ class SwAccessibleChild
const SdrObject* pDrawObj,
vcl::Window* pWindow );
- SwAccessibleChild( const SwAccessibleChild& r );
- SwAccessibleChild& operator=( const SwAccessibleChild& r );
-
SwAccessibleChild& operator=( const SdrObject* pDrawObj );
SwAccessibleChild& operator=( const SwFrame* pFrame );
SwAccessibleChild& operator=( vcl::Window* pWindow );
diff --git a/sw/source/core/access/accfrmobjslist.hxx b/sw/source/core/access/accfrmobjslist.hxx
index b6ce5aa512ba..9df293d71e2f 100644
--- a/sw/source/core/access/accfrmobjslist.hxx
+++ b/sw/source/core/access/accfrmobjslist.hxx
@@ -47,12 +47,6 @@ private:
SwAccessibleChildSList_const_iterator& next_visible();
public:
- SwAccessibleChildSList_const_iterator( const SwAccessibleChildSList_const_iterator& rIter )
- : m_rList( rIter.m_rList )
- , m_aCurr( rIter.m_aCurr )
- , m_nNextObj( rIter.m_nNextObj )
- {}
-
bool operator==( const SwAccessibleChildSList_const_iterator& r ) const
{
return m_aCurr == r.m_aCurr;
diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index 3e1d92b9a397..7e051c7b76b9 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -32,12 +32,6 @@ SwFormatWrapInfluenceOnObjPos::SwFormatWrapInfluenceOnObjPos( sal_Int16 _nWrapIn
{
}
-SwFormatWrapInfluenceOnObjPos::SwFormatWrapInfluenceOnObjPos( const SwFormatWrapInfluenceOnObjPos& _rCpy )
- : SfxPoolItem( RES_WRAP_INFLUENCE_ON_OBJPOS ),
- mnWrapInfluenceOnPosition( _rCpy.GetWrapInfluenceOnObjPos() )
-{
-}
-
SwFormatWrapInfluenceOnObjPos::~SwFormatWrapInfluenceOnObjPos()
{
}
diff --git a/sw/source/core/doc/sortopt.cxx b/sw/source/core/doc/sortopt.cxx
index 57b0a9fce6d6..e05767e27827 100644
--- a/sw/source/core/doc/sortopt.cxx
+++ b/sw/source/core/doc/sortopt.cxx
@@ -36,14 +36,6 @@ SwSortKey::SwSortKey(sal_uInt16 nId, const OUString& rSrtType, SwSortOrder eOrde
{
}
-SwSortKey::SwSortKey(const SwSortKey& rOld) :
- sSortType( rOld.sSortType ),
- eSortOrder( rOld.eSortOrder ),
- nColumnId( rOld.nColumnId ),
- bIsNumeric( rOld.bIsNumeric )
-{
-}
-
SwSortOptions::SwSortOptions()
: eDirection( SRT_ROWS ),
cDeli( 9 ),
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index ab6d21065392..caf0bfcf7537 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1498,9 +1498,6 @@ struct DelTabPara
DelTabPara( SwNodes& rNodes, sal_Unicode cChar, SwUndoTableToText* pU ) :
pLastNd(nullptr), rNds( rNodes ), pUndo( pU ), cCh( cChar ) {}
- DelTabPara( const DelTabPara& rPara ) :
- pLastNd(rPara.pLastNd), rNds( rPara.rNds ),
- pUndo( rPara.pUndo ), cCh( rPara.cCh ) {}
};
// Forward declare so that the Lines and Boxes can use recursion
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index d9433ccfc3be..b44ab3494cd1 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -64,7 +64,7 @@ class SwSubFont : public SvxFont
const sal_uInt16 nOldAscent ) const;
void CalcEsc( SwDrawTextInfo const & rInf, Point& rPos );
- SwSubFont& operator=( const SwSubFont &rFont );
+ SwSubFont& operator=( const SwSubFont& );
short CheckKerning_( );
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 37a3b2bd44ae..207cb77d1954 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -1148,14 +1148,6 @@ SwFormatSurround::SwFormatSurround( css::text::WrapTextMode eFly ) :
bAnchorOnly = bContour = bOutside = false;
}
-SwFormatSurround::SwFormatSurround( const SwFormatSurround &rCpy ) :
- SfxEnumItem( RES_SURROUND, rCpy.GetValue() )
-{
- bAnchorOnly = rCpy.bAnchorOnly;
- bContour = rCpy.bContour;
- bOutside = rCpy.bOutside;
-}
-
bool SwFormatSurround::operator==( const SfxPoolItem& rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 034c3a9fc754..20c891af939a 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -542,8 +542,6 @@ class SwDistance
public:
SwTwips nMain, nSub;
SwDistance() { nMain = nSub = 0; }
- SwDistance& operator=( const SwDistance &rTwo )
- { nMain = rTwo.nMain; nSub = rTwo.nSub; return *this; }
bool operator<( const SwDistance& rTwo ) const
{ return nMain < rTwo.nMain || ( nMain == rTwo.nMain && nSub &&
rTwo.nSub && nSub < rTwo.nSub ); }
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index 383362f87f5b..846e93e93566 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -116,15 +116,6 @@ SwFormatAutoFormat::SwFormatAutoFormat( sal_uInt16 nInitWhich )
{
}
-SwFormatAutoFormat::SwFormatAutoFormat( const SwFormatAutoFormat& rAttr )
- : SfxPoolItem( rAttr.Which() ), mpHandle( rAttr.mpHandle )
-{
-}
-
-SwFormatAutoFormat::~SwFormatAutoFormat()
-{
-}
-
bool SwFormatAutoFormat::operator==( const SfxPoolItem& rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index ff67f60b34a7..e92c7562cea8 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -890,18 +890,7 @@ SwFont::~SwFont()
{
}
-SwSubFont& SwSubFont::operator=( const SwSubFont &rFont )
-{
- SvxFont::operator=( rFont );
- m_pMagic = rFont.m_pMagic;
- m_nFontIndex = rFont.m_nFontIndex;
- m_nOrgHeight = rFont.m_nOrgHeight;
- m_nOrgAscent = rFont.m_nOrgAscent;
- m_nProportionalWidth = rFont.m_nProportionalWidth;
- m_aSize = rFont.m_aSize;
- m_bSmallCapsPercentage66 = rFont.m_bSmallCapsPercentage66;
- return *this;
-}
+SwSubFont& SwSubFont::operator=( const SwSubFont& ) = default;
SwFont& SwFont::operator=( const SwFont &rFont )
{
diff --git a/sw/source/core/undo/SwRewriter.cxx b/sw/source/core/undo/SwRewriter.cxx
index 6fa3304d3868..e97437e7c1e0 100644
--- a/sw/source/core/undo/SwRewriter.cxx
+++ b/sw/source/core/undo/SwRewriter.cxx
@@ -31,11 +31,6 @@ SwRewriter::SwRewriter()
{
}
-SwRewriter::SwRewriter(const SwRewriter & rSrc)
- : mRules(rSrc.mRules)
-{
-}
-
SwRewriter::~SwRewriter()
{
}
diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx
index bcfa1e5b61b9..db304f060305 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -1026,15 +1026,6 @@ SwFltBookmark::SwFltBookmark( const OUString& rNa, const OUString& rVa,
}
}
-SwFltBookmark::SwFltBookmark(const SwFltBookmark& rCpy)
- : SfxPoolItem( RES_FLTR_BOOKMARK )
- , mnHandle( rCpy.mnHandle )
- , maName( rCpy.maName )
- , maVal( rCpy.maVal )
- , mbIsTOCBookmark( rCpy.mbIsTOCBookmark )
-{
-}
-
bool SwFltBookmark::operator==(const SfxPoolItem& rItem) const
{
return ( maName == static_cast<const SwFltBookmark&>(rItem).maName)
@@ -1052,13 +1043,6 @@ SwFltRDFMark::SwFltRDFMark()
{
}
-SwFltRDFMark::SwFltRDFMark(const SwFltRDFMark& rMark)
- : SfxPoolItem(RES_FLTR_RDFMARK),
- m_nHandle(rMark.m_nHandle),
- m_aAttributes(rMark.m_aAttributes)
-{
-}
-
bool SwFltRDFMark::operator==(const SfxPoolItem& rItem) const
{
if (!SfxPoolItem::operator==(rItem))
@@ -1101,12 +1085,6 @@ SwFltTOX::SwFltTOX(SwTOXBase* pBase)
{
}
-SwFltTOX::SwFltTOX(const SwFltTOX& rCpy)
- : SfxPoolItem(RES_FLTR_TOX), pTOXBase(rCpy.pTOXBase),
- bHadBreakItem( rCpy.bHadBreakItem ), bHadPageDescItem( rCpy.bHadPageDescItem )
-{
-}
-
bool SwFltTOX::operator==(const SfxPoolItem& rItem) const
{
return pTOXBase == static_cast<const SwFltTOX&>(rItem).pTOXBase;
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index fdba8e03b3d9..12e2cd62aea5 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -301,11 +301,6 @@ struct SvxCSS1BorderInfo
nNamedWidth( USHRT_MAX ), eStyle( CSS1_BS_NONE )
{}
- SvxCSS1BorderInfo( const SvxCSS1BorderInfo& rInfo ) :
- aColor( rInfo.aColor ), nAbsWidth( rInfo.nAbsWidth ),
- nNamedWidth( rInfo.nNamedWidth ), eStyle( rInfo.eStyle )
- {}
-
void SetBorderLine( SvxBoxItemLine nLine, SvxBoxItem &rBoxItem ) const;
};
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 34f1ab8862dc..bc8fb87bf806 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -53,17 +53,6 @@ public:
SwNodeIndex m_nNode;
sal_Int32 m_nContent;
public:
- SwFltPosition(const SwFltPosition &rOther)
- : m_nNode(rOther.m_nNode)
- , m_nContent(rOther.m_nContent)
- {
- }
- SwFltPosition &operator=(const SwFltPosition &rOther)
- {
- m_nNode = rOther.m_nNode;
- m_nContent = rOther.m_nContent;
- return *this;
- }
bool operator==(const SwFltPosition &rOther) const
{
return (m_nContent == rOther.m_nContent &&
@@ -247,15 +236,6 @@ public:
{
}
- SwFltRedline(const SwFltRedline& rCpy):
- SfxPoolItem(RES_FLTR_REDLINE),
- aStamp( rCpy.aStamp ),
- aStampPrev( rCpy.aStampPrev ),
- eType( rCpy.eType ),
- eTypePrev( rCpy.eTypePrev ),
- nAutorNo( rCpy.nAutorNo ),
- nAutorNoPrev( rCpy.nAutorNoPrev )
- {}
// "purely virtual methods" of SfxPoolItem
virtual bool operator==(const SfxPoolItem& rItem) const override;
virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override;
@@ -275,7 +255,6 @@ public:
const OUString& rVa,
long nHand,
const bool bIsTOCBookmark = false );
- SwFltBookmark( const SwFltBookmark& );
// "purely virtual methods" of SfxPoolItem
virtual bool operator==(const SfxPoolItem&) const override;
@@ -298,7 +277,6 @@ class SW_DLLPUBLIC SwFltRDFMark : public SfxPoolItem
public:
SwFltRDFMark();
- SwFltRDFMark(const SwFltRDFMark&);
virtual bool operator==(const SfxPoolItem&) const override;
virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override;
@@ -316,7 +294,6 @@ class SW_DLLPUBLIC SwFltTOX : public SfxPoolItem
bool bHadPageDescItem;
public:
SwFltTOX(SwTOXBase* pBase);
- SwFltTOX(const SwFltTOX&);
// "purely virtual methods" of SfxPoolItem
virtual bool operator==(const SfxPoolItem&) const override;
virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override;
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index bf841d6d977a..bd255edc0a92 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -376,12 +376,6 @@ namespace sw
}
//SetLayer boilerplate begin
- void SetLayer::Swap(SetLayer& rOther) throw()
- {
- std::swap(mnHeavenLayer, rOther.mnHeavenLayer);
- std::swap(mnHellLayer, rOther.mnHellLayer);
- std::swap(mnFormLayer, rOther.mnFormLayer);
- }
// #i38889# - by default put objects into the invisible layers.
SetLayer::SetLayer(const SwDoc &rDoc)
@@ -390,20 +384,6 @@ namespace sw
mnFormLayer(rDoc.getIDocumentDrawModelAccess().GetInvisibleControlsId())
{
}
-
- SetLayer::SetLayer(const SetLayer& rOther) throw()
- : mnHeavenLayer(rOther.mnHeavenLayer),
- mnHellLayer(rOther.mnHellLayer),
- mnFormLayer(rOther.mnFormLayer)
- {
- }
-
- SetLayer& SetLayer::operator=(const SetLayer& rOther) throw()
- {
- SetLayer aTemp(rOther);
- Swap(aTemp);
- return *this;
- }
//SetLayer boilerplate end
void GetPoolItems(const SfxItemSet &rSet, ww8::PoolItems &rItems, bool bExportParentItemSet )
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 27dbd1b7b13c..6185c411ff68 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -631,7 +631,6 @@ namespace sw
SdrLayerID mnHeavenLayer, mnHellLayer, mnFormLayer;
enum Layer {eHeaven, eHell};
void SetObjectLayer(SdrObject &rObject, Layer eLayer) const;
- void Swap(SetLayer &rOther) throw();
public:
/** Make Object live in the bottom drawing layer
@@ -655,9 +654,6 @@ namespace sw
objects into
*/
explicit SetLayer(const SwDoc &rDoc);
-
- SetLayer(const SetLayer &rOther) throw();
- SetLayer& operator=(const SetLayer &rOther) throw();
};
}
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index d4c598fa4ce4..d56baa1420ee 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -858,18 +858,6 @@ WW8_CP HdFtPlcDrawObj::GetCpOffset(const WW8Fib &rFib) const
return rFib.m_ccpText + rFib.m_ccpFootnote;
}
-DrawObj& DrawObj::operator=(const DrawObj& rOther)
-{
- mnCp = rOther.mnCp;
- mnShapeId = rOther.mnShapeId;
- maContent = rOther.maContent;
- maParentPos = rOther.maParentPos;
- mnThick = rOther.mnThick;
- mnDirection = rOther.mnDirection;
- mnHdFtIndex = rOther.mnHdFtIndex;
- return *this;
-}
-
bool PlcDrawObj::Append( WW8Export const & rWrt, WW8_CP nCp, const ww8::Frame& rFormat,
const Point& rNdTopLeft )
{
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 7195677f4688..22613158a7ea 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -350,7 +350,6 @@ public:
: mnCp(nCp), mnShapeId(0), maContent(rContent), maParentPos(aParentPos),
mnThick(0), mnDirection(nDir), mnHdFtIndex(nHdFtIndex) {}
void SetShapeDetails(sal_uInt32 nId, sal_Int32 nThick);
- DrawObj& operator=(const DrawObj &rOther);
};
typedef std::vector<DrawObj> DrawObjVector;
@@ -1344,7 +1343,6 @@ public:
GraphicDetails(const ww8::Frame &rFly, sal_uInt16 nWid, sal_uInt16 nHei)
: maFly(rFly), mnPos(0), mnWid(nWid), mnHei(nHei)
{}
- GraphicDetails& operator=(const GraphicDetails& rOther);
bool operator==(const GraphicDetails& rIn) const
{
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 5cf65d2ba839..334ffe984a02 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -477,15 +477,6 @@ void WW8Export::OutGrf(const ww8::Frame &rFrame)
m_pAttrOutput->EndURL(false);
}
-GraphicDetails& GraphicDetails::operator=(const GraphicDetails &rOther)
-{
- maFly = rOther.maFly;
- mnPos = rOther.mnPos;
- mnWid = rOther.mnWid;
- mnHei = rOther.mnHei;
- return *this;
-}
-
void SwWW8WrGrf::Insert(const ww8::Frame &rFly)
{
const Size aSize( rFly.GetLayoutSize() );
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index d5d4857baf92..8011a640410c 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -1319,37 +1319,6 @@ MCD::MCD() : reserved1(0x56)
{
}
-MCD::MCD(const MCD& rO)
- : TBBase(rO)
- , reserved1(rO.reserved1)
- , reserved2(rO.reserved2)
- , ibst(rO.ibst)
- , ibstName(rO.ibstName)
- , reserved3(rO.reserved3)
- , reserved4(rO.reserved4)
- , reserved5(rO.reserved5)
- , reserved6(rO.reserved6)
- , reserved7(rO.reserved7)
-{
-}
-
-MCD& MCD::operator=(const MCD& rO)
-{
- if (this != &rO)
- {
- reserved1 = rO.reserved1;
- reserved2 = rO.reserved2;
- ibst = rO.ibst;
- ibstName = rO.ibstName;
- reserved3 = rO.reserved3;
- reserved4 = rO.reserved4;
- reserved5 = rO.reserved5;
- reserved6 = rO.reserved6;
- reserved7 = rO.reserved7;
- }
- return *this;
-}
-
bool MCD::Read(SvStream &rS)
{
SAL_INFO("sw.ww8","MCD::Read() stream pos 0x" << rS.Tell() );
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index 9aeaeebafdb6..b5b9bc2a9d74 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -186,8 +186,6 @@ class MCD : public TBBase
public:
MCD();
- MCD(const MCD&);
- MCD& operator = ( const MCD&);
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* ) override;
More information about the Libreoffice-commits
mailing list