diff options
Diffstat (limited to 'sc/inc')
-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 |
13 files changed, 6 insertions, 55 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; } }; |