diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-12-28 14:58:35 +0100 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-02 07:44:39 +0100 |
commit | fd3fc84e590fc84f62ce3bace668fe40a25f54b5 (patch) | |
tree | ce66f9353b81ee22a0aee6f4991da4b8a8018cd2 /sc | |
parent | a7e6e4b220089a2d8a58ff10393d598a8b796fa5 (diff) |
clang-tidy modernize-use-equals-default in sc/source/core/tool
remove default-able copy-ctors/assignments
Change-Id: I40255393899275a5825ffef4df3f08c6ce5348c2
Reviewed-on: https://gerrit.libreoffice.org/47140
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/chartarr.hxx | 2 | ||||
-rw-r--r-- | sc/inc/defaultsoptions.hxx | 4 | ||||
-rw-r--r-- | sc/inc/docoptio.hxx | 3 | ||||
-rw-r--r-- | sc/inc/formulaopt.hxx | 4 | ||||
-rw-r--r-- | sc/inc/inputopt.hxx | 4 | ||||
-rw-r--r-- | sc/inc/printopt.hxx | 3 | ||||
-rw-r--r-- | sc/inc/rangeutl.hxx | 3 | ||||
-rw-r--r-- | sc/inc/token.hxx | 20 | ||||
-rw-r--r-- | sc/inc/tokenarray.hxx | 2 | ||||
-rw-r--r-- | sc/inc/typedstrdata.hxx | 2 | ||||
-rw-r--r-- | sc/inc/unitconv.hxx | 5 | ||||
-rw-r--r-- | sc/inc/viewopti.hxx | 1 | ||||
-rw-r--r-- | sc/inc/zforauto.hxx | 8 | ||||
-rw-r--r-- | sc/source/core/tool/chartarr.cxx | 6 | ||||
-rw-r--r-- | sc/source/core/tool/defaultsoptions.cxx | 24 | ||||
-rw-r--r-- | sc/source/core/tool/docoptio.cxx | 32 | ||||
-rw-r--r-- | sc/source/core/tool/formulaopt.cxx | 37 | ||||
-rw-r--r-- | sc/source/core/tool/inputopt.cxx | 27 | ||||
-rw-r--r-- | sc/source/core/tool/printopt.cxx | 21 | ||||
-rw-r--r-- | sc/source/core/tool/rangeutl.cxx | 17 | ||||
-rw-r--r-- | sc/source/core/tool/token.cxx | 45 | ||||
-rw-r--r-- | sc/source/core/tool/typedstrdata.cxx | 6 | ||||
-rw-r--r-- | sc/source/core/tool/unitconv.cxx | 6 | ||||
-rw-r--r-- | sc/source/core/tool/viewopti.cxx | 6 | ||||
-rw-r--r-- | sc/source/core/tool/zforauto.cxx | 7 |
25 files changed, 9 insertions, 286 deletions
diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx index 671d88b94e8c..bb31f7404d15 100644 --- a/sc/inc/chartarr.hxx +++ b/sc/inc/chartarr.hxx @@ -66,8 +66,6 @@ private: ScMemChart* CreateMemChartMulti(); public: ScChartArray( ScDocument* pDoc, const ScRangeListRef& rRangeList ); - ScChartArray( const ScChartArray& rArr ); - ~ScChartArray(); const ScRangeListRef& GetRangeList() const { return aPositioner.GetRangeList(); } const ScChartPositionMap* GetPositionMap() { return aPositioner.GetPositionMap(); } diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index be0e8c110a7a..7e9f7604f991 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -24,8 +24,6 @@ private: public: ScDefaultsOptions(); - ScDefaultsOptions( const ScDefaultsOptions& rCpy ); - ~ScDefaultsOptions(); void SetDefaults(); @@ -34,7 +32,6 @@ public: void SetInitTabPrefix(const OUString& aPrefix) { aInitTabPrefix = aPrefix; } const OUString& GetInitTabPrefix() const { return aInitTabPrefix; } - ScDefaultsOptions& operator= ( const ScDefaultsOptions& rCpy ); bool operator== ( const ScDefaultsOptions& rOpt ) const; }; @@ -45,7 +42,6 @@ class SC_DLLPUBLIC ScTpDefaultsItem : public SfxPoolItem { public: ScTpDefaultsItem( const ScDefaultsOptions& rOpt ); - ScTpDefaultsItem( const ScTpDefaultsItem& rItem ); virtual ~ScTpDefaultsItem() override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 96b0e366bc7b..e8c7a1c63de2 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -53,8 +53,6 @@ class SC_DLLPUBLIC ScDocOptions public: ScDocOptions(); - ScDocOptions( const ScDocOptions& rCpy ); - ~ScDocOptions(); bool IsLookUpColRowNames() const { return bLookUpColRowNames; } void SetLookUpColRowNames( bool bVal ) { bLookUpColRowNames = bVal; } @@ -145,7 +143,6 @@ class SC_DLLPUBLIC ScTpCalcItem : public SfxPoolItem public: ScTpCalcItem( sal_uInt16 nWhich, const ScDocOptions& rOpt ); - ScTpCalcItem( const ScTpCalcItem& rItem ); virtual ~ScTpCalcItem() override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index d4dd5762f067..49ffdd41e652 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -36,8 +36,6 @@ private: public: ScFormulaOptions(); - ScFormulaOptions( const ScFormulaOptions& rCpy ); - ~ScFormulaOptions(); void SetDefaults(); @@ -73,7 +71,6 @@ public: static void GetDefaultFormulaSeparators(OUString& rSepArg, OUString& rSepArrayCol, OUString& rSepArrayRow); - ScFormulaOptions& operator= ( const ScFormulaOptions& rCpy ); bool operator== ( const ScFormulaOptions& rOpt ) const; bool operator!= ( const ScFormulaOptions& rOpt ) const; }; @@ -84,7 +81,6 @@ class SC_DLLPUBLIC ScTpFormulaItem : public SfxPoolItem { public: ScTpFormulaItem( const ScFormulaOptions& rOpt ); - ScTpFormulaItem( const ScTpFormulaItem& rItem ); virtual ~ScTpFormulaItem() override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx index 9e107ba60793..94a095704391 100644 --- a/sc/inc/inputopt.hxx +++ b/sc/inc/inputopt.hxx @@ -41,8 +41,6 @@ private: public: ScInputOptions(); - ScInputOptions( const ScInputOptions& rCpy ); - ~ScInputOptions(); void SetDefaults(); @@ -70,8 +68,6 @@ public: bool GetReplaceCellsWarn() const { return bReplCellsWarn; } void SetLegacyCellSelection(bool bSet) { bLegacyCellSelection = bSet; } bool GetLegacyCellSelection() const { return bLegacyCellSelection; } - - ScInputOptions& operator= ( const ScInputOptions& rOpt ); }; // CfgItem for input options diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index 5510b68c0b77..23bf35796247 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -33,7 +33,6 @@ private: public: ScPrintOptions(); - ScPrintOptions( const ScPrintOptions& rCpy ); ~ScPrintOptions(); bool GetSkipEmpty() const { return bSkipEmpty; } @@ -45,7 +44,6 @@ public: void SetDefaults(); - ScPrintOptions& operator= ( const ScPrintOptions& rCpy ); bool operator== ( const ScPrintOptions& rOpt ) const; }; @@ -55,7 +53,6 @@ class SC_DLLPUBLIC ScTpPrintItem : public SfxPoolItem { public: ScTpPrintItem( const ScPrintOptions& rOpt ); - ScTpPrintItem( const ScTpPrintItem& rItem ); virtual ~ScTpPrintItem() override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index f3fed7b6fb25..db54bc70cab6 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -236,9 +236,6 @@ public: SCCOL colEnd = 0, SCROW rowEnd = 0 ); - ScArea( const ScArea& r ); - - ScArea& operator= ( const ScArea& r ); bool operator== ( const ScArea& r ) const; public: diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index 9019ebf0ed89..92827a2cb512 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -72,8 +72,6 @@ private: public: ScSingleRefToken( const ScSingleRefData& r, OpCode e = ocPush ) : FormulaToken( formula::svSingleRef, e ), aSingleRef( r ) {} - ScSingleRefToken( const ScSingleRefToken& r ) : - FormulaToken( r ), aSingleRef( r.aSingleRef ) {} virtual const ScSingleRefData* GetSingleRef() const override; virtual ScSingleRefData* GetSingleRef() override; virtual bool TextEqual( const formula::FormulaToken& rToken ) const override; @@ -90,8 +88,6 @@ private: public: ScDoubleRefToken( const ScComplexRefData& r, OpCode e = ocPush ) : FormulaToken( formula::svDoubleRef, e ), aDoubleRef( r ) {} - ScDoubleRefToken( const ScDoubleRefToken& r ) : - FormulaToken( r ), aDoubleRef( r.aDoubleRef ) {} virtual const ScSingleRefData* GetSingleRef() const override; virtual ScSingleRefData* GetSingleRef() override; virtual const ScComplexRefData* GetDoubleRef() const override; @@ -111,7 +107,7 @@ private: ScMatrixRef pMatrix; public: ScMatrixToken( const ScMatrixRef& p ); - ScMatrixToken( const ScMatrixToken& r ); + ScMatrixToken( const ScMatrixToken& ); virtual const ScMatrix* GetMatrix() const override; virtual ScMatrix* GetMatrix() override; @@ -131,7 +127,7 @@ class ScMatrixRangeToken : public formula::FormulaToken public: ScMatrixRangeToken( const ScMatrixRef& p, const ScComplexRefData& rRef ); ScMatrixRangeToken( const sc::RangeMatrix& rMat ); - ScMatrixRangeToken( const ScMatrixRangeToken& r ); + ScMatrixRangeToken( const ScMatrixRangeToken& ); virtual sal_uInt8 GetByte() const override; virtual const ScMatrix* GetMatrix() const override; @@ -150,7 +146,6 @@ class ScExternalSingleRefToken : public formula::FormulaToken public: ScExternalSingleRefToken( sal_uInt16 nFileId, const svl::SharedString& rTabName, const ScSingleRefData& r ); - ScExternalSingleRefToken( const ScExternalSingleRefToken& r ); ScExternalSingleRefToken() = delete; virtual ~ScExternalSingleRefToken() override; @@ -171,7 +166,6 @@ class ScExternalDoubleRefToken : public formula::FormulaToken public: ScExternalDoubleRefToken() = delete; ScExternalDoubleRefToken( sal_uInt16 nFileId, const svl::SharedString& rTabName, const ScComplexRefData& r ); - ScExternalDoubleRefToken( const ScExternalDoubleRefToken& r ); virtual ~ScExternalDoubleRefToken() override; virtual sal_uInt16 GetIndex() const override; @@ -194,7 +188,6 @@ class ScExternalNameToken : public formula::FormulaToken public: ScExternalNameToken() = delete; ScExternalNameToken( sal_uInt16 nFileId, const svl::SharedString& rName ); - ScExternalNameToken( const ScExternalNameToken& r ); virtual ~ScExternalNameToken() override; virtual sal_uInt16 GetIndex() const override; @@ -251,7 +244,7 @@ private: std::shared_ptr<ScJumpMatrix> mpJumpMatrix; public: ScJumpMatrixToken( std::shared_ptr<ScJumpMatrix> p ); - ScJumpMatrixToken( const ScJumpMatrixToken & p ); + ScJumpMatrixToken( const ScJumpMatrixToken & ); virtual ~ScJumpMatrixToken() override; virtual ScJumpMatrix* GetJumpMatrix() const override; virtual bool operator==( const formula::FormulaToken& rToken ) const override; @@ -270,8 +263,6 @@ public: FormulaToken( formula::svRefList ), mbArrayResult(false) {} explicit ScRefListToken( bool bArrayResult ) : FormulaToken( formula::svRefList ), mbArrayResult( bArrayResult ) {} - ScRefListToken( const ScRefListToken & r ) : - FormulaToken( r ), aRefList( r.aRefList ), mbArrayResult( r.mbArrayResult ) {} bool IsArrayResult() const; virtual const ScRefList* GetRefList() const override; virtual ScRefList* GetRefList() override; @@ -288,10 +279,6 @@ public: FormulaToken( formula::svEmptyCell ), bInherited( bInheritedP ), bDisplayedAsString( bDisplayAsString ) {} - ScEmptyCellToken( const ScEmptyCellToken& r ) : - FormulaToken( r ), - bInherited( r.bInherited ), - bDisplayedAsString( r.bDisplayedAsString ) {} bool IsInherited() const { return bInherited; } bool IsDisplayedAsString() const { return bDisplayedAsString; } virtual double GetDouble() const override; @@ -312,7 +299,6 @@ protected: formula::FormulaConstTokenRef xUpperLeft; public: ScMatrixCellResultToken( const ScConstMatrixRef& pMat, const formula::FormulaToken* pUL ); - ScMatrixCellResultToken( const ScMatrixCellResultToken& r ); virtual ~ScMatrixCellResultToken() override; virtual double GetDouble() const override; virtual svl::SharedString GetString() const override; diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx index 308b4b23fa18..feedf95475e9 100644 --- a/sc/inc/tokenarray.hxx +++ b/sc/inc/tokenarray.hxx @@ -59,7 +59,7 @@ public: ScTokenArray(); /** Assignment with incrementing references of FormulaToken entries (not copied!) */ - ScTokenArray( const ScTokenArray& ); + ScTokenArray( const ScTokenArray& ) = default; virtual ~ScTokenArray() override; bool EqualTokens( const ScTokenArray* pArr2 ) const; diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx index 8b9cb24f8734..1572f2eb3dd2 100644 --- a/sc/inc/typedstrdata.hxx +++ b/sc/inc/typedstrdata.hxx @@ -29,8 +29,6 @@ public: ScTypedStrData( const OUString& rStr, double nVal = 0.0, StringType eType = Standard, bool bDate = false ); - ScTypedStrData( const ScTypedStrData& rCpy ); - bool IsDate() const { return mbIsDate;} const OUString& GetString() const { return maStrValue;} StringType GetStringType() const { return meStrType;} diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx index dc756c9f6f3d..11cdad201a18 100644 --- a/sc/inc/unitconv.hxx +++ b/sc/inc/unitconv.hxx @@ -26,13 +26,12 @@ class ScUnitConverterData { OUString maIndexString; double mfValue; - ScUnitConverterData& operator=( const ScUnitConverterData& ) = delete; public: ScUnitConverterData( const OUString& rFromUnit, const OUString& rToUnit, double fValue ); - ScUnitConverterData( const ScUnitConverterData& ); - ~ScUnitConverterData(); + ScUnitConverterData( const ScUnitConverterData& ) = default; + ScUnitConverterData& operator=( const ScUnitConverterData& ) = delete; double GetValue() const { return mfValue;} const OUString& GetIndexString() const { return maIndexString;} diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 0eae517d78a1..375daefc5013 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -116,7 +116,6 @@ class SC_DLLPUBLIC ScTpViewItem : public SfxPoolItem { public: ScTpViewItem( const ScViewOptions& rOpt ); - ScTpViewItem( const ScTpViewItem& rItem ); virtual ~ScTpViewItem() override; virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx index 16c02ae19304..d62498df2464 100644 --- a/sc/inc/zforauto.hxx +++ b/sc/inc/zforauto.hxx @@ -33,7 +33,6 @@ class ScNumFormatAbbrev LanguageType eSysLanguage; public: ScNumFormatAbbrev(); - ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat); ScNumFormatAbbrev(sal_uInt32 nFormat, const SvNumberFormatter& rFormatter); void Load( SvStream& rStream, rtl_TextEncoding eByteStrSet ); // loading of the numberformats void Save( SvStream& rStream, rtl_TextEncoding eByteStrSet ) const; // saving of the numberformats @@ -45,13 +44,6 @@ public: && (eLanguage == rNumFormat.eLanguage) && (eSysLanguage == rNumFormat.eSysLanguage)); } - ScNumFormatAbbrev& operator=(const ScNumFormatAbbrev& rNumFormat) - { - sFormatstring = rNumFormat.sFormatstring; - eLanguage = rNumFormat.eLanguage; - eSysLanguage = rNumFormat.eSysLanguage; - return *this; - } LanguageType GetLanguage() const { return eLanguage; } }; diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx index 11e57e480828..6b020b0e3049 100644 --- a/sc/source/core/tool/chartarr.cxx +++ b/sc/source/core/tool/chartarr.cxx @@ -60,12 +60,6 @@ ScChartArray::ScChartArray( pDocument( pDoc ), aPositioner(pDoc, rRangeList) {} -ScChartArray::ScChartArray( const ScChartArray& rArr ) : - pDocument(rArr.pDocument), - aPositioner(rArr.aPositioner) {} - -ScChartArray::~ScChartArray() {} - ScMemChart* ScChartArray::CreateMemChart() { ScRangeListRef aRangeListRef(GetRangeList()); diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index 9e826009fb8a..4310e9e5a331 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -27,30 +27,12 @@ ScDefaultsOptions::ScDefaultsOptions() SetDefaults(); } -ScDefaultsOptions::ScDefaultsOptions( const ScDefaultsOptions& rCpy ) : - nInitTabCount( rCpy.nInitTabCount ), - aInitTabPrefix( rCpy.aInitTabPrefix ) -{ -} - -ScDefaultsOptions::~ScDefaultsOptions() -{ -} - void ScDefaultsOptions::SetDefaults() { nInitTabCount = 1; aInitTabPrefix = ScGlobal::GetRscString(STR_TABLE_DEF); // Default Prefix "Sheet" } -ScDefaultsOptions& ScDefaultsOptions::operator=( const ScDefaultsOptions& rCpy ) -{ - nInitTabCount = rCpy.nInitTabCount; - aInitTabPrefix = rCpy.aInitTabPrefix; - - return *this; -} - bool ScDefaultsOptions::operator==( const ScDefaultsOptions& rOpt ) const { return rOpt.nInitTabCount == nInitTabCount @@ -63,12 +45,6 @@ ScTpDefaultsItem::ScTpDefaultsItem( const ScDefaultsOptions& rOpt ) : { } -ScTpDefaultsItem::ScTpDefaultsItem( const ScTpDefaultsItem& rItem ) : - SfxPoolItem ( rItem ), - theOptions ( rItem.theOptions ) -{ -} - ScTpDefaultsItem::~ScTpDefaultsItem() { } diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index 38ca02011f00..5eec4ccc7bed 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -53,32 +53,6 @@ ScDocOptions::ScDocOptions() ResetDocOptions(); } -ScDocOptions::ScDocOptions( const ScDocOptions& rCpy ) - : fIterEps( rCpy.fIterEps ), - nIterCount( rCpy.nIterCount ), - nPrecStandardFormat( rCpy.nPrecStandardFormat ), - nDay( rCpy.nDay ), - nMonth( rCpy.nMonth ), - nYear( rCpy.nYear ), - nYear2000( rCpy.nYear2000 ), - nTabDistance( rCpy.nTabDistance ), - eFormulaSearchType( rCpy.eFormulaSearchType ), - bIsIgnoreCase( rCpy.bIsIgnoreCase ), - bIsIter( rCpy.bIsIter ), - bCalcAsShown( rCpy.bCalcAsShown ), - bMatchWholeCell( rCpy.bMatchWholeCell ), - bDoAutoSpell( rCpy.bDoAutoSpell ), - bLookUpColRowNames( rCpy.bLookUpColRowNames ), - bFormulaRegexEnabled( rCpy.bFormulaRegexEnabled ), - bFormulaWildcardsEnabled( rCpy.bFormulaWildcardsEnabled ), - bWriteCalcConfig( rCpy.bWriteCalcConfig ) -{ -} - -ScDocOptions::~ScDocOptions() -{ -} - void ScDocOptions::ResetDocOptions() { bIsIgnoreCase = false; @@ -143,12 +117,6 @@ ScTpCalcItem::ScTpCalcItem( sal_uInt16 nWhichP, const ScDocOptions& rOpt ) { } -ScTpCalcItem::ScTpCalcItem( const ScTpCalcItem& rItem ) - : SfxPoolItem ( rItem ), - theOptions ( rItem.theOptions ) -{ -} - ScTpCalcItem::~ScTpCalcItem() { } diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index 5fba1d82661b..91c024fd181e 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -27,23 +27,6 @@ ScFormulaOptions::ScFormulaOptions() SetDefaults(); } -ScFormulaOptions::ScFormulaOptions( const ScFormulaOptions& rCpy ) : - bUseEnglishFuncName ( rCpy.bUseEnglishFuncName ), - eFormulaGrammar ( rCpy.eFormulaGrammar ), - aCalcConfig(rCpy.aCalcConfig), - mbWriteCalcConfig (rCpy.mbWriteCalcConfig), - aFormulaSepArg ( rCpy.aFormulaSepArg ), - aFormulaSepArrayRow ( rCpy.aFormulaSepArrayRow ), - aFormulaSepArrayCol ( rCpy.aFormulaSepArrayCol ), - meOOXMLRecalc ( rCpy.meOOXMLRecalc ), - meODFRecalc ( rCpy.meODFRecalc ) -{ -} - -ScFormulaOptions::~ScFormulaOptions() -{ -} - void ScFormulaOptions::SetDefaults() { bUseEnglishFuncName = false; @@ -122,20 +105,6 @@ void ScFormulaOptions::GetDefaultFormulaSeparators( rSepArrayRow = ";"; } -ScFormulaOptions& ScFormulaOptions::operator=( const ScFormulaOptions& rCpy ) -{ - bUseEnglishFuncName = rCpy.bUseEnglishFuncName; - eFormulaGrammar = rCpy.eFormulaGrammar; - aCalcConfig = rCpy.aCalcConfig; - mbWriteCalcConfig = rCpy.mbWriteCalcConfig; - aFormulaSepArg = rCpy.aFormulaSepArg; - aFormulaSepArrayRow = rCpy.aFormulaSepArrayRow; - aFormulaSepArrayCol = rCpy.aFormulaSepArrayCol; - meOOXMLRecalc = rCpy.meOOXMLRecalc; - meODFRecalc = rCpy.meODFRecalc; - return *this; -} - bool ScFormulaOptions::operator==( const ScFormulaOptions& rOpt ) const { return bUseEnglishFuncName == rOpt.bUseEnglishFuncName @@ -160,12 +129,6 @@ ScTpFormulaItem::ScTpFormulaItem( const ScFormulaOptions& rOpt ) : { } -ScTpFormulaItem::ScTpFormulaItem( const ScTpFormulaItem& rItem ) : - SfxPoolItem ( rItem ), - theOptions ( rItem.theOptions ) -{ -} - ScTpFormulaItem::~ScTpFormulaItem() { } diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx index b7cb011ed105..8408b8209072 100644 --- a/sc/source/core/tool/inputopt.cxx +++ b/sc/source/core/tool/inputopt.cxx @@ -38,15 +38,6 @@ ScInputOptions::ScInputOptions() SetDefaults(); } -ScInputOptions::ScInputOptions( const ScInputOptions& rCpy ) -{ - *this = rCpy; -} - -ScInputOptions::~ScInputOptions() -{ -} - void ScInputOptions::SetDefaults() { nMoveDir = DIR_BOTTOM; @@ -63,24 +54,6 @@ void ScInputOptions::SetDefaults() bLegacyCellSelection = false; } -ScInputOptions& ScInputOptions::operator=( const ScInputOptions& rCpy ) -{ - nMoveDir = rCpy.nMoveDir; - bMoveSelection = rCpy.bMoveSelection; - bEnterEdit = rCpy.bEnterEdit; - bExtendFormat = rCpy.bExtendFormat; - bRangeFinder = rCpy.bRangeFinder; - bExpandRefs = rCpy.bExpandRefs; - mbSortRefUpdate = rCpy.mbSortRefUpdate; - bMarkHeader = rCpy.bMarkHeader; - bUseTabCol = rCpy.bUseTabCol; - bTextWysiwyg = rCpy.bTextWysiwyg; - bReplCellsWarn = rCpy.bReplCellsWarn; - bLegacyCellSelection = rCpy.bLegacyCellSelection; - - return *this; -} - // Config Item containing input options #define CFGPATH_INPUT "Office.Calc/Input" diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index d8b8b0e67f2d..07cfd71b6d81 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -34,13 +34,6 @@ ScPrintOptions::ScPrintOptions() SetDefaults(); } -ScPrintOptions::ScPrintOptions( const ScPrintOptions& rCpy ) : - bSkipEmpty( rCpy.bSkipEmpty ), - bAllSheets( rCpy.bAllSheets ), - bForceBreaks( rCpy.bForceBreaks ) -{ -} - ScPrintOptions::~ScPrintOptions() { } @@ -52,14 +45,6 @@ void ScPrintOptions::SetDefaults() bForceBreaks = false; } -ScPrintOptions& ScPrintOptions::operator=( const ScPrintOptions& rCpy ) -{ - bSkipEmpty = rCpy.bSkipEmpty; - bAllSheets = rCpy.bAllSheets; - bForceBreaks = rCpy.bForceBreaks; - return *this; -} - bool ScPrintOptions::operator==( const ScPrintOptions& rOpt ) const { return bSkipEmpty == rOpt.bSkipEmpty @@ -73,12 +58,6 @@ ScTpPrintItem::ScTpPrintItem( const ScPrintOptions& rOpt ) : { } -ScTpPrintItem::ScTpPrintItem( const ScTpPrintItem& rItem ) : - SfxPoolItem ( rItem ), - theOptions ( rItem.theOptions ) -{ -} - ScTpPrintItem::~ScTpPrintItem() { } diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index 9dceab2c30a3..67bd9354894a 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -932,23 +932,6 @@ ScArea::ScArea( SCTAB tab, { } -ScArea::ScArea( const ScArea& r ) : - nTab ( r.nTab ), - nColStart( r.nColStart ), nRowStart( r.nRowStart ), - nColEnd ( r.nColEnd ), nRowEnd ( r.nRowEnd ) -{ -} - -ScArea& ScArea::operator=( const ScArea& r ) -{ - nTab = r.nTab; - nColStart = r.nColStart; - nRowStart = r.nRowStart; - nColEnd = r.nColEnd; - nRowEnd = r.nRowEnd; - return *this; -} - bool ScArea::operator==( const ScArea& r ) const { return ( (nTab == r.nTab) diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 6979ed459bb7..9921df0517f2 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -695,8 +695,7 @@ bool ScRefListToken::operator==( const FormulaToken& r ) const ScMatrixToken::ScMatrixToken( const ScMatrixRef& p ) : FormulaToken(formula::svMatrix), pMatrix(p) {} -ScMatrixToken::ScMatrixToken( const ScMatrixToken& r ) : - FormulaToken(r), pMatrix(r.pMatrix) {} +ScMatrixToken::ScMatrixToken( const ScMatrixToken& ) = default; const ScMatrix* ScMatrixToken::GetMatrix() const { return pMatrix.get(); } ScMatrix* ScMatrixToken::GetMatrix() { return pMatrix.get(); } @@ -714,8 +713,7 @@ ScMatrixRangeToken::ScMatrixRangeToken( const sc::RangeMatrix& rMat ) : maRef.InitRange(rMat.mnCol1, rMat.mnRow1, rMat.mnTab1, rMat.mnCol2, rMat.mnRow2, rMat.mnTab2); } -ScMatrixRangeToken::ScMatrixRangeToken( const ScMatrixRangeToken& r ) : - FormulaToken(r), mpMatrix(r.mpMatrix), maRef(r.maRef) {} +ScMatrixRangeToken::ScMatrixRangeToken( const ScMatrixRangeToken& ) = default; sal_uInt8 ScMatrixRangeToken::GetByte() const { @@ -760,14 +758,6 @@ ScExternalSingleRefToken::ScExternalSingleRefToken( sal_uInt16 nFileId, const sv { } -ScExternalSingleRefToken::ScExternalSingleRefToken( const ScExternalSingleRefToken& r ) : - FormulaToken(r), - mnFileId(r.mnFileId), - maTabName(r.maTabName), - maSingleRef(r.maSingleRef) -{ -} - ScExternalSingleRefToken::~ScExternalSingleRefToken() { } @@ -814,14 +804,6 @@ ScExternalDoubleRefToken::ScExternalDoubleRefToken( sal_uInt16 nFileId, const sv { } -ScExternalDoubleRefToken::ScExternalDoubleRefToken( const ScExternalDoubleRefToken& r ) : - FormulaToken(r), - mnFileId(r.mnFileId), - maTabName(r.maTabName), - maDoubleRef(r.maDoubleRef) -{ -} - ScExternalDoubleRefToken::~ScExternalDoubleRefToken() { } @@ -887,13 +869,6 @@ ScExternalNameToken::ScExternalNameToken( sal_uInt16 nFileId, const svl::SharedS { } -ScExternalNameToken::ScExternalNameToken( const ScExternalNameToken& r ) : - FormulaToken(r), - mnFileId(r.mnFileId), - maName(r.maName) -{ -} - ScExternalNameToken::~ScExternalNameToken() {} sal_uInt16 ScExternalNameToken::GetIndex() const @@ -1002,9 +977,7 @@ ScJumpMatrixToken::ScJumpMatrixToken( std::shared_ptr<ScJumpMatrix> p ) : FormulaToken( formula::svJumpMatrix ), mpJumpMatrix( p ) {} -ScJumpMatrixToken::ScJumpMatrixToken( const ScJumpMatrixToken & p ) - : FormulaToken( p ), mpJumpMatrix( p.mpJumpMatrix ) -{} +ScJumpMatrixToken::ScJumpMatrixToken( const ScJumpMatrixToken & ) = default; ScJumpMatrix* ScJumpMatrixToken::GetJumpMatrix() const { @@ -1037,9 +1010,6 @@ bool ScEmptyCellToken::operator==( const FormulaToken& r ) const ScMatrixCellResultToken::ScMatrixCellResultToken( const ScConstMatrixRef& pMat, const formula::FormulaToken* pUL ) : FormulaToken(formula::svMatrixCell), xMatrix(pMat), xUpperLeft(pUL) {} -ScMatrixCellResultToken::ScMatrixCellResultToken( const ScMatrixCellResultToken& r ) : - FormulaToken(r), xMatrix(r.xMatrix), xUpperLeft(r.xUpperLeft) {} - double ScMatrixCellResultToken::GetDouble() const { return xUpperLeft->GetDouble(); } ScMatrixCellResultToken::~ScMatrixCellResultToken() {} @@ -1919,15 +1889,6 @@ ScTokenArray::ScTokenArray() : { } -ScTokenArray::ScTokenArray( const ScTokenArray& rArr ) : - FormulaTokenArray(rArr), - mnHashValue(rArr.mnHashValue), - meVectorState(rArr.meVectorState), - mbOpenCLEnabled(rArr.mbOpenCLEnabled), - mbThreadingEnabled(rArr.mbThreadingEnabled) -{ -} - ScTokenArray::~ScTokenArray() { } diff --git a/sc/source/core/tool/typedstrdata.cxx b/sc/source/core/tool/typedstrdata.cxx index abb12019c9a6..a114b280293c 100644 --- a/sc/source/core/tool/typedstrdata.cxx +++ b/sc/source/core/tool/typedstrdata.cxx @@ -85,12 +85,6 @@ ScTypedStrData::ScTypedStrData( meStrType(nType), mbIsDate( bDate ) {} -ScTypedStrData::ScTypedStrData( const ScTypedStrData& rCpy ) : - maStrValue(rCpy.maStrValue), - mfValue(rCpy.mfValue), - meStrType(rCpy.meStrType), - mbIsDate( rCpy.mbIsDate ) {} - FindTypedStrData::FindTypedStrData(const ScTypedStrData& rVal, bool bCaseSens) : maVal(rVal), mbCaseSens(bCaseSens) {} diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx index f8f4aa2d91ae..544542c207da 100644 --- a/sc/source/core/tool/unitconv.cxx +++ b/sc/source/core/tool/unitconv.cxx @@ -34,12 +34,6 @@ ScUnitConverterData::ScUnitConverterData( maIndexString(BuildIndexString(rFromUnit, rToUnit)), mfValue(fValue) {} -ScUnitConverterData::ScUnitConverterData( const ScUnitConverterData& r ) : - maIndexString(r.maIndexString), - mfValue(r.mfValue) {} - -ScUnitConverterData::~ScUnitConverterData() {} - OUString ScUnitConverterData::BuildIndexString( const OUString& rFromUnit, const OUString& rToUnit ) { diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index e9dddf98f3fa..5ab76e2e9cf7 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -198,12 +198,6 @@ ScTpViewItem::ScTpViewItem( const ScViewOptions& rOpt ) { } -ScTpViewItem::ScTpViewItem( const ScTpViewItem& rItem ) - : SfxPoolItem ( rItem ), - theOptions ( rItem.theOptions ) -{ -} - ScTpViewItem::~ScTpViewItem() { } diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx index 89b97a229441..25c2c34ef8a6 100644 --- a/sc/source/core/tool/zforauto.cxx +++ b/sc/source/core/tool/zforauto.cxx @@ -32,13 +32,6 @@ ScNumFormatAbbrev::ScNumFormatAbbrev() : { } -ScNumFormatAbbrev::ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat) : - sFormatstring (aFormat.sFormatstring), - eLanguage (aFormat.eLanguage), - eSysLanguage (aFormat.eSysLanguage) -{ -} - ScNumFormatAbbrev::ScNumFormatAbbrev(sal_uInt32 nFormat, const SvNumberFormatter& rFormatter) { |