diff options
41 files changed, 180 insertions, 85 deletions
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index fadbad0639ac..b881a54a96d5 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -87,6 +87,11 @@ public: ScMergeFlagAttr(ScMF nFlags); virtual ~ScMergeFlagAttr() override; + ScMergeFlagAttr(ScMergeFlagAttr const &) = default; + ScMergeFlagAttr(ScMergeFlagAttr &&) = default; + ScMergeFlagAttr & operator =(ScMergeFlagAttr const &) = default; + ScMergeFlagAttr & operator =(ScMergeFlagAttr &&) = default; + SfxPoolItem * Clone(SfxItemPool * pPool = nullptr) const override; ScMF GetValue() const { return static_cast<ScMF>(SfxInt16Item::GetValue()); } @@ -194,6 +199,11 @@ public: ScViewObjectModeItem( sal_uInt16 nWhich, ScVObjMode eMode ); virtual ~ScViewObjectModeItem() override; + ScViewObjectModeItem(ScViewObjectModeItem const &) = default; + ScViewObjectModeItem(ScViewObjectModeItem &&) = default; + ScViewObjectModeItem & operator =(ScViewObjectModeItem const &) = default; + ScViewObjectModeItem & operator =(ScViewObjectModeItem &&) = default; + virtual sal_uInt16 GetValueCount() const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; @@ -234,6 +244,11 @@ public: virtual ~ScPageScaleToItem() override; + ScPageScaleToItem(ScPageScaleToItem const &) = default; + ScPageScaleToItem(ScPageScaleToItem &&) = default; + ScPageScaleToItem & operator =(ScPageScaleToItem const &) = default; + ScPageScaleToItem & operator =(ScPageScaleToItem &&) = default; + virtual ScPageScaleToItem* Clone( SfxItemPool* = nullptr ) const override; virtual bool operator==( const SfxPoolItem& rCmp ) const override; diff --git a/sc/inc/celltextattr.hxx b/sc/inc/celltextattr.hxx index d10274c06f60..0e9c34c4cf24 100644 --- a/sc/inc/celltextattr.hxx +++ b/sc/inc/celltextattr.hxx @@ -21,7 +21,6 @@ struct CellTextAttr SvtScriptType mnScriptType; CellTextAttr(); - CellTextAttr(const CellTextAttr& r); }; } diff --git a/sc/inc/datamapper.hxx b/sc/inc/datamapper.hxx index 9c59a7461b82..1ea5e4111c6a 100644 --- a/sc/inc/datamapper.hxx +++ b/sc/inc/datamapper.hxx @@ -80,8 +80,6 @@ public: ExternalDataSource(const OUString& rURL, const OUString& rProvider, ScDocument* pDoc); - ~ExternalDataSource(); - void setUpdateFrequency(double nUpdateFrequency); void setID(const OUString& rID); diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index 81c5fe2babd4..76e187797f48 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -43,6 +43,11 @@ public: ScTpDefaultsItem( const ScDefaultsOptions& rOpt ); virtual ~ScTpDefaultsItem() override; + ScTpDefaultsItem(ScTpDefaultsItem const &) = default; + ScTpDefaultsItem(ScTpDefaultsItem &&) = default; + ScTpDefaultsItem & operator =(ScTpDefaultsItem const &) = default; + ScTpDefaultsItem & operator =(ScTpDefaultsItem &&) = default; + virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index ad6079711853..32d8d328d523 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -140,6 +140,11 @@ public: const ScDocOptions& rOpt ); virtual ~ScTpCalcItem() override; + ScTpCalcItem(ScTpCalcItem const &) = default; + ScTpCalcItem(ScTpCalcItem &&) = default; + ScTpCalcItem & operator =(ScTpCalcItem const &) = default; + ScTpCalcItem & operator =(ScTpCalcItem &&) = default; + virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/sc/inc/dpdimsave.hxx b/sc/inc/dpdimsave.hxx index d982daa9c687..c49f2d33f969 100644 --- a/sc/inc/dpdimsave.hxx +++ b/sc/inc/dpdimsave.hxx @@ -90,7 +90,6 @@ class SC_DLLPUBLIC ScDPSaveGroupDimension public: ScDPSaveGroupDimension( const OUString& rSource, const OUString& rName ); ScDPSaveGroupDimension( const OUString& rSource, const OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ); - ~ScDPSaveGroupDimension(); void AddToData( ScDPGroupTableData& rData ) const; void AddToCache(ScDPCache& rCache) const; @@ -135,7 +134,6 @@ class SC_DLLPUBLIC ScDPSaveNumGroupDimension public: ScDPSaveNumGroupDimension( const OUString& rName, const ScDPNumGroupInfo& rInfo ); ScDPSaveNumGroupDimension( const OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart ); - ~ScDPSaveNumGroupDimension(); void AddToData( ScDPGroupTableData& rData ) const; void AddToCache(ScDPCache& rCache) const; @@ -158,7 +156,6 @@ class SC_DLLPUBLIC ScDPDimensionSaveData { public: ScDPDimensionSaveData(); - ~ScDPDimensionSaveData(); bool operator==( const ScDPDimensionSaveData& r ) const; diff --git a/sc/inc/dpnumgroupinfo.hxx b/sc/inc/dpnumgroupinfo.hxx index 48906f151ffe..4a867a99efb1 100644 --- a/sc/inc/dpnumgroupinfo.hxx +++ b/sc/inc/dpnumgroupinfo.hxx @@ -25,7 +25,6 @@ struct ScDPNumGroupInfo double mfStep; SC_DLLPUBLIC ScDPNumGroupInfo(); - SC_DLLPUBLIC ScDPNumGroupInfo(const ScDPNumGroupInfo& r); #if DUMP_PIVOT_TABLE void Dump() const; diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index 14cd9432bef6..72aed45577c9 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -81,6 +81,11 @@ public: ScTpFormulaItem( const ScFormulaOptions& rOpt ); virtual ~ScTpFormulaItem() override; + ScTpFormulaItem(ScTpFormulaItem const &) = default; + ScTpFormulaItem(ScTpFormulaItem &&) = default; + ScTpFormulaItem & operator =(ScTpFormulaItem const &) = default; + ScTpFormulaItem & operator =(ScTpFormulaItem &&) = default; + virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx index de77e208b829..fcb4ea542354 100644 --- a/sc/inc/postit.hxx +++ b/sc/inc/postit.hxx @@ -48,7 +48,6 @@ struct SC_DLLPUBLIC ScNoteData bool mbShown; /// True = note is visible. explicit ScNoteData( bool bShown = false ); - ~ScNoteData(); }; /** diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index 23bf35796247..68c3056f86fe 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -33,7 +33,6 @@ private: public: ScPrintOptions(); - ~ScPrintOptions(); bool GetSkipEmpty() const { return bSkipEmpty; } void SetSkipEmpty( bool bVal ) { bSkipEmpty = bVal; } @@ -55,6 +54,11 @@ public: ScTpPrintItem( const ScPrintOptions& rOpt ); virtual ~ScTpPrintItem() override; + ScTpPrintItem(ScTpPrintItem const &) = default; + ScTpPrintItem(ScTpPrintItem &&) = default; + ScTpPrintItem & operator =(ScTpPrintItem const &) = default; + ScTpPrintItem & operator =(ScTpPrintItem &&) = default; + virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx index c1709015a951..79215637ef03 100644 --- a/sc/inc/queryparam.hxx +++ b/sc/inc/queryparam.hxx @@ -109,6 +109,11 @@ struct ScQueryParamTable ScQueryParamTable(); virtual ~ScQueryParamTable(); + + ScQueryParamTable(ScQueryParamTable const &) = default; + ScQueryParamTable(ScQueryParamTable &&) = default; + ScQueryParamTable & operator =(ScQueryParamTable const &) = default; + ScQueryParamTable & operator =(ScQueryParamTable &&) = default; }; // For use in SAL_DEBUG etc. Output format not guaranteed to be stable. diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx index e558c8e7fe48..4bc7eb468110 100644 --- a/sc/inc/refhint.hxx +++ b/sc/inc/refhint.hxx @@ -39,6 +39,11 @@ public: RefHint() = delete; virtual ~RefHint() override = 0; + RefHint(RefHint const &) = default; + RefHint(RefHint &&) = default; + RefHint & operator =(RefHint const &) = default; + RefHint & operator =(RefHint &&) = default; + Type getType() const; }; @@ -77,6 +82,11 @@ public: RefColReorderHint( const sc::ColRowReorderMapType& rColMap, SCTAB nTab, SCROW nRow1, SCROW nRow2 ); virtual ~RefColReorderHint() override; + RefColReorderHint(RefColReorderHint const &) = default; + RefColReorderHint(RefColReorderHint &&) = default; + RefColReorderHint & operator =(RefColReorderHint const &) = default; + RefColReorderHint & operator =(RefColReorderHint &&) = default; + const sc::ColRowReorderMapType& getColMap() const; SCTAB getTab() const; @@ -95,6 +105,11 @@ public: RefRowReorderHint( const sc::ColRowReorderMapType& rRowMap, SCTAB nTab, SCCOL nCol1, SCCOL nCol2 ); virtual ~RefRowReorderHint() override; + RefRowReorderHint(RefRowReorderHint const &) = default; + RefRowReorderHint(RefRowReorderHint &&) = default; + RefRowReorderHint & operator =(RefRowReorderHint const &) = default; + RefRowReorderHint & operator =(RefRowReorderHint &&) = default; + const sc::ColRowReorderMapType& getRowMap() const; SCTAB getTab() const; diff --git a/sc/inc/refupdatecontext.hxx b/sc/inc/refupdatecontext.hxx index 167eb0bec2d3..417aa794a54e 100644 --- a/sc/inc/refupdatecontext.hxx +++ b/sc/inc/refupdatecontext.hxx @@ -104,7 +104,6 @@ struct RefUpdateResult bool mbNameModified; RefUpdateResult(); - RefUpdateResult(const RefUpdateResult& r); }; struct SC_DLLPUBLIC RefUpdateInsertTabContext diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index ec66fdcf17c0..6a1d1ee946f7 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -220,6 +220,11 @@ public: ScCellTextCursor(ScCellObj& rText); virtual ~ScCellTextCursor() throw() override; + ScCellTextCursor(ScCellTextCursor const &) = default; + ScCellTextCursor(ScCellTextCursor &&) = default; + ScCellTextCursor & operator =(ScCellTextCursor const &) = default; + ScCellTextCursor & operator =(ScCellTextCursor &&) = default; + ScCellObj& GetCellObj() const { return *mxTextObj; } // SvxUnoTextCursor methods reimplemented here: @@ -246,6 +251,11 @@ public: ScHeaderFooterTextCursor(rtl::Reference<ScHeaderFooterTextObj> const & rText); virtual ~ScHeaderFooterTextCursor() throw() override; + ScHeaderFooterTextCursor(ScHeaderFooterTextCursor const &) = default; + ScHeaderFooterTextCursor(ScHeaderFooterTextCursor &&) = default; + ScHeaderFooterTextCursor & operator =(ScHeaderFooterTextCursor const &) = default; + ScHeaderFooterTextCursor & operator =(ScHeaderFooterTextCursor &&) = default; + // SvxUnoTextCursor methods reimplemented here: virtual css::uno::Reference< css::text::XText > SAL_CALL getText() override; @@ -271,6 +281,11 @@ public: const SvxUnoTextBase& rText ); virtual ~ScDrawTextCursor() throw() override; + ScDrawTextCursor(ScDrawTextCursor const &) = default; + ScDrawTextCursor(ScDrawTextCursor &&) = default; + ScDrawTextCursor & operator =(ScDrawTextCursor const &) = default; + ScDrawTextCursor & operator =(ScDrawTextCursor &&) = default; + // SvxUnoTextCursor methods reimplemented here: virtual css::uno::Reference< css::text::XText > SAL_CALL getText() override; diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index 8e756a93a54f..2e747b2d82ad 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -147,6 +147,11 @@ public: ScExternalSingleRefToken() = delete; virtual ~ScExternalSingleRefToken() override; + ScExternalSingleRefToken(ScExternalSingleRefToken const &) = default; + ScExternalSingleRefToken(ScExternalSingleRefToken &&) = default; + ScExternalSingleRefToken & operator =(ScExternalSingleRefToken const &) = default; + ScExternalSingleRefToken & operator =(ScExternalSingleRefToken &&) = default; + virtual sal_uInt16 GetIndex() const override; virtual svl::SharedString GetString() const override; virtual const ScSingleRefData* GetSingleRef() const override; @@ -166,6 +171,11 @@ public: ScExternalDoubleRefToken( sal_uInt16 nFileId, const svl::SharedString& rTabName, const ScComplexRefData& r ); virtual ~ScExternalDoubleRefToken() override; + ScExternalDoubleRefToken(ScExternalDoubleRefToken const &) = default; + ScExternalDoubleRefToken(ScExternalDoubleRefToken &&) = default; + ScExternalDoubleRefToken & operator =(ScExternalDoubleRefToken const &) = default; + ScExternalDoubleRefToken & operator =(ScExternalDoubleRefToken &&) = default; + virtual sal_uInt16 GetIndex() const override; virtual svl::SharedString GetString() const override; virtual const ScSingleRefData* GetSingleRef() const override; @@ -188,6 +198,11 @@ public: ScExternalNameToken( sal_uInt16 nFileId, const svl::SharedString& rName ); virtual ~ScExternalNameToken() override; + ScExternalNameToken(ScExternalNameToken const &) = default; + ScExternalNameToken(ScExternalNameToken &&) = default; + ScExternalNameToken & operator =(ScExternalNameToken const &) = default; + ScExternalNameToken & operator =(ScExternalNameToken &&) = default; + virtual sal_uInt16 GetIndex() const override; virtual svl::SharedString GetString() const override; virtual bool operator==( const formula::FormulaToken& rToken ) const override; diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx index a85c5b3d8946..7e32d3c32ab1 100644 --- a/sc/inc/userdat.hxx +++ b/sc/inc/userdat.hxx @@ -88,6 +88,11 @@ public: ScMacroInfo(); virtual ~ScMacroInfo() override; + ScMacroInfo(ScMacroInfo const &) = default; + ScMacroInfo(ScMacroInfo &&) = default; + ScMacroInfo & operator =(ScMacroInfo const &) = default; + ScMacroInfo & operator =(ScMacroInfo &&) = default; + virtual std::unique_ptr<SdrObjUserData> Clone( SdrObject* pObj ) const override; void SetMacro( const OUString& rMacro ) { maMacro = rMacro; } diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index cd73ada6640e..b7870ddb646a 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -68,7 +68,6 @@ public: ScGridOptions( const SvxOptionsGrid& rOpt ) : SvxOptionsGrid( rOpt ) {} void SetDefaults(); - ScGridOptions& operator= ( const ScGridOptions& rCpy ); bool operator== ( const ScGridOptions& rOpt ) const; bool operator!= ( const ScGridOptions& rOpt ) const { return !(operator==(rOpt)); } }; @@ -117,6 +116,11 @@ public: ScTpViewItem( const ScViewOptions& rOpt ); virtual ~ScTpViewItem() override; + ScTpViewItem(ScTpViewItem const &) = default; + ScTpViewItem(ScTpViewItem &&) = default; + ScTpViewItem & operator =(ScTpViewItem const &) = default; + ScTpViewItem & operator =(ScTpViewItem &&) = default; + virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/sc/source/core/data/celltextattr.cxx b/sc/source/core/data/celltextattr.cxx index 5d792442b8af..09bfb0829a67 100644 --- a/sc/source/core/data/celltextattr.cxx +++ b/sc/source/core/data/celltextattr.cxx @@ -16,10 +16,6 @@ CellTextAttr::CellTextAttr() : mnTextWidth(TEXTWIDTH_DIRTY), mnScriptType(SvtScriptType::UNKNOWN) {} -CellTextAttr::CellTextAttr(const CellTextAttr& r) : - mnTextWidth(r.mnTextWidth), - mnScriptType(r.mnScriptType) {} - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index ec19876bcd65..5b24a30d08b0 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -2027,6 +2027,12 @@ namespace { class SharedTopFormulaCellPicker { public: + SharedTopFormulaCellPicker() = default; + SharedTopFormulaCellPicker(SharedTopFormulaCellPicker const &) = default; + SharedTopFormulaCellPicker(SharedTopFormulaCellPicker &&) = default; + SharedTopFormulaCellPicker & operator =(SharedTopFormulaCellPicker const &) = default; + SharedTopFormulaCellPicker & operator =(SharedTopFormulaCellPicker &&) = default; + virtual ~SharedTopFormulaCellPicker() {} void operator() ( sc::CellStoreType::value_type& node ) diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index 7b5f315ba18e..937d62c5d9f0 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -145,10 +145,6 @@ ScDPSaveGroupDimension::ScDPSaveGroupDimension( const OUString& rSource, const O { } -ScDPSaveGroupDimension::~ScDPSaveGroupDimension() -{ -} - void ScDPSaveGroupDimension::SetDateInfo( const ScDPNumGroupInfo& rInfo, sal_Int32 nPart ) { aDateInfo = rInfo; @@ -433,10 +429,6 @@ ScDPSaveNumGroupDimension::ScDPSaveNumGroupDimension( const OUString& rName, con { } -ScDPSaveNumGroupDimension::~ScDPSaveNumGroupDimension() -{ -} - void ScDPSaveNumGroupDimension::AddToData( ScDPGroupTableData& rData ) const { long nSource = rData.GetDimensionIndex( aDimensionName ); @@ -589,10 +581,6 @@ ScDPDimensionSaveData::ScDPDimensionSaveData() { } -ScDPDimensionSaveData::~ScDPDimensionSaveData() -{ -} - bool ScDPDimensionSaveData::operator==( const ScDPDimensionSaveData& ) const { return false; diff --git a/sc/source/core/data/dpnumgroupinfo.cxx b/sc/source/core/data/dpnumgroupinfo.cxx index 368ed6bf98f4..f57822e163bf 100644 --- a/sc/source/core/data/dpnumgroupinfo.cxx +++ b/sc/source/core/data/dpnumgroupinfo.cxx @@ -17,15 +17,6 @@ ScDPNumGroupInfo::ScDPNumGroupInfo() : mbIntegerOnly(true), mfStart(0.0), mfEnd(0.0), mfStep(0.0) {} -ScDPNumGroupInfo::ScDPNumGroupInfo(const ScDPNumGroupInfo& r) : - mbEnable(r.mbEnable), - mbDateValues(r.mbDateValues), - mbAutoStart(r.mbAutoStart), - mbAutoEnd(r.mbAutoEnd), - mbIntegerOnly(r.mbIntegerOnly), - mfStart(r.mfStart), - mfEnd(r.mfEnd), mfStep(r.mfStep) {} - #if DUMP_PIVOT_TABLE void ScDPNumGroupInfo::Dump() const diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index ece95a672ba7..804387cf1467 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -500,10 +500,6 @@ ScNoteData::ScNoteData( bool bShown ) : { } -ScNoteData::~ScNoteData() -{ -} - sal_uInt32 ScPostIt::mnLastPostItId = 1; ScPostIt::ScPostIt( ScDocument& rDoc, const ScAddress& rPos, sal_uInt32 nPostItId ) : diff --git a/sc/source/core/data/refupdatecontext.cxx b/sc/source/core/data/refupdatecontext.cxx index 6f7552254380..d4cce81dc680 100644 --- a/sc/source/core/data/refupdatecontext.cxx +++ b/sc/source/core/data/refupdatecontext.cxx @@ -77,10 +77,6 @@ bool RefUpdateContext::isDeleted() const } RefUpdateResult::RefUpdateResult() : mbValueChanged(false), mbReferenceModified(false), mbNameModified(false) {} -RefUpdateResult::RefUpdateResult(const RefUpdateResult& r) : - mbValueChanged(r.mbValueChanged), - mbReferenceModified(r.mbReferenceModified), - mbNameModified(r.mbNameModified) {} RefUpdateInsertTabContext::RefUpdateInsertTabContext(ScDocument& rDoc, SCTAB nInsertPos, SCTAB nSheets) : mrDoc(rDoc), mnInsertPos(nInsertPos), mnSheets(nSheets) {} diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index 07cfd71b6d81..5d0cb087ffcb 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -34,10 +34,6 @@ ScPrintOptions::ScPrintOptions() SetDefaults(); } -ScPrintOptions::~ScPrintOptions() -{ -} - void ScPrintOptions::SetDefaults() { bSkipEmpty = true; diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 909dd81db896..81f83286f997 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -61,22 +61,6 @@ void ScGridOptions::SetDefaults() nFldDivisionY = 1; } -ScGridOptions& ScGridOptions::operator=( const ScGridOptions& rCpy ) -{ - nFldDrawX = rCpy.nFldDrawX; // UINT32 - nFldDivisionX = rCpy.nFldDivisionX; - nFldDrawY = rCpy.nFldDrawY; - nFldDivisionY = rCpy.nFldDivisionY; - nFldSnapX = rCpy.nFldSnapX; - nFldSnapY = rCpy.nFldSnapY; - bUseGridsnap = rCpy.bUseGridsnap; // BitBool - bSynchronize = rCpy.bSynchronize; - bGridVisible = rCpy.bGridVisible; - bEqualGrid = rCpy.bEqualGrid; - - return *this; -} - bool ScGridOptions::operator==( const ScGridOptions& rCpy ) const { return ( nFldDrawX == rCpy.nFldDrawX diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index 33631e8a0f75..c4d14a5b9aa2 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -112,6 +112,11 @@ public: explicit ScfPropertySet( const css::uno::Reference< InterfaceType >& xInterface ) { Set( xInterface ); } ~ScfPropertySet(); + //TOOD: + ScfPropertySet(ScfPropertySet const &) = default; + ScfPropertySet(ScfPropertySet &&) = default; + ScfPropertySet & operator =(ScfPropertySet const &) = default; + ScfPropertySet & operator =(ScfPropertySet &&) = default; /** Sets the passed UNO property set and releases the old UNO property set. */ void Set( css::uno::Reference< css::beans::XPropertySet > const & xPropSet ); diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index d207559a2d66..3f359c07e1bf 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -537,6 +537,11 @@ public: explicit FunctionProvider(bool bImportFilter); virtual ~FunctionProvider(); + FunctionProvider(FunctionProvider const &) = default; + FunctionProvider(FunctionProvider &&) = default; + FunctionProvider & operator =(FunctionProvider const &) = default; + FunctionProvider & operator =(FunctionProvider &&) = default; + /** Returns the function info for an OOXML function name, or 0 on error. */ const FunctionInfo* getFuncInfoFromOoxFuncName( const OUString& rFuncName ) const; @@ -574,6 +579,11 @@ public: bool bImportFilter); virtual ~OpCodeProvider() override; + OpCodeProvider(OpCodeProvider const &) = default; + OpCodeProvider(OpCodeProvider &&) = default; + OpCodeProvider & operator =(OpCodeProvider const &) = default; + OpCodeProvider & operator =(OpCodeProvider &&) = default; + /** Returns the structure containing all token op-codes for operators and special tokens used by the Calc document and its formula parser. */ const ApiOpCodes& getOpCodes() const; diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index afd36fadd83b..7a9047ae55d5 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -104,6 +104,11 @@ public: /*implicit*/ WorkbookHelper( WorkbookGlobals& rBookGlob ) : mrBookGlob( rBookGlob ) {} virtual ~WorkbookHelper(); + WorkbookHelper(WorkbookHelper const &) = default; + WorkbookHelper(WorkbookHelper &&) = default; + WorkbookHelper & operator =(WorkbookHelper const &) = default; + WorkbookHelper & operator =(WorkbookHelper &&) = default; + static WorkbookGlobalsRef constructGlobals( ExcelFilter& rFilter ); // filter ----------------------------------------------------------------- diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index dcdd1e3f3b6d..d9fca5961ea2 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -83,6 +83,11 @@ public: explicit XclExpChRoot( const XclExpRoot& rRoot, XclExpChChart& rChartData ); virtual ~XclExpChRoot() override; + XclExpChRoot(XclExpChRoot const &) = default; + XclExpChRoot(XclExpChRoot &&) = default; + XclExpChRoot & operator =(XclExpChRoot const &) = default; + XclExpChRoot & operator =(XclExpChRoot &&) = default; + /** Returns this root instance - for code readability in derived classes. */ const XclExpChRoot& GetChRoot() const { return *this; } /** Returns the API Chart document model. */ diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index efa20eb0f402..2985e452ce2e 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -36,6 +36,12 @@ class XclExpRecordBase { public: + XclExpRecordBase() = default; + XclExpRecordBase(XclExpRecordBase const &) = default; + XclExpRecordBase(XclExpRecordBase &&) = default; + XclExpRecordBase & operator =(XclExpRecordBase const &) = default; + XclExpRecordBase & operator =(XclExpRecordBase &&) = default; + virtual ~XclExpRecordBase(); /** Overwrite this method to do any operation while saving the record. */ @@ -124,6 +130,11 @@ public: virtual ~XclExpRecord() override; + XclExpRecord(XclExpRecord const &) = default; + XclExpRecord(XclExpRecord &&) = default; + XclExpRecord & operator =(XclExpRecord const &) = default; + XclExpRecord & operator =(XclExpRecord &&) = default; + /** Returns the current record ID. */ sal_uInt16 GetRecId() const { return mnRecId; } /** Returns the current record size prediction. */ diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index d1e3f4efcde8..f02ec52ca42b 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -86,6 +86,11 @@ public: explicit XclImpChRoot( const XclImpRoot& rRoot, XclImpChChart& rChartData ); virtual ~XclImpChRoot() override; + XclImpChRoot(XclImpChRoot const &) = default; + XclImpChRoot(XclImpChRoot &&) = default; + XclImpChRoot & operator =(XclImpChRoot const &) = default; + XclImpChRoot & operator =(XclImpChRoot &&) = default; + /** Returns this root instance - for code readability in derived classes. */ const XclImpChRoot& GetChRoot() const { return *this; } /** Returns a reference to the parent chart data object. */ @@ -177,6 +182,12 @@ private: class XclImpChGroupBase { public: + XclImpChGroupBase() = default; + XclImpChGroupBase(XclImpChGroupBase const &) = default; + XclImpChGroupBase(XclImpChGroupBase &&) = default; + XclImpChGroupBase & operator =(XclImpChGroupBase const &) = default; + XclImpChGroupBase & operator =(XclImpChGroupBase &&) = default; + virtual ~XclImpChGroupBase(); /** Reads the entire record group. @@ -428,6 +439,12 @@ typedef std::shared_ptr< XclImpChSourceLink > XclImpChSourceLinkRef; class XclImpChFontBase { public: + XclImpChFontBase() = default; + XclImpChFontBase(XclImpChFontBase const &) = default; + XclImpChFontBase(XclImpChFontBase &&) = default; + XclImpChFontBase & operator =(XclImpChFontBase const &) = default; + XclImpChFontBase & operator =(XclImpChFontBase &&) = default; + virtual ~XclImpChFontBase(); /** Derived classes return the leading font index for the text object. */ diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index 5306bbbf690c..26e5c7869eb2 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -377,6 +377,11 @@ public: explicit XclPCItem(); virtual ~XclPCItem(); + XclPCItem(XclPCItem const &) = default; + XclPCItem(XclPCItem &&) = default; + XclPCItem & operator =(XclPCItem const &) = default; + XclPCItem & operator =(XclPCItem &&) = default; + /** Sets the item to 'empty' type. */ void SetEmpty(); /** Sets the item to 'text' type and adds the passed text. */ diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index 1ff7b9a8c1f7..f9b6e68a80ad 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -566,6 +566,11 @@ public: explicit XclXFBase( bool bCellXF ); virtual ~XclXFBase(); + XclXFBase(XclXFBase const &) = default; + XclXFBase(XclXFBase &&) = default; + XclXFBase & operator =(XclXFBase const &) = default; + XclXFBase & operator =(XclXFBase &&) = default; + /** Sets all "attribute used" flags to the passed state. */ void SetAllUsedFlags( bool bUsed ); /** Returns true, if any "attribute used" flags are ste in this XF. */ diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index 1f8cb283f85d..58f1b693a804 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -540,10 +540,6 @@ ScMyCell::ScMyCell() : { } -ScMyCell::~ScMyCell() -{ -} - ScMyNotEmptyCellsIterator::ScMyNotEmptyCellsIterator(ScXMLExport& rTempXMLExport) : pShapes(nullptr), pNoteShapes(nullptr), diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 11d88f004f01..2866b09210b7 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -51,6 +51,11 @@ public: ScMyIteratorBase(); virtual ~ScMyIteratorBase(); + ScMyIteratorBase(ScMyIteratorBase const &) = default; + ScMyIteratorBase(ScMyIteratorBase &&) = default; + ScMyIteratorBase & operator =(ScMyIteratorBase const &) = default; + ScMyIteratorBase & operator =(ScMyIteratorBase &&) = default; + virtual void SetCellData( ScMyCell& rMyCell ) = 0; virtual void Sort() = 0; @@ -195,6 +200,12 @@ protected: public: ScMyEmptyDatabaseRangesContainer(); virtual ~ScMyEmptyDatabaseRangesContainer() override; + + ScMyEmptyDatabaseRangesContainer(ScMyEmptyDatabaseRangesContainer const &) = default; + ScMyEmptyDatabaseRangesContainer(ScMyEmptyDatabaseRangesContainer &&) = default; + ScMyEmptyDatabaseRangesContainer & operator =(ScMyEmptyDatabaseRangesContainer const &) = default; + ScMyEmptyDatabaseRangesContainer & operator =(ScMyEmptyDatabaseRangesContainer &&) = default; + void AddNewEmptyDatabaseRange(const css::table::CellRangeAddress& aCellRangeAddress); using ScMyIteratorBase::UpdateAddress; @@ -305,7 +316,6 @@ struct ScMyCell bool bHasAnnotation; ScMyCell(); - ~ScMyCell(); }; class ScMyNotEmptyCellsIterator diff --git a/sc/source/ui/dataprovider/dataprovider.cxx b/sc/source/ui/dataprovider/dataprovider.cxx index 01aa0c80331a..f36f80006303 100644 --- a/sc/source/ui/dataprovider/dataprovider.cxx +++ b/sc/source/ui/dataprovider/dataprovider.cxx @@ -66,10 +66,6 @@ ExternalDataSource::ExternalDataSource(const OUString& rURL, { } -ExternalDataSource::~ExternalDataSource() -{ -} - void ExternalDataSource::setID(const OUString& rID) { maID = rID; diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index 94bcb4494544..f510577c2712 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -43,10 +43,6 @@ ScAsciiOptions::ScAsciiOptions() : { } -ScAsciiOptions::~ScAsciiOptions() -{ -} - void ScAsciiOptions::SetColumnInfo( const ScCsvExpDataVec& rDataVec ) { sal_uInt16 nInfoCount = static_cast< sal_uInt16 >( rDataVec.size() ); diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx index c91ac25a5be5..3c73ee25327b 100644 --- a/sc/source/ui/inc/asciiopt.hxx +++ b/sc/source/ui/inc/asciiopt.hxx @@ -47,7 +47,6 @@ private: public: ScAsciiOptions(); - ~ScAsciiOptions(); static const sal_Unicode cDefaultTextSep = '"'; diff --git a/sc/source/ui/inc/condformatdlgitem.hxx b/sc/source/ui/inc/condformatdlgitem.hxx index 0daed60f3f32..55f2e1a5ade2 100644 --- a/sc/source/ui/inc/condformatdlgitem.hxx +++ b/sc/source/ui/inc/condformatdlgitem.hxx @@ -42,6 +42,11 @@ public: virtual ~ScCondFormatDlgItem() override; + ScCondFormatDlgItem(ScCondFormatDlgItem const &) = default; + ScCondFormatDlgItem(ScCondFormatDlgItem &&) = default; + ScCondFormatDlgItem & operator =(ScCondFormatDlgItem const &) = default; + ScCondFormatDlgItem & operator =(ScCondFormatDlgItem &&) = default; + virtual bool operator==(const SfxPoolItem&) const override; virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index d0d9e84ac16b..0027a73abae2 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -265,9 +265,6 @@ private: anywhere. */ SAL_WARN_UNUSED_RESULT ScSplitPos SanitizeWhichActive() const; - -public: - ~ScViewDataTable(); }; class SC_DLLPUBLIC ScViewData diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index ab9303b23d29..4f0ccf24f0b3 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -493,10 +493,6 @@ ScViewDataTable::ScViewDataTable() : nPixPosY[0]=nPixPosY[1]=0; } -ScViewDataTable::~ScViewDataTable() -{ -} - void ScViewDataTable::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSettings, const ScViewData& rViewData) const { rSettings.realloc(SC_TABLE_VIEWSETTINGS_COUNT); |