From ae71a0adef64b292ab01194817d2d763f7c85433 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 25 Nov 2019 16:52:49 +0100 Subject: Remove some redundantly user-declared copy ctors and assignment ops ...that trigger -Werror,-Wdeprecated-copy ("definition of implicit copy {constructor, assignment operator} for ... is deprecated beause it has a user-declared copy {assignment operator, constructor}") new in recent Clang 10 trunk (and which apparently warns about more cases then its GCC counterpart, for which we already adapted the code in the past, see e.g. the various "-Werror=deprecated-copy (GCC trunk towards GCC 9)" commits) Change-Id: Ie37bd820e6c0c05c74e1a862bb1d4ead5fb7cc9c Reviewed-on: https://gerrit.libreoffice.org/83698 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- sw/source/core/inc/mvsave.hxx | 7 ------- sw/source/filter/ww8/ww8par.cxx | 5 ----- sw/source/filter/ww8/ww8par.hxx | 1 - 3 files changed, 13 deletions(-) (limited to 'sw') diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index c8ff124af161..bdbab23f08ab 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -165,13 +165,6 @@ class ZSortFly public: ZSortFly( const SwFrameFormat* pFrameFormat, const SwFormatAnchor* pFlyAnchor, sal_uInt32 nArrOrdNum ); - ZSortFly& operator=( const ZSortFly& rCpy ) - { - pFormat = rCpy.pFormat; - pAnchor = rCpy.pAnchor; - nOrdNum = rCpy.nOrdNum; - return *this; - } bool operator==( const ZSortFly& ) const { return false; } bool operator<( const ZSortFly& rCmp ) const diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index bf9c2804a16a..3321da254e37 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -6568,11 +6568,6 @@ namespace sw { } - Position::Position(const Position &rPos) - : maPtNode(rPos.maPtNode), mnPtContent(rPos.mnPtContent) - { - } - Position::operator SwPosition() const { SwPosition aRet(maPtNode); diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 4221eb3b454c..61e30e6618ed 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -546,7 +546,6 @@ namespace sw sal_Int32 mnPtContent; public: explicit Position(const SwPosition &rPos); - Position(const Position &rPos); operator SwPosition() const; const SwNodeIndex& GetPtNode() const { return maPtNode; }; sal_Int32 GetPtContent() const { return mnPtContent; }; -- cgit