[Libreoffice-commits] core.git: include/svl package/source sc/inc sc/source svl/source sw/source xmloff/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Mon Nov 25 22:08:45 UTC 2019
include/svl/macitem.hxx | 2 --
package/source/xstor/xstorage.hxx | 6 ------
sc/inc/pivot.hxx | 1 -
sc/inc/scmatrix.hxx | 3 ---
sc/source/core/data/pivot2.cxx | 8 --------
svl/source/items/macitem.cxx | 12 ------------
sw/source/core/inc/mvsave.hxx | 7 -------
sw/source/filter/ww8/ww8par.cxx | 5 -----
sw/source/filter/ww8/ww8par.hxx | 1 -
xmloff/source/core/attrlist.cxx | 6 ------
xmloff/source/style/xmlprmap.cxx | 17 -----------------
11 files changed, 68 deletions(-)
New commits:
commit ae71a0adef64b292ab01194817d2d763f7c85433
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Nov 25 16:52:49 2019 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Nov 25 23:07:42 2019 +0100
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 at redhat.com>
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 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; };
diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
index d0dfaa7185ba..8120fc32d647 100644
--- a/xmloff/source/core/attrlist.cxx
+++ b/xmloff/source/core/attrlist.cxx
@@ -40,12 +40,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 eb232b155477..58be75a638e2 100644
--- a/xmloff/source/style/xmlprmap.cxx
+++ b/xmloff/source/style/xmlprmap.cxx
@@ -65,9 +65,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; }
};
@@ -89,20 +86,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;
More information about the Libreoffice-commits
mailing list