summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-11-25 16:52:49 +0100
committerAndras Timar <andras.timar@collabora.com>2020-05-17 11:47:43 +0200
commit4973f508a29846cbd9b58efb49aea6d2e19a41a5 (patch)
tree0e91f1a24e0d68e31db0715ded7d2b68d7991a38
parented4d8eeca8754c91e22050a4717ec9975f1f8f36 (diff)
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 <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93694 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r--include/svl/macitem.hxx2
-rw-r--r--package/source/xstor/xstorage.hxx6
-rw-r--r--sc/inc/pivot.hxx1
-rw-r--r--sc/inc/scmatrix.hxx3
-rw-r--r--sc/source/core/data/pivot2.cxx8
-rw-r--r--svl/source/items/macitem.cxx12
-rw-r--r--sw/source/core/inc/mvsave.hxx7
-rw-r--r--sw/source/filter/ww8/ww8par.cxx5
-rw-r--r--sw/source/filter/ww8/ww8par.hxx1
-rw-r--r--xmloff/source/core/attrlist.cxx6
-rw-r--r--xmloff/source/style/xmlprmap.cxx17
11 files changed, 0 insertions, 68 deletions
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index 7a062f2aec47..f796d1d3586b 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -60,8 +60,6 @@ public:
ScriptType GetScriptType() const { return eType; }
bool HasMacro() const { return !aMacName.isEmpty(); }
-
- SvxMacro& operator=( const SvxMacro& rBase );
};
inline SvxMacro::SvxMacro( const OUString &rMacName, const OUString &rLibName,
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index d4f48e282627..0c6cc442acde 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -104,12 +104,6 @@ struct StorageHolder_Impl
css::uno::WeakReference< css::embed::XStorage > m_xWeakRef;
explicit inline StorageHolder_Impl( OStorage* pStorage );
-
- StorageHolder_Impl( const StorageHolder_Impl& aSH )
- : m_pPointer( aSH.m_pPointer )
- , m_xWeakRef( aSH.m_xWeakRef )
- {
- }
};
class SwitchablePersistenceStream;
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index 2dcb9b2f1e0b..6bdd24353285 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -122,7 +122,6 @@ struct ScPivotField
sal_uInt8 mnDupCount;
explicit ScPivotField( SCCOL nNewCol = 0 );
- ScPivotField( const ScPivotField& r );
long getOriginalDim() const;
};
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 3856eef9aaef..ca9d3496be7a 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -149,9 +149,6 @@ public:
IterateResult(double fFirst, double fRest, size_t nCount) :
mfFirst(fFirst), mfRest(fRest), mnCount(nCount) {}
-
- IterateResult(const IterateResult& r) :
- mfFirst(r.mfFirst), mfRest(r.mfRest), mnCount(r.mnCount) {}
};
/** Checks nC or nR for zero and uses GetElementsMax() whether a matrix of
diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx
index 3c1ce479a845..111df0a0947c 100644
--- a/sc/source/core/data/pivot2.cxx
+++ b/sc/source/core/data/pivot2.cxx
@@ -80,14 +80,6 @@ ScPivotField::ScPivotField(SCCOL nNewCol) :
mnDupCount(0)
{}
-ScPivotField::ScPivotField( const ScPivotField& rPivotField ) :
- maFieldRef(rPivotField.maFieldRef),
- mnOriginalDim(rPivotField.mnOriginalDim),
- nFuncMask(rPivotField.nFuncMask),
- nCol(rPivotField.nCol),
- mnDupCount(rPivotField.mnDupCount)
-{}
-
long ScPivotField::getOriginalDim() const
{
return mnOriginalDim >= 0 ? mnOriginalDim : static_cast<long>(nCol);
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 5f923774b513..37a895d3673e 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -55,18 +55,6 @@ OUString SvxMacro::GetLanguage()const
return aLibName;
}
-SvxMacro& SvxMacro::operator=( const SvxMacro& rBase )
-{
- if( this != &rBase )
- {
- aMacName = rBase.aMacName;
- aLibName = rBase.aLibName;
- eType = rBase.eType;
- }
- return *this;
-}
-
-
SvxMacroTableDtor& SvxMacroTableDtor::operator=( const SvxMacroTableDtor& rTbl )
{
if (this != &rTbl)
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 22877ca19ea3..b0ea96fc7f51 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6545,11 +6545,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 bdd625364f09..d178bbbeda9a 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -548,7 +548,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; };
diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
index 805cafdd45b6..5db3e8c27b18 100644
--- a/xmloff/source/core/attrlist.cxx
+++ b/xmloff/source/core/attrlist.cxx
@@ -38,12 +38,6 @@ struct SvXMLTagAttribute_Impl
{
}
- SvXMLTagAttribute_Impl( const SvXMLTagAttribute_Impl& r ) :
- sName(r.sName),
- sValue(r.sValue)
- {
- }
-
OUString sName;
OUString sValue;
};
diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx
index ff55ebd3b7a5..bad5361c1408 100644
--- a/xmloff/source/style/xmlprmap.cxx
+++ b/xmloff/source/style/xmlprmap.cxx
@@ -63,9 +63,6 @@ struct XMLPropertySetMapperEntry_Impl
const XMLPropertyMapEntry& rMapEntry,
const rtl::Reference< XMLPropertyHandlerFactory >& rFactory );
- XMLPropertySetMapperEntry_Impl(
- const XMLPropertySetMapperEntry_Impl& rEntry );
-
sal_uInt32 GetPropType() const { return nType & XML_TYPE_PROP_MASK; }
};
@@ -85,20 +82,6 @@ XMLPropertySetMapperEntry_Impl::XMLPropertySetMapperEntry_Impl(
assert(pHdl);
}
-XMLPropertySetMapperEntry_Impl::XMLPropertySetMapperEntry_Impl(
- const XMLPropertySetMapperEntry_Impl& rEntry ) :
- sXMLAttributeName( rEntry.sXMLAttributeName),
- sAPIPropertyName( rEntry.sAPIPropertyName),
- nType( rEntry.nType),
- nXMLNameSpace( rEntry.nXMLNameSpace),
- nContextId( rEntry.nContextId),
- nEarliestODFVersionForExport( rEntry.nEarliestODFVersionForExport ),
- bImportOnly( rEntry.bImportOnly),
- pHdl( rEntry.pHdl)
-{
- assert(pHdl);
-}
-
struct XMLPropertySetMapper::Impl
{
std::vector<XMLPropertySetMapperEntry_Impl> maMapEntries;