diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /sc/source/filter/inc | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'sc/source/filter/inc')
56 files changed, 131 insertions, 131 deletions
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 928d45f18a16..6da99a5969d9 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -69,7 +69,7 @@ public: typedef std::vector<XclExpUserBView*>::const_iterator const_iterator; XclExpUserBViewList( const ScChangeTrack& rChangeTrack ); - virtual ~XclExpUserBViewList(); + virtual ~XclExpUserBViewList() override; inline iterator begin () { return aViews.begin(); } inline iterator end () { return aViews.end(); } @@ -162,7 +162,7 @@ private: public: inline XclExpChTrEmpty( sal_uInt16 nNum ) : nRecNum( nNum ) {} - virtual ~XclExpChTrEmpty(); + virtual ~XclExpChTrEmpty() override; virtual sal_uInt16 GetNum() const override; virtual sal_Size GetLen() const override; @@ -176,7 +176,7 @@ private: virtual void SaveCont( XclExpStream& rStrm ) override; public: - virtual ~XclExpChTr0x0195(); + virtual ~XclExpChTr0x0195() override; virtual sal_uInt16 GetNum() const override; virtual sal_Size GetLen() const override; @@ -194,7 +194,7 @@ private: public: inline XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ); - virtual ~XclExpChTr0x0194(); + virtual ~XclExpChTr0x0194() override; virtual sal_uInt16 GetNum() const override; virtual sal_Size GetLen() const override; @@ -218,7 +218,7 @@ private: public: inline XclExpChTrHeader() : nCount( 0 ) {} - virtual ~XclExpChTrHeader(); + virtual ~XclExpChTrHeader() override; inline void SetGUID( const sal_uInt8* pGUID ) { memcpy( aGUID, pGUID, 16 ); } inline void SetCount( sal_uInt32 nNew ) { nCount = nNew; } @@ -278,7 +278,7 @@ public: XclExpChTrInfo( const OUString& rUsername, const DateTime& rDateTime, const sal_uInt8* pGUID ); - virtual ~XclExpChTrInfo(); + virtual ~XclExpChTrInfo() override; virtual sal_uInt16 GetNum() const override; virtual sal_Size GetLen() const override; @@ -327,7 +327,7 @@ public: inline XclExpChTrTabId( sal_uInt16 nCount ) : pBuffer( nullptr ), nTabCount( nCount ) {} XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer ); - virtual ~XclExpChTrTabId(); + virtual ~XclExpChTrTabId() override; void Copy( const XclExpChTrTabIdBuffer& rBuffer ); @@ -388,7 +388,7 @@ public: const XclExpRoot& rRoot, const XclExpChTrTabIdBuffer& rTabIdBuffer, sal_uInt16 nNewOpCode = EXC_CHTR_OP_UNKNOWN ); - virtual ~XclExpChTrAction(); + virtual ~XclExpChTrAction() override; inline const OUString& GetUsername() const { return sUsername; } inline const DateTime& GetDateTime() const { return aDateTime; } @@ -481,7 +481,7 @@ public: const ScChangeActionContent& rAction, const XclExpRoot& rRoot, const XclExpChTrTabIdBuffer& rTabIdBuffer ); - virtual ~XclExpChTrCellContent(); + virtual ~XclExpChTrCellContent() override; virtual sal_uInt16 GetNum() const override; virtual sal_Size GetActionByteCount() const override; @@ -510,7 +510,7 @@ public: const XclExpRoot& rRoot, const XclExpChTrTabIdBuffer& rTabIdBuffer, ScChangeTrack& rChangeTrack ); - virtual ~XclExpChTrInsert(); + virtual ~XclExpChTrInsert() override; virtual sal_uInt16 GetNum() const override; virtual sal_Size GetActionByteCount() const override; @@ -533,7 +533,7 @@ public: const ScChangeAction& rAction, const XclExpRoot& rRoot, const XclExpChTrTabIdBuffer& rTabIdBuffer ); - virtual ~XclExpChTrInsertTab(); + virtual ~XclExpChTrInsertTab() override; virtual sal_uInt16 GetNum() const override; virtual sal_Size GetActionByteCount() const override; @@ -559,7 +559,7 @@ public: const XclExpRoot& rRoot, const XclExpChTrTabIdBuffer& rTabIdBuffer, ScChangeTrack& rChangeTrack ); - virtual ~XclExpChTrMoveRange(); + virtual ~XclExpChTrMoveRange() override; virtual sal_uInt16 GetNum() const override; virtual sal_Size GetActionByteCount() const override; @@ -576,7 +576,7 @@ protected: public: XclExpChTr0x014A( const XclExpChTrInsert& rAction ); - virtual ~XclExpChTr0x014A(); + virtual ~XclExpChTr0x014A() override; virtual sal_uInt16 GetNum() const override; virtual sal_Size GetActionByteCount() const override; @@ -608,7 +608,7 @@ class XclExpChangeTrack : protected XclExpRoot public: XclExpChangeTrack( const XclExpRoot& rRoot ); - virtual ~XclExpChangeTrack(); + virtual ~XclExpChangeTrack() override; void Write(); void WriteXml( XclExpXmlStream& rStrm ); diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index 758b2b35719b..ac296e37711c 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -100,7 +100,7 @@ private: public: XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStream& rBookStrm ); - virtual ~XclImpChangeTrack(); + virtual ~XclImpChangeTrack() override; // reads extended 3D ref info following the formulas, returns sc tab nums // ( called by XclImpChTrFmlConverter::Read3DTabReference() ) @@ -153,7 +153,7 @@ private: public: XclImpChTrFmlConverter( XclImpRoot& rRoot, XclImpChangeTrack& rXclChTr ); - virtual ~XclImpChTrFmlConverter(); + virtual ~XclImpChTrFmlConverter() override; }; #endif diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index 34e08f7b2e52..d64c9b843ea1 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -35,7 +35,7 @@ class BiffDecoderBase : public ::comphelper::IDocPasswordVerifier { public: explicit BiffDecoderBase(); - virtual ~BiffDecoderBase(); + virtual ~BiffDecoderBase() override; /** Derived classes return a clone of the decoder for usage in new streams. */ inline BiffDecoderBase* clone() { return implClone(); } diff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxx index 7d973920844a..af8bf385dcec 100644 --- a/sc/source/filter/inc/colrowst.hxx +++ b/sc/source/filter/inc/colrowst.hxx @@ -27,7 +27,7 @@ class XclImpColRowSettings : protected XclImpRoot { public: explicit XclImpColRowSettings( const XclImpRoot& rRoot ); - virtual ~XclImpColRowSettings(); + virtual ~XclImpColRowSettings() override; void SetDefWidth( sal_uInt16 nDefWidth, bool bStdWidthRec = false ); void SetWidthRange( SCCOL nCol1, SCCOL nCol2, sal_uInt16 nWidth ); diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx index ed86794005bf..290d72b30e92 100644 --- a/sc/source/filter/inc/eeimport.hxx +++ b/sc/source/filter/inc/eeimport.hxx @@ -49,7 +49,7 @@ protected: ScEEParseEntry* ); public: ScEEImport( ScDocument* pDoc, const ScRange& rRange ); - virtual ~ScEEImport(); + virtual ~ScEEImport() override; virtual sal_uLong Read( SvStream& rStream, const OUString& rBaseURL ) override; virtual ScRange GetRange() override { return maRange; } diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx index 776c9f741a9a..0df4f843d661 100644 --- a/sc/source/filter/inc/excdoc.hxx +++ b/sc/source/filter/inc/excdoc.hxx @@ -62,7 +62,7 @@ private: public: ExcTable( const XclExpRoot& rRoot ); ExcTable( const XclExpRoot& rRoot, SCTAB nScTab ); - virtual ~ExcTable(); + virtual ~ExcTable() override; void FillAsHeaderBinary( ExcBoundsheetList& rBoundsheetList ); void FillAsHeaderXml( ExcBoundsheetList& rBoundsheetList ); @@ -95,7 +95,7 @@ private: public: explicit ExcDocument( const XclExpRoot& rRoot ); - virtual ~ExcDocument(); + virtual ~ExcDocument() override; void ReadDoc(); void Write( SvStream& rSvStrm ); diff --git a/sc/source/filter/inc/excelchartconverter.hxx b/sc/source/filter/inc/excelchartconverter.hxx index 59982c09bc90..4103d19fba2d 100644 --- a/sc/source/filter/inc/excelchartconverter.hxx +++ b/sc/source/filter/inc/excelchartconverter.hxx @@ -30,7 +30,7 @@ class ExcelChartConverter : public ::oox::drawingml::chart::ChartConverter, publ { public: explicit ExcelChartConverter( const WorkbookHelper& rHelper ); - virtual ~ExcelChartConverter(); + virtual ~ExcelChartConverter() override; /** Creates an external data provider that is able to use spreadsheet data. */ virtual void createDataProvider( diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index dfbb92a99ae2..fcd3fc514bb2 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -33,7 +33,7 @@ public: explicit ExcelFilter( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw( css::uno::RuntimeException ); - virtual ~ExcelFilter(); + virtual ~ExcelFilter() override; void registerWorkbookGlobals( WorkbookGlobals& rBookGlob ); WorkbookGlobals& getWorkbookGlobals() const; diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index 84493a4242a0..05bed91bbef8 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -46,7 +46,7 @@ protected: public: ExcelToSc( XclImpRoot& rRoot ); - virtual ~ExcelToSc(); + virtual ~ExcelToSc() override; virtual ConvErr Convert( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) override; @@ -119,7 +119,7 @@ private: bool HandleOleLink(sal_uInt16 nXtiIndex, const XclImpExtName& rExtName, ExternalTabInfo& rExtInfo); public: ExcelToSc8( XclImpRoot& rRoot ); - virtual ~ExcelToSc8(); + virtual ~ExcelToSc8() override; virtual ConvErr Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) override; diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index dc01c5ebcf86..be0c7d8b591c 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -36,7 +36,7 @@ class ImportExcel8 : public ImportExcel { public: ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ); - virtual ~ImportExcel8(); + virtual ~ImportExcel8() override; virtual FltError Read() override; diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 727c96c7f6d0..4223adcea0d5 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -196,7 +196,7 @@ class XclExpPassHash : public XclExpRecord { public: XclExpPassHash(const css::uno::Sequence<sal_Int8>& aHash); - virtual ~XclExpPassHash(); + virtual ~XclExpPassHash() override; private: virtual void WriteBody(XclExpStream& rStrm) override; @@ -405,7 +405,7 @@ public: Else, use defined database range; used with XclExpTables. */ explicit ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab, const ScDBData* pDefinedData ); - virtual ~ExcAutoFilterRecs(); + virtual ~ExcAutoFilterRecs() override; void AddObjRecs(); diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx index cce22e2a13c6..28f7e84a970f 100644 --- a/sc/source/filter/inc/exp_op.hxx +++ b/sc/source/filter/inc/exp_op.hxx @@ -58,7 +58,7 @@ protected: public: ExportBiff5( XclExpRootData& rExpData, SvStream& rStrm ); - virtual ~ExportBiff5(); + virtual ~ExportBiff5() override; FltError Write() override; }; @@ -66,7 +66,7 @@ class ExportBiff8 : public ExportBiff5 { public: ExportBiff8( XclExpRootData& rExpData, SvStream& rStrm ); - virtual ~ExportBiff8(); + virtual ~ExportBiff8() override; }; #endif diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx index 85e9566dacfc..4a63dbdf0d45 100644 --- a/sc/source/filter/inc/formel.hxx +++ b/sc/source/filter/inc/formel.hxx @@ -98,7 +98,7 @@ class ExcelConverterBase : public ConverterBase { protected: ExcelConverterBase( svl::SharedStringPool& rSPool ); - virtual ~ExcelConverterBase(); + virtual ~ExcelConverterBase() override; public: void Reset(); @@ -124,7 +124,7 @@ protected: inline void Read( sal_uInt32& nUINT32 ); LotusConverterBase( SvStream& rStr, svl::SharedStringPool& rSPool ); - virtual ~LotusConverterBase(); + virtual ~LotusConverterBase() override; public: void Reset( const ScAddress& rEingPos ); diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 2260a2e5a9a8..6076bbd18300 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -584,7 +584,7 @@ class OpCodeProvider : public FunctionProvider // not derived from WorkbookHelpe public: explicit OpCodeProvider(const css::uno::Reference<css::lang::XMultiServiceFactory>& rxModelFactory, bool bImportFilter); - virtual ~OpCodeProvider(); + virtual ~OpCodeProvider() override; /** Returns the structure containing all token op-codes for operators and special tokens used by the Calc document and its formula parser. */ diff --git a/sc/source/filter/inc/formulaparser.hxx b/sc/source/filter/inc/formulaparser.hxx index 93ade65f49ea..b06aa1ba87d7 100644 --- a/sc/source/filter/inc/formulaparser.hxx +++ b/sc/source/filter/inc/formulaparser.hxx @@ -101,7 +101,7 @@ class FormulaParser : public FormulaProcessorBase { public: explicit FormulaParser( const WorkbookHelper& rHelper ); - virtual ~FormulaParser(); + virtual ~FormulaParser() override; /** Converts an OOXML formula string. */ ApiTokenSequence importFormula( diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx index 1be62ff5b2d5..2c8a0ed62828 100644 --- a/sc/source/filter/inc/htmlexp.hxx +++ b/sc/source/filter/inc/htmlexp.hxx @@ -177,7 +177,7 @@ class ScHTMLExport : public ScExportBase public: ScHTMLExport( SvStream&, const OUString&, ScDocument*, const ScRange&, bool bAll, const OUString& aStreamPath, const OUString& rFilterOptions ); - virtual ~ScHTMLExport(); + virtual ~ScHTMLExport() override; void Write(); const OUString& GetNonConvertibleChars() const { diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx index 562a64b45afd..e67c0b2ccfe3 100644 --- a/sc/source/filter/inc/htmlimp.hxx +++ b/sc/source/filter/inc/htmlimp.hxx @@ -30,7 +30,7 @@ private: public: ScHTMLImport( ScDocument* pDoc, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ); - virtual ~ScHTMLImport(); + virtual ~ScHTMLImport() override; const ScHTMLParser* GetParser() const { return static_cast<ScHTMLParser*>(mpParser); } virtual void WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0, diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 44eb72372a07..61787e2f49b8 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -83,7 +83,7 @@ protected: public: explicit ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ); - virtual ~ScHTMLParser(); + virtual ~ScHTMLParser() override; virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) override = 0; @@ -214,7 +214,7 @@ private: public: ScHTMLLayoutParser( EditEngine*, const OUString& rBaseURL, const Size& aPageSize, ScDocument* ); - virtual ~ScHTMLLayoutParser(); + virtual ~ScHTMLLayoutParser() override; virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) override; virtual const ScHTMLTable* GetGlobalTable() const override; }; @@ -554,7 +554,7 @@ public: ::std::vector< ScEEParseEntry* >& rEEParseList, ScHTMLTableId& rnUnusedId, ScHTMLParser* pParser ); - virtual ~ScHTMLGlobalTable(); + virtual ~ScHTMLGlobalTable() override; /** Recalculates sizes and resulting positions of all document entries. */ void Recalc(); @@ -569,7 +569,7 @@ class ScHTMLQueryParser : public ScHTMLParser { public: explicit ScHTMLQueryParser( EditEngine* pEditEngine, ScDocument* pDoc ); - virtual ~ScHTMLQueryParser(); + virtual ~ScHTMLQueryParser() override; virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) override; diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index e5455330c047..76cde1f0a4bc 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -60,7 +60,7 @@ class XclImpOutlineDataBuffer : protected XclImpRoot { public: explicit XclImpOutlineDataBuffer( const XclImpRoot& rRoot, SCTAB nScTab ); - virtual ~XclImpOutlineDataBuffer(); + virtual ~XclImpOutlineDataBuffer() override; inline XclImpColRowSettings* GetColRowBuff() const { return mxColRowBuff.get(); } inline XclImpOutlineBuffer* GetColOutline() const { return mxColOutlineBuff.get(); } @@ -201,7 +201,7 @@ protected: public: ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ); - virtual ~ImportExcel(); + virtual ~ImportExcel() override; virtual FltError Read() override; }; diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index 4d9fe6f38e5a..54f45a1c5282 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -77,7 +77,7 @@ private: public: ImportLotus(LotusContext& rContext, SvStream&, ScDocument*, rtl_TextEncoding eSrc); - virtual ~ImportLotus(); + virtual ~ImportLotus() override; FltError Read() override; FltError Read( SvStream& ); // special for *.fm3-Dateien diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx index 4520a9f4707b..c5b1d314c108 100644 --- a/sc/source/filter/inc/ooxformulaparser.hxx +++ b/sc/source/filter/inc/ooxformulaparser.hxx @@ -43,7 +43,7 @@ class OOXMLFormulaParser : public OOXMLFormulaParser_BASE { public: explicit OOXMLFormulaParser(); - virtual ~OOXMLFormulaParser(); + virtual ~OOXMLFormulaParser() override; // com.sun.star.lang.XServiceInfo interface ------------------------------- diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx b/sc/source/filter/inc/orcusfiltersimpl.hxx index 042fad27cbc3..47f88f3e3f9a 100644 --- a/sc/source/filter/inc/orcusfiltersimpl.hxx +++ b/sc/source/filter/inc/orcusfiltersimpl.hxx @@ -37,7 +37,7 @@ class ScOrcusXMLContextImpl : public ScOrcusXMLContext public: ScOrcusXMLContextImpl(ScDocument& rDoc, const OUString& rPath); - virtual ~ScOrcusXMLContextImpl(); + virtual ~ScOrcusXMLContextImpl() override; virtual void loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXMLTreeParam& rParam) override; diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index 48fed0944f82..3046b4460c49 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -85,7 +85,7 @@ class ScOrcusConditionalFormat : public orcus::spreadsheet::iface::import_condit { public: ScOrcusConditionalFormat(SCTAB nTab, ScDocument& rDoc); - virtual ~ScOrcusConditionalFormat(); + virtual ~ScOrcusConditionalFormat() override; virtual void set_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) override; @@ -148,7 +148,7 @@ class ScOrcusAutoFilter : public orcus::spreadsheet::iface::import_auto_filter public: ScOrcusAutoFilter(ScDocument& rDoc); - virtual ~ScOrcusAutoFilter(); + virtual ~ScOrcusAutoFilter() override; virtual void set_range(const char* p_ref, size_t n_ref) override; @@ -170,7 +170,7 @@ class ScOrcusSheetProperties : public orcus::spreadsheet::iface::import_sheet_pr SCTAB mnTab; public: ScOrcusSheetProperties(SCTAB nTab, ScDocumentImport& rDoc); - virtual ~ScOrcusSheetProperties(); + virtual ~ScOrcusSheetProperties() override; virtual void set_column_width(orcus::spreadsheet::col_t col, double width, orcus::length_unit_t unit) override; diff --git a/sc/source/filter/inc/pagesettings.hxx b/sc/source/filter/inc/pagesettings.hxx index f9a9ff2e9391..4e92abbe49ae 100644 --- a/sc/source/filter/inc/pagesettings.hxx +++ b/sc/source/filter/inc/pagesettings.hxx @@ -130,7 +130,7 @@ class PageSettingsConverter : public WorkbookHelper { public: explicit PageSettingsConverter( const WorkbookHelper& rHelper ); - virtual ~PageSettingsConverter(); + virtual ~PageSettingsConverter() override; /** Writes all properties to the passed property set of a page style object. */ void writePageSettingsProperties( diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx index 1065aed9c98d..1fe9dd06328d 100644 --- a/sc/source/filter/inc/qproform.hxx +++ b/sc/source/filter/inc/qproform.hxx @@ -60,7 +60,7 @@ private: public: static const size_t nBufSize = 256; QProToSc( SvStream &aStr, svl::SharedStringPool& rSPool, const ScAddress& rRefPos ); - virtual ~QProToSc(){ }; + virtual ~QProToSc() override { }; ConvErr Convert( const ScTokenArray*& pArray ); void DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtString ); void ReadSRD( ScSingleRefData& rR, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 rRel ); diff --git a/sc/source/filter/inc/revisionfragment.hxx b/sc/source/filter/inc/revisionfragment.hxx index 9e13ba861b0a..3ab4cc957d51 100644 --- a/sc/source/filter/inc/revisionfragment.hxx +++ b/sc/source/filter/inc/revisionfragment.hxx @@ -26,7 +26,7 @@ public: explicit RevisionHeadersFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ); - virtual ~RevisionHeadersFragment(); + virtual ~RevisionHeadersFragment() override; protected: virtual oox::core::ContextHandlerRef onCreateContext( @@ -51,7 +51,7 @@ public: explicit RevisionLogFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath, ScChangeTrack& rChangeTrack ); - virtual ~RevisionLogFragment(); + virtual ~RevisionLogFragment() override; protected: virtual oox::core::ContextHandlerRef onCreateContext( diff --git a/sc/source/filter/inc/rtfexp.hxx b/sc/source/filter/inc/rtfexp.hxx index 853f8a6c55dd..b289f2d47fbb 100644 --- a/sc/source/filter/inc/rtfexp.hxx +++ b/sc/source/filter/inc/rtfexp.hxx @@ -33,7 +33,7 @@ class ScRTFExport : public ScExportBase public: ScRTFExport( SvStream&, ScDocument*, const ScRange& ); - virtual ~ScRTFExport(); + virtual ~ScRTFExport() override; void Write(); }; diff --git a/sc/source/filter/inc/rtfimp.hxx b/sc/source/filter/inc/rtfimp.hxx index fd60b23af2e7..4422dbf2dbf5 100644 --- a/sc/source/filter/inc/rtfimp.hxx +++ b/sc/source/filter/inc/rtfimp.hxx @@ -26,7 +26,7 @@ class ScRTFImport : public ScEEImport { public: ScRTFImport( ScDocument* pDoc, const ScRange& rRange ); - virtual ~ScRTFImport(); + virtual ~ScRTFImport() override; }; #endif diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx index 80c49611f30d..d96b57c20259 100644 --- a/sc/source/filter/inc/rtfparse.hxx +++ b/sc/source/filter/inc/rtfparse.hxx @@ -72,7 +72,7 @@ private: public: ScRTFParser( EditEngine* ); - virtual ~ScRTFParser(); + virtual ~ScRTFParser() override; virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) override; }; diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx index 98d251e4bf85..a9aead29288a 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -62,7 +62,7 @@ class SheetDataContext : public WorksheetContextBase, private SheetDataContextBa public: explicit SheetDataContext( WorksheetFragmentBase& rFragment ); - virtual ~SheetDataContext(); + virtual ~SheetDataContext() override; protected: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; diff --git a/sc/source/filter/inc/themebuffer.hxx b/sc/source/filter/inc/themebuffer.hxx index 21f560ad27f6..8ae61d11e87d 100644 --- a/sc/source/filter/inc/themebuffer.hxx +++ b/sc/source/filter/inc/themebuffer.hxx @@ -32,7 +32,7 @@ class ThemeBuffer : public ::oox::drawingml::Theme, public WorkbookHelper { public: explicit ThemeBuffer( const WorkbookHelper& rHelper ); - virtual ~ThemeBuffer(); + virtual ~ThemeBuffer() override; /** Returns the theme color with the specified token identifier. */ sal_Int32 getColorByToken( sal_Int32 nToken ) const; diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index 1aa85010123a..ee04695e4eeb 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -70,7 +70,7 @@ public: XclExpObjectManager& rObjMgr, SvStream& rStrm, const XclEscherEx* pParent = nullptr ); - virtual ~XclEscherEx(); + virtual ~XclEscherEx() override; /** Called by MSODRAWING record constructors to initialize the DFF stream fragment they will own. returns the DFF fragment identifier. */ diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index 3965cbe02536..51f9fcd572d4 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -36,7 +36,7 @@ public: typedef std::vector<XclObj*>::iterator iterator; explicit XclExpObjList( const XclExpRoot& rRoot, XclEscherEx& rEscherEx ); - virtual ~XclExpObjList(); + virtual ~XclExpObjList() override; /// return: 1-based ObjId ///! count>=0xFFFF: Obj will be deleted, return 0 @@ -113,7 +113,7 @@ protected: void SaveTextRecs( XclExpStream& rStrm ); public: - virtual ~XclObj(); + virtual ~XclObj() override; inline sal_uInt16 GetObjType() const { return mnObjType; } @@ -166,7 +166,7 @@ class XclObjComment : public XclObj public: XclObjComment( XclExpObjectManager& rObjMgr, const Rectangle& rRect, const EditTextObject& rEditObj, SdrCaptionObj* pCaption, bool bVisible, const ScAddress& rAddress, Rectangle &rFrom, Rectangle &To ); - virtual ~XclObjComment(); + virtual ~XclObjComment() override; /** c'tor process for formatted text objects above . @descr used to construct the MSODRAWING Escher object properties. */ @@ -189,7 +189,7 @@ private: protected: public: XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& rPos, bool bFilt ); - virtual ~XclObjDropDown(); + virtual ~XclObjDropDown() override; }; // --- class XclTxo -------------------------------------------------- @@ -234,7 +234,7 @@ private: public: XclObjOle( XclExpObjectManager& rObjMgr, const SdrObject& rObj ); - virtual ~XclObjOle(); + virtual ~XclObjOle() override; virtual void Save( XclExpStream& rStrm ) override; }; @@ -250,7 +250,7 @@ public: XclObjAny( XclExpObjectManager& rObjMgr, const css::uno::Reference< css::drawing::XShape >& rShape, ScDocument* pDoc); - virtual ~XclObjAny(); + virtual ~XclObjAny() override; const css::uno::Reference< css::drawing::XShape >& GetShape() const { return mxShape; } @@ -385,7 +385,7 @@ private: protected: public: ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ); - virtual ~ExcEScenario(); + virtual ~ExcEScenario() override; virtual sal_uInt16 GetNum() const override; virtual sal_Size GetLen() const override; @@ -404,7 +404,7 @@ private: protected: public: ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab ); - virtual ~ExcEScenarioManager(); + virtual ~ExcEScenarioManager() override; virtual void Save( XclExpStream& rStrm ) override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; @@ -500,7 +500,7 @@ class XclExpFileEncryption : public XclExpRecord { public: explicit XclExpFileEncryption( const XclExpRoot& rRoot ); - virtual ~XclExpFileEncryption(); + virtual ~XclExpFileEncryption() override; private: virtual void WriteBody( XclExpStream& rStrm ) override; @@ -524,7 +524,7 @@ class XclExpInterfaceEnd : public XclExpRecord { public: explicit XclExpInterfaceEnd(); - virtual ~XclExpInterfaceEnd(); + virtual ~XclExpInterfaceEnd() override; private: virtual void WriteBody( XclExpStream& rStrm ) override; @@ -536,7 +536,7 @@ class XclExpWriteAccess : public XclExpRecord { public: explicit XclExpWriteAccess(); - virtual ~XclExpWriteAccess(); + virtual ~XclExpWriteAccess() override; private: virtual void WriteBody( XclExpStream& rStrm ) override; @@ -562,7 +562,7 @@ class XclExpProt4Rev : public XclExpRecord { public: explicit XclExpProt4Rev(); - virtual ~XclExpProt4Rev(); + virtual ~XclExpProt4Rev() override; private: virtual void WriteBody( XclExpStream& rStrm ) override; @@ -572,7 +572,7 @@ class XclExpProt4RevPass : public XclExpRecord { public: explicit XclExpProt4RevPass(); - virtual ~XclExpProt4RevPass(); + virtual ~XclExpProt4RevPass() override; private: virtual void WriteBody( XclExpStream& rStrm ) override; diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 14223119f284..7fc0d18c1502 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -81,7 +81,7 @@ class XclExpChRoot : public XclExpRoot { public: explicit XclExpChRoot( const XclExpRoot& rRoot, XclExpChChart& rChartData ); - virtual ~XclExpChRoot(); + virtual ~XclExpChRoot() override; /** Returns this root instance - for code readability in derived classes. */ inline const XclExpChRoot& GetChRoot() const { return *this; } @@ -165,7 +165,7 @@ public: explicit XclExpChGroupBase( const XclExpChRoot& rRoot, sal_uInt16 nFrType, sal_uInt16 nRecId, sal_Size nRecSize = 0 ); - virtual ~XclExpChGroupBase(); + virtual ~XclExpChGroupBase() override; /** Saves the header record. Calls WriteSubRecords() to let derived classes write sub records. */ virtual void Save( XclExpStream& rStrm ) override; @@ -1168,7 +1168,7 @@ public: const XclExpRoot& rRoot, const css::uno::Reference< css::frame::XModel >& rxModel, const Size& rChartSize ); - virtual ~XclExpChartDrawing(); + virtual ~XclExpChartDrawing() override; virtual void Save( XclExpStream& rStrm ) override; diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index ff2446344066..d8e9de5fd0c5 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -53,7 +53,7 @@ class XclExpSst : public XclExpRecordBase { public: explicit XclExpSst(); - virtual ~XclExpSst(); + virtual ~XclExpSst() override; /** Inserts a new string into the table. @return The index of the string in the SST, used in other records. */ @@ -101,7 +101,7 @@ public: /** Constructs the HLINK record from an URL text field. */ explicit XclExpHyperlink( const XclExpRoot& rRoot, const SvxURLField& rUrlField, const ScAddress& rScPos ); - virtual ~XclExpHyperlink(); + virtual ~XclExpHyperlink() override; /** Returns the cell representation text or 0, if not available. */ inline const OUString* GetRepr() const { return m_Repr.isEmpty() ? nullptr : &m_Repr; } @@ -170,7 +170,7 @@ class XclExpCF : public XclExpRecord, protected XclExpRoot { public: explicit XclExpCF( const XclExpRoot& rRoot, const ScCondFormatEntry& rFormatEntry, sal_Int32 nPriority ); - virtual ~XclExpCF(); + virtual ~XclExpCF() override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; @@ -187,7 +187,7 @@ class XclExpDateFormat : public XclExpRecord, protected XclExpRoot { public: explicit XclExpDateFormat( const XclExpRoot& rRoot, const ScCondDateFormatEntry& rFormatEntry, sal_Int32 nPriority ); - virtual ~XclExpDateFormat(); + virtual ~XclExpDateFormat() override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; @@ -200,7 +200,7 @@ class XclExpCfvo : public XclExpRecord, protected XclExpRoot { public: explicit XclExpCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& rFormatEntry, const ScAddress& rPos, bool bFirst = true); - virtual ~XclExpCfvo() {} + virtual ~XclExpCfvo() override {} virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: @@ -213,7 +213,7 @@ class XclExpColScaleCol : public XclExpRecord, protected XclExpRoot { public: explicit XclExpColScaleCol( const XclExpRoot& rRoot, const Color& rColor); - virtual ~XclExpColScaleCol(); + virtual ~XclExpColScaleCol() override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: @@ -228,7 +228,7 @@ class XclExpCondfmt : public XclExpRecord, protected XclExpRoot { public: explicit XclExpCondfmt( const XclExpRoot& rRoot, const ScConditionalFormat& rCondFormat, XclExtLstRef xExtLst, sal_Int32& rIndex ); - virtual ~XclExpCondfmt(); + virtual ~XclExpCondfmt() override; /** Returns true, if this conditional format contains at least one cell range and CF record. */ bool IsValid() const; @@ -320,7 +320,7 @@ class XclExpDV : public XclExpRecord, protected XclExpRoot { public: explicit XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ); - virtual ~XclExpDV(); + virtual ~XclExpDV() override; /** Returns the core handle of the validation data. */ inline sal_uLong GetScHandle() const { return mnScHandle; } @@ -358,7 +358,7 @@ class XclExpDval : public XclExpRecord, protected XclExpRoot { public: explicit XclExpDval( const XclExpRoot& rRoot ); - virtual ~XclExpDval(); + virtual ~XclExpDval() override; /** Inserts the cell range into the range list of the DV record with the specified handle. */ void InsertCellRange( const ScRange& rRange, sal_uLong nScHandle ); @@ -397,7 +397,7 @@ public: const OUString& rUrl, const OUString& rSource, sal_Int32 nRefrSecs ); - virtual ~XclExpWebQuery(); + virtual ~XclExpWebQuery() override; /** Writes all needed records for this web query. */ virtual void Save( XclExpStream& rStrm ) override; diff --git a/sc/source/filter/inc/xedbdata.hxx b/sc/source/filter/inc/xedbdata.hxx index 4b31ffeedda8..795867317b8c 100644 --- a/sc/source/filter/inc/xedbdata.hxx +++ b/sc/source/filter/inc/xedbdata.hxx @@ -30,7 +30,7 @@ class XclExpTables : public XclExpRecordBase, protected XclExpRoot { public: XclExpTables( const XclExpRoot& rRoot ); - virtual ~XclExpTables(); + virtual ~XclExpTables() override; void AppendTable( const ScDBData* pData, sal_Int32 nTableId ); @@ -55,7 +55,7 @@ class XclExpTablesManager : protected XclExpRoot { public: explicit XclExpTablesManager( const XclExpRoot& rRoot ); - virtual ~XclExpTablesManager(); + virtual ~XclExpTablesManager() override; void Initialize(); ::std::shared_ptr< XclExpTables > GetTablesBySheet( SCTAB nTab ); diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 886aa0ca0b90..fdb632b38a49 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -164,7 +164,7 @@ class XclExpControlHelper : protected XclExpRoot { public: explicit XclExpControlHelper( const XclExpRoot& rRoot ); - virtual ~XclExpControlHelper(); + virtual ~XclExpControlHelper() override; protected: /** Tries to get spreadsheet cell link and source range link from the passed shape. */ @@ -196,7 +196,7 @@ protected: public: explicit XclMacroHelper( const XclExpRoot& rRoot ); - virtual ~XclMacroHelper(); + virtual ~XclMacroHelper() override; /** Writes an ftMacro subrecord containing a macro link, or nothing, if no macro present. */ void WriteMacroSubRec( XclExpStream& rStrm ); /** Sets the name of a macro for object of passed type @@ -212,7 +212,7 @@ class XclExpShapeObj : public XclObjAny, public XclMacroHelper { public: explicit XclExpShapeObj( XclExpObjectManager& rRoot, css::uno::Reference< css::drawing::XShape > const & xShape, ScDocument* pDoc ); - virtual ~XclExpShapeObj(); + virtual ~XclExpShapeObj() override; private: virtual void WriteSubRecs( XclExpStream& rStrm ) override; }; @@ -293,7 +293,7 @@ public: XclExpObjectManager& rObjMgr, css::uno::Reference< css::drawing::XShape > const & xShape, const Rectangle* pChildAnchor ); - virtual ~XclExpChartObj(); + virtual ~XclExpChartObj() override; /** Writes the OBJ record and the entire chart substream. */ virtual void Save( XclExpStream& rStrm ) override; @@ -382,7 +382,7 @@ class XclExpObjectManager : public XclExpRoot { public: explicit XclExpObjectManager( const XclExpRoot& rRoot ); - virtual ~XclExpObjectManager(); + virtual ~XclExpObjectManager() override; /** Creates a new DFF client anchor object. Caller takes ownership! May be overwritten in derived classes. */ diff --git a/sc/source/filter/inc/xeformula.hxx b/sc/source/filter/inc/xeformula.hxx index 4c3839fb3371..32d3694a5b58 100644 --- a/sc/source/filter/inc/xeformula.hxx +++ b/sc/source/filter/inc/xeformula.hxx @@ -51,7 +51,7 @@ class XclExpFormulaCompiler : protected XclExpRoot { public: explicit XclExpFormulaCompiler( const XclExpRoot& rRoot ); - virtual ~XclExpFormulaCompiler(); + virtual ~XclExpFormulaCompiler() override; /** Creates and returns the token array of a formula. */ XclTokenArrayRef CreateFormula( diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index 6b17b323747b..81f89463c40e 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -41,7 +41,7 @@ class XclExpProgressBar : protected XclExpRoot { public: explicit XclExpProgressBar( const XclExpRoot& rRoot ); - virtual ~XclExpProgressBar(); + virtual ~XclExpProgressBar() override; /** Initializes all segments and sub progress bars. */ void Initialize(); @@ -177,7 +177,7 @@ public: typedef std::shared_ptr< XclExpHyperlink > XclExpHyperlinkRef; explicit XclExpHyperlinkHelper( const XclExpRoot& rRoot, const ScAddress& rScPos ); - virtual ~XclExpHyperlinkHelper(); + virtual ~XclExpHyperlinkHelper() override; /** Processes the passed URL field (tries to create a HLINK record). @return The representation string of the URL field. */ diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index 1e0cb52fe666..86eceb13824a 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -135,7 +135,7 @@ class XclExpLinkManager : public XclExpRecordBase, protected XclExpRoot { public: explicit XclExpLinkManager( const XclExpRoot& rRoot ); - virtual ~XclExpLinkManager(); + virtual ~XclExpLinkManager() override; /** Searches for an EXTERNSHEET index for the given Calc sheet. @descr See above for the meaning of EXTERNSHEET indexes. diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx index 71e845b52e6b..e1a3ba923829 100644 --- a/sc/source/filter/inc/xename.hxx +++ b/sc/source/filter/inc/xename.hxx @@ -34,7 +34,7 @@ class XclExpNameManager : public XclExpRecordBase, protected XclExpRoot { public: explicit XclExpNameManager( const XclExpRoot& rRoot ); - virtual ~XclExpNameManager(); + virtual ~XclExpNameManager() override; /** Creates NAME records for built-in and user defined names. */ void Initialize(); diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 4b2f71329cdd..dd94d57ccd95 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -73,7 +73,7 @@ public: sal_uInt16 nFieldIdx, const ScDPObject& rDPObj, const ScDPSaveGroupDimension& rGroupDim, const XclExpPCField& rBaseField ); - virtual ~XclExpPCField(); + virtual ~XclExpPCField() override; /** Sets the passed field as direct grouping child field of this field. */ void SetGroupChildField( const XclExpPCField& rChildField ); diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index 41f37dd44968..8cf66e174dd7 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -47,7 +47,7 @@ class XclExpDelegatingRecord : public XclExpRecordBase { public: XclExpDelegatingRecord( XclExpRecordBase* pRecord ); - virtual ~XclExpDelegatingRecord(); + virtual ~XclExpDelegatingRecord() override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; private: @@ -58,7 +58,7 @@ class XclExpXmlElementRecord : public XclExpRecordBase { public: explicit XclExpXmlElementRecord(sal_Int32 nElement); - virtual ~XclExpXmlElementRecord(); + virtual ~XclExpXmlElementRecord() override; protected: sal_Int32 mnElement; @@ -68,7 +68,7 @@ class XclExpXmlStartElementRecord : public XclExpXmlElementRecord { public: explicit XclExpXmlStartElementRecord(sal_Int32 nElement); - virtual ~XclExpXmlStartElementRecord(); + virtual ~XclExpXmlStartElementRecord() override; /** Starts the element nElement */ virtual void SaveXml( XclExpXmlStream& rStrm ) override; @@ -78,7 +78,7 @@ class XclExpXmlEndElementRecord : public XclExpXmlElementRecord { public: explicit XclExpXmlEndElementRecord(sal_Int32 nElement); - virtual ~XclExpXmlEndElementRecord(); + virtual ~XclExpXmlEndElementRecord() override; /** Ends the element nElement */ virtual void SaveXml( XclExpXmlStream& rStrm ) override; @@ -88,7 +88,7 @@ class XclExpXmlStartSingleElementRecord : public XclExpXmlElementRecord { public: explicit XclExpXmlStartSingleElementRecord(sal_Int32 nElement); - virtual ~XclExpXmlStartSingleElementRecord(); + virtual ~XclExpXmlStartSingleElementRecord() override; /** Starts the single element nElement */ virtual void SaveXml( XclExpXmlStream& rStrm ) override; @@ -98,7 +98,7 @@ class XclExpXmlEndSingleElementRecord : public XclExpRecordBase { public: XclExpXmlEndSingleElementRecord(); - virtual ~XclExpXmlEndSingleElementRecord(); + virtual ~XclExpXmlEndSingleElementRecord() override; /** Ends the single element nElement */ virtual void SaveXml( XclExpXmlStream& rStrm ) override; @@ -122,7 +122,7 @@ public: sal_uInt16 nRecId = EXC_ID_UNKNOWN, sal_Size nRecSize = 0 ); - virtual ~XclExpRecord(); + virtual ~XclExpRecord() override; /** Returns the current record ID. */ inline sal_uInt16 GetRecId() const { return mnRecId; } diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index 941e01ca61e5..5a7ac4ef751e 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -105,7 +105,7 @@ struct XclExpRootData : public XclRootData explicit XclExpRootData( XclBiff eBiff, SfxMedium& rMedium, tools::SvRef<SotStorage> xRootStrg, ScDocument& rDoc, rtl_TextEncoding eTextEnc ); - virtual ~XclExpRootData(); + virtual ~XclExpRootData() override; }; /** Access to global data from other classes. */ diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index fa845f34496e..25193d8cab2f 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -292,7 +292,7 @@ class XclExpXmlStream : public oox::core::XmlFilterBase { public: XclExpXmlStream( const css::uno::Reference< css::uno::XComponentContext >& rCC, bool bExportVBA ); - virtual ~XclExpXmlStream(); + virtual ~XclExpXmlStream() override; /** Returns the filter root data. */ inline const XclExpRoot& GetRoot() const { return *mpRoot; } diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index 5d31b6a34ed8..9335dc543f27 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -78,7 +78,7 @@ class XclExpPalette : public XclDefaultPalette, public XclExpRecord { public: explicit XclExpPalette( const XclExpRoot& rRoot ); - virtual ~XclExpPalette(); + virtual ~XclExpPalette() override; /** Inserts the color into the list and updates weighting. @param nAutoDefault The Excel palette index for automatic color. @@ -285,7 +285,7 @@ class XclExpNumFmtBuffer : public XclExpRecordBase, protected XclExpRoot { public: explicit XclExpNumFmtBuffer( const XclExpRoot& rRoot ); - virtual ~XclExpNumFmtBuffer(); + virtual ~XclExpNumFmtBuffer() override; /** Returns the core index of the current standard number format. */ inline sal_uInt32 GetStandardFormat() const { return mnStdFmt; } @@ -711,7 +711,7 @@ class XclExpDxf : public XclExpRecordBase, protected XclExpRoot public: XclExpDxf( const XclExpRoot& rRoot, XclExpCellAlign* pAlign, XclExpCellBorder* pBorder, XclExpDxfFont* pFont, XclExpNumFmt* pNumberFmt, XclExpCellProt* pProt, XclExpColor* pColor); - virtual ~XclExpDxf(); + virtual ~XclExpDxf() override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; @@ -728,7 +728,7 @@ class XclExpDxfs : public XclExpRecordBase, protected XclExpRoot { public: XclExpDxfs( const XclExpRoot& rRoot ); - virtual ~XclExpDxfs() {} + virtual ~XclExpDxfs() override {} sal_Int32 GetDxfId(const OUString& rName); diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 9c95cabde818..6d26ed2bdb46 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -84,7 +84,7 @@ class XclImpChRoot : public XclImpRoot { public: explicit XclImpChRoot( const XclImpRoot& rRoot, XclImpChChart& rChartData ); - virtual ~XclImpChRoot(); + virtual ~XclImpChRoot() override; /** Returns this root instance - for code readability in derived classes. */ inline const XclImpChRoot& GetChRoot() const { return *this; } @@ -377,7 +377,7 @@ class XclImpChSourceLink : protected XclImpChRoot { public: explicit XclImpChSourceLink( const XclImpChRoot& rRoot ); - virtual ~XclImpChSourceLink(); + virtual ~XclImpChSourceLink() override; /** Reads the CHSOURCELINK record (link to source data). */ void ReadChSourceLink( XclImpStream& rStrm ); @@ -1280,7 +1280,7 @@ class XclImpChChart : public XclImpChGroupBase, protected XclImpChRoot { public: explicit XclImpChChart( const XclImpRoot& rRoot ); - virtual ~XclImpChChart(); + virtual ~XclImpChChart() override; /** Reads the CHCHART record (called by base class). */ virtual void ReadHeaderRecord( XclImpStream& rStrm ) override; @@ -1382,7 +1382,7 @@ public: /** Constructs a new chart object. @param bOwnTab True = chart is on an own sheet; false = chart is an embedded object. */ explicit XclImpChart( const XclImpRoot& rRoot, bool bOwnTab ); - virtual ~XclImpChart(); + virtual ~XclImpChart() override; /** Reads the complete chart substream (BOF/EOF block). @descr The passed stream must be located in the BOF record of the chart substream. */ diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx index 47fabf38a19d..b15b53f02f8e 100644 --- a/sc/source/filter/inc/xicontent.hxx +++ b/sc/source/filter/inc/xicontent.hxx @@ -125,7 +125,7 @@ class XclImpCondFormat : protected XclImpRoot { public: explicit XclImpCondFormat( const XclImpRoot& rRoot, sal_uInt32 nFormatIndex ); - virtual ~XclImpCondFormat(); + virtual ~XclImpCondFormat() override; /** Reads a CONDFMT record and initializes this conditional format. */ void ReadCondfmt( XclImpStream& rStrm ); diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 7c33328b70cf..f69770332cfe 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -61,7 +61,7 @@ class XclImpDrawObjBase : protected XclImpRoot { public: explicit XclImpDrawObjBase( const XclImpRoot& rRoot ); - virtual ~XclImpDrawObjBase(); + virtual ~XclImpDrawObjBase() override; /** Reads the BIFF3 OBJ record, returns a new drawing object. */ static XclImpDrawObjRef ReadObj3( const XclImpRoot& rRoot, XclImpStream& rStrm ); @@ -918,7 +918,7 @@ class XclImpSimpleDffConverter : public SvxMSDffManager, protected XclImpRoot { public: explicit XclImpSimpleDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ); - virtual ~XclImpSimpleDffConverter(); + virtual ~XclImpSimpleDffConverter() override; protected: /** Returns a color from the Excel color palette. */ @@ -936,7 +936,7 @@ class XclImpDffConverter : public XclImpSimpleDffConverter, private oox::ole::MS { public: explicit XclImpDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ); - virtual ~XclImpDffConverter(); + virtual ~XclImpDffConverter() override; /** Initializes the internal progress bar with the passed size and starts it. */ void StartProgressBar( sal_Size nProgressSize ); @@ -1057,7 +1057,7 @@ class XclImpDrawing : protected XclImpRoot { public: explicit XclImpDrawing( const XclImpRoot& rRoot, bool bOleObjects ); - virtual ~XclImpDrawing(); + virtual ~XclImpDrawing() override; /** Reads and returns a bitmap from the IMGDATA record. */ static Graphic ReadImgData( const XclImpRoot& rRoot, XclImpStream& rStrm ); @@ -1159,7 +1159,7 @@ class XclImpObjectManager : protected XclImpRoot { public: explicit XclImpObjectManager( const XclImpRoot& rRoot ); - virtual ~XclImpObjectManager(); + virtual ~XclImpObjectManager() override; /** Reads the MSODRAWINGGROUP record. */ void ReadMsoDrawingGroup( XclImpStream& rStrm ); diff --git a/sc/source/filter/inc/xiformula.hxx b/sc/source/filter/inc/xiformula.hxx index 56729e88336a..96968b34e061 100644 --- a/sc/source/filter/inc/xiformula.hxx +++ b/sc/source/filter/inc/xiformula.hxx @@ -34,7 +34,7 @@ class XclImpFormulaCompiler : protected XclImpRoot { public: explicit XclImpFormulaCompiler( const XclImpRoot& rRoot ); - virtual ~XclImpFormulaCompiler(); + virtual ~XclImpFormulaCompiler() override; /** Creates a range list from the passed Excel token array. @param rStrm Stream pointing to additional formula data (e.g. constant array data). */ diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index 09a5a0ef3920..0cd1583613a3 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -171,7 +171,7 @@ public: const XclImpHFConverter& operator=(const XclImpHFConverter&) = delete; explicit XclImpHFConverter( const XclImpRoot& rRoot ); - virtual ~XclImpHFConverter(); + virtual ~XclImpHFConverter() override; /** Parses the passed string and creates three new edit engine text objects. */ void ParseString( const OUString& rHFString ); diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx index 6fc85b2cf609..7a76007b4c56 100644 --- a/sc/source/filter/inc/xilink.hxx +++ b/sc/source/filter/inc/xilink.hxx @@ -183,7 +183,7 @@ class XclImpLinkManager : protected XclImpRoot { public: explicit XclImpLinkManager( const XclImpRoot& rRoot ); - virtual ~XclImpLinkManager(); + virtual ~XclImpLinkManager() override; /** Reads the EXTERNSHEET record. */ void ReadExternsheet( XclImpStream& rStrm ); diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index bf6b23ea8930..bfdb553b2f25 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -68,7 +68,7 @@ public: /** Creates a pivot cache field by reading an SXFIELD record. */ explicit XclImpPCField( const XclImpRoot& rRoot, XclImpPivotCache& rPCache, sal_uInt16 nFieldIdx ); - virtual ~XclImpPCField(); + virtual ~XclImpPCField() override; // general field/item access ---------------------------------------------- @@ -144,7 +144,7 @@ class XclImpPivotCache : protected XclImpRoot { public: explicit XclImpPivotCache( const XclImpRoot& rRoot ); - virtual ~XclImpPivotCache(); + virtual ~XclImpPivotCache() override; // data access ------------------------------------------------------------ @@ -297,7 +297,7 @@ class XclImpPivotTable : protected XclImpRoot { public: explicit XclImpPivotTable( const XclImpRoot& rRoot ); - virtual ~XclImpPivotTable(); + virtual ~XclImpPivotTable() override; // cache/field access, misc. ---------------------------------------------- @@ -372,7 +372,7 @@ class XclImpPivotTableManager : protected XclImpRoot { public: explicit XclImpPivotTableManager( const XclImpRoot& rRoot ); - virtual ~XclImpPivotTableManager(); + virtual ~XclImpPivotTableManager() override; // pivot cache records ---------------------------------------------------- diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx index ca469a43f640..0af43864bbda 100644 --- a/sc/source/filter/inc/xiroot.hxx +++ b/sc/source/filter/inc/xiroot.hxx @@ -119,7 +119,7 @@ struct XclImpRootData : public XclRootData explicit XclImpRootData( XclBiff eBiff, SfxMedium& rMedium, tools::SvRef<SotStorage> xRootStrg, ScDocument& rDoc, rtl_TextEncoding eTextEnc ); - virtual ~XclImpRootData(); + virtual ~XclImpRootData() override; }; /** Access to global data from other classes. */ diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 179dbbdcd3d0..c0bc09bf36b4 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -44,7 +44,7 @@ class XclImpDecrypter : public ::comphelper::IDocPasswordVerifier { public: explicit XclImpDecrypter(); - virtual ~XclImpDecrypter(); + virtual ~XclImpDecrypter() override; /** Returns the current error code of the decrypter. */ inline ErrCode GetError() const { return mnError; } diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx index ba87178a9e64..f537b4916d60 100644 --- a/sc/source/filter/inc/xistyle.hxx +++ b/sc/source/filter/inc/xistyle.hxx @@ -388,7 +388,7 @@ public: const XclImpXF& operator=(const XclImpXF&) = delete; explicit XclImpXF( const XclImpRoot& rRoot ); - virtual ~XclImpXF(); + virtual ~XclImpXF() override; /** Reads an XF record. */ void ReadXF( XclImpStream& rStrm ); @@ -619,7 +619,7 @@ public: const XclImpXFRangeBuffer& operator=(const XclImpXFRangeBuffer&) = delete; explicit XclImpXFRangeBuffer( const XclImpRoot& rRoot ); - virtual ~XclImpXFRangeBuffer(); + virtual ~XclImpXFRangeBuffer() override; /** Clears all buffered data, used to set up for a new sheet. */ void Initialize(); |