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 /include/xmloff | |
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 'include/xmloff')
50 files changed, 52 insertions, 52 deletions
diff --git a/include/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx index dee5601957ae..01443e57094b 100644 --- a/include/xmloff/DocumentSettingsContext.hxx +++ b/include/xmloff/DocumentSettingsContext.hxx @@ -36,7 +36,7 @@ class XMLOFF_DLLPUBLIC XMLDocumentSettingsContext : public SvXMLImportContext public: XMLDocumentSettingsContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList); - virtual ~XMLDocumentSettingsContext(); + virtual ~XMLDocumentSettingsContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/include/xmloff/EnumPropertyHdl.hxx b/include/xmloff/EnumPropertyHdl.hxx index 521b8fa0a87e..71519b82ed81 100644 --- a/include/xmloff/EnumPropertyHdl.hxx +++ b/include/xmloff/EnumPropertyHdl.hxx @@ -35,7 +35,7 @@ private: public: XMLEnumPropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const css::uno::Type & rType ) : mpEnumMap( pEnumMap ), mrType( rType ) {} - virtual ~XMLEnumPropertyHdl(); + virtual ~XMLEnumPropertyHdl() override; virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; diff --git a/include/xmloff/NamedBoolPropertyHdl.hxx b/include/xmloff/NamedBoolPropertyHdl.hxx index 7adbc3f03137..05f7489f4d7a 100644 --- a/include/xmloff/NamedBoolPropertyHdl.hxx +++ b/include/xmloff/NamedBoolPropertyHdl.hxx @@ -44,7 +44,7 @@ public: maFalseStr( ::xmloff::token::GetXMLToken( eFalse ) ) {} - virtual ~XMLNamedBoolPropertyHdl(); + virtual ~XMLNamedBoolPropertyHdl() override; virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; diff --git a/include/xmloff/SchXMLExportHelper.hxx b/include/xmloff/SchXMLExportHelper.hxx index dae6f7f64d74..ac74e09f8f9f 100644 --- a/include/xmloff/SchXMLExportHelper.hxx +++ b/include/xmloff/SchXMLExportHelper.hxx @@ -48,7 +48,7 @@ public: SchXMLExportHelper( SvXMLExport& rExport, SvXMLAutoStylePoolP& rASPool ); - virtual ~SchXMLExportHelper(); + virtual ~SchXMLExportHelper() override; /// returns the string corresponding to the current FileFormat CLSID for Chart const OUString& getChartCLSID(); diff --git a/include/xmloff/WordWrapPropertyHdl.hxx b/include/xmloff/WordWrapPropertyHdl.hxx index f9330a1ed66e..b87faa1af5e4 100644 --- a/include/xmloff/WordWrapPropertyHdl.hxx +++ b/include/xmloff/WordWrapPropertyHdl.hxx @@ -35,7 +35,7 @@ private: public: XMLWordWrapPropertyHdl( SvXMLImport* pImport ); - virtual ~XMLWordWrapPropertyHdl(); + virtual ~XMLWordWrapPropertyHdl() override; virtual bool importXML( const OUString& rStrImpValue, css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override; diff --git a/include/xmloff/XMLBase64ImportContext.hxx b/include/xmloff/XMLBase64ImportContext.hxx index 5a6145da6f77..1c347b3fbf82 100644 --- a/include/xmloff/XMLBase64ImportContext.hxx +++ b/include/xmloff/XMLBase64ImportContext.hxx @@ -40,7 +40,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, const css::uno::Reference< css::io::XOutputStream >& rOut ); - virtual ~XMLBase64ImportContext(); + virtual ~XMLBase64ImportContext() override; virtual void EndElement() override; diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx index 86dd4ebfdc51..dd49c77c6fda 100644 --- a/include/xmloff/XMLCharContext.hxx +++ b/include/xmloff/XMLCharContext.hxx @@ -48,7 +48,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, sal_Int16 nControl ); - virtual ~XMLCharContext(); + virtual ~XMLCharContext() override; // EndElement is called before a context will be destructed, but // after a elements context has been parsed. It may be used for actions diff --git a/include/xmloff/XMLConstantsPropertyHandler.hxx b/include/xmloff/XMLConstantsPropertyHandler.hxx index d3aec1c7e230..b31f7d6f37be 100644 --- a/include/xmloff/XMLConstantsPropertyHandler.hxx +++ b/include/xmloff/XMLConstantsPropertyHandler.hxx @@ -42,7 +42,7 @@ public: enum ::xmloff::token::XMLTokenEnum eDflt); // Just needed for virtual destruction - virtual ~XMLConstantsPropertyHandler(); + virtual ~XMLConstantsPropertyHandler() override; /// Imports the given value in cas of the given XML-data-type virtual bool importXML( diff --git a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx index ad0a9a662063..5a90419adf29 100644 --- a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx +++ b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx @@ -35,7 +35,7 @@ class XMLEmbeddedObjectExportFilter : public ::cppu::WeakImplHelper3< public: XMLEmbeddedObjectExportFilter( const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler ) throw(); - virtual ~XMLEmbeddedObjectExportFilter () throw(); + virtual ~XMLEmbeddedObjectExportFilter () throw() override; // css::xml::sax::XDocumentHandler virtual void SAL_CALL startDocument() diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx index 020996553bed..e2a3ec51acf4 100644 --- a/include/xmloff/XMLEventsImportContext.hxx +++ b/include/xmloff/XMLEventsImportContext.hxx @@ -80,7 +80,7 @@ public: const OUString& rLocalName, const css::uno::Reference<css::container::XNameReplace> & xNameRepl); - virtual ~XMLEventsImportContext(); + virtual ~XMLEventsImportContext() override; void AddEventValues( const OUString& rEventName, diff --git a/include/xmloff/XMLFontAutoStylePool.hxx b/include/xmloff/XMLFontAutoStylePool.hxx index c5de32ebc1db..f508a8923db7 100644 --- a/include/xmloff/XMLFontAutoStylePool.hxx +++ b/include/xmloff/XMLFontAutoStylePool.hxx @@ -47,7 +47,7 @@ protected: public: XMLFontAutoStylePool( SvXMLExport& rExport, bool tryToEmbedFonts = false ); - virtual ~XMLFontAutoStylePool(); + virtual ~XMLFontAutoStylePool() override; OUString Add( const OUString& rFamilyName, diff --git a/include/xmloff/XMLGraphicsDefaultStyle.hxx b/include/xmloff/XMLGraphicsDefaultStyle.hxx index dce6f4b30afb..b53806c69e96 100644 --- a/include/xmloff/XMLGraphicsDefaultStyle.hxx +++ b/include/xmloff/XMLGraphicsDefaultStyle.hxx @@ -38,7 +38,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, SvXMLStylesContext& rStyles); - virtual ~XMLGraphicsDefaultStyle(); + virtual ~XMLGraphicsDefaultStyle() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx index 27aa216092f9..0bfee31c8b59 100644 --- a/include/xmloff/XMLPageExport.hxx +++ b/include/xmloff/XMLPageExport.hxx @@ -85,7 +85,7 @@ protected: public: XMLPageExport( SvXMLExport& rExp ); - virtual ~XMLPageExport(); + virtual ~XMLPageExport() override; void collectAutoStyles( bool bUsed ) { exportStyles( bUsed, true ); } void exportAutoStyles(); diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx index 8c93fe90582f..1c5aa010acf5 100644 --- a/include/xmloff/XMLShapeStyleContext.hxx +++ b/include/xmloff/XMLShapeStyleContext.hxx @@ -50,7 +50,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily = XML_STYLE_FAMILY_SD_GRAPHICS_ID); - virtual ~XMLShapeStyleContext(); + virtual ~XMLShapeStyleContext() override; SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx index 25adf08521f1..f439f9262e51 100644 --- a/include/xmloff/XMLTextMasterPageContext.hxx +++ b/include/xmloff/XMLTextMasterPageContext.hxx @@ -57,7 +57,7 @@ public: const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, bool bOverwrite ); - virtual ~XMLTextMasterPageContext(); + virtual ~XMLTextMasterPageContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, diff --git a/include/xmloff/XMLTextMasterPageExport.hxx b/include/xmloff/XMLTextMasterPageExport.hxx index 77b06468b568..150a74020c48 100644 --- a/include/xmloff/XMLTextMasterPageExport.hxx +++ b/include/xmloff/XMLTextMasterPageExport.hxx @@ -58,7 +58,7 @@ protected: public: XMLTextMasterPageExport( SvXMLExport& rExp ); - virtual ~XMLTextMasterPageExport(); + virtual ~XMLTextMasterPageExport() override; }; #endif // INCLUDED_XMLOFF_XMLTEXTMASTERPAGEEXPORT_HXX diff --git a/include/xmloff/XMLTextMasterStylesContext.hxx b/include/xmloff/XMLTextMasterStylesContext.hxx index 0e7b2fcaf9c0..035812e653b9 100644 --- a/include/xmloff/XMLTextMasterStylesContext.hxx +++ b/include/xmloff/XMLTextMasterStylesContext.hxx @@ -44,7 +44,7 @@ public: const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList); - virtual ~XMLTextMasterStylesContext(); + virtual ~XMLTextMasterStylesContext() override; }; #endif // _XMLOFF_XMLTEXTMASTERSTYLECONTEXT_HXX diff --git a/include/xmloff/XMLTextShapeImportHelper.hxx b/include/xmloff/XMLTextShapeImportHelper.hxx index 7480da16b1c8..7a1a0a03f6fe 100644 --- a/include/xmloff/XMLTextShapeImportHelper.hxx +++ b/include/xmloff/XMLTextShapeImportHelper.hxx @@ -35,7 +35,7 @@ class XMLOFF_DLLPUBLIC XMLTextShapeImportHelper : public XMLShapeImportHelper public: XMLTextShapeImportHelper( SvXMLImport& rImp ); - virtual ~XMLTextShapeImportHelper(); + virtual ~XMLTextShapeImportHelper() override; virtual void addShape( css::uno::Reference< css::drawing::XShape >& rShape, diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx index b07f8fd40fb4..9c773e91f0d8 100644 --- a/include/xmloff/XMLTextShapeStyleContext.hxx +++ b/include/xmloff/XMLTextShapeStyleContext.hxx @@ -44,7 +44,7 @@ public: const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily ); - virtual ~XMLTextShapeStyleContext(); + virtual ~XMLTextShapeStyleContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, diff --git a/include/xmloff/XMLTextTableContext.hxx b/include/xmloff/XMLTextTableContext.hxx index ef80f25e4bd2..6077ccd5ae18 100644 --- a/include/xmloff/XMLTextTableContext.hxx +++ b/include/xmloff/XMLTextTableContext.hxx @@ -37,7 +37,7 @@ public: XMLTextTableContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName ); - virtual ~XMLTextTableContext(); + virtual ~XMLTextTableContext() override; }; #endif diff --git a/include/xmloff/animationexport.hxx b/include/xmloff/animationexport.hxx index 1bb03536d0ec..10bbd50fae31 100644 --- a/include/xmloff/animationexport.hxx +++ b/include/xmloff/animationexport.hxx @@ -41,7 +41,7 @@ class XMLOFF_DLLPUBLIC AnimationsExporter : public salhelper::SimpleReferenceObj public: AnimationsExporter( SvXMLExport& rExport, const css::uno::Reference< css::beans::XPropertySet >& xPageProps ); - virtual ~AnimationsExporter(); + virtual ~AnimationsExporter() override; void prepare( const css::uno::Reference< css::animations::XAnimationNode >& xRootNode ); void exportAnimations( const css::uno::Reference< css::animations::XAnimationNode >& xRootNode ); diff --git a/include/xmloff/animexp.hxx b/include/xmloff/animexp.hxx index cce1623f342e..66a8ec7e297b 100644 --- a/include/xmloff/animexp.hxx +++ b/include/xmloff/animexp.hxx @@ -34,7 +34,7 @@ class XMLAnimationsExporter : public salhelper::SimpleReferenceObject public: XMLAnimationsExporter( XMLShapeExport* pShapeExp ); - virtual ~XMLAnimationsExporter(); + virtual ~XMLAnimationsExporter() override; void prepare( const css::uno::Reference< css::drawing::XShape >& xShape, SvXMLExport& rExport ); void collect( const css::uno::Reference< css::drawing::XShape >& xShape, SvXMLExport& rExport ); diff --git a/include/xmloff/attrlist.hxx b/include/xmloff/attrlist.hxx index db8f3ff1f2f3..7e53ece5eed5 100644 --- a/include/xmloff/attrlist.hxx +++ b/include/xmloff/attrlist.hxx @@ -48,7 +48,7 @@ public: SvXMLAttributeList( const SvXMLAttributeList& ); SvXMLAttributeList( const css::uno::Reference< css::xml::sax::XAttributeList> & rAttrList ); - virtual ~SvXMLAttributeList(); + virtual ~SvXMLAttributeList() override; static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); static SvXMLAttributeList* getImplementation( const css::uno::Reference< css::uno::XInterface >& ) throw(); diff --git a/include/xmloff/fasttokenhandler.hxx b/include/xmloff/fasttokenhandler.hxx index c71cbf1f7ec8..ec6ac79073b3 100644 --- a/include/xmloff/fasttokenhandler.hxx +++ b/include/xmloff/fasttokenhandler.hxx @@ -65,7 +65,7 @@ class XMLOFF_DLLPUBLIC FastTokenHandler : public cppu::WeakImplHelper1< { public: explicit FastTokenHandler(); - virtual ~FastTokenHandler(); + virtual ~FastTokenHandler() override; // XFastTokenHandler virtual css::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx index 2fe31dd58fc1..cf031219f9e3 100644 --- a/include/xmloff/formlayerexport.hxx +++ b/include/xmloff/formlayerexport.hxx @@ -57,7 +57,7 @@ namespace xmloff std::unique_ptr<OFormLayerXMLExport_Impl> m_pImpl; protected: - virtual ~OFormLayerXMLExport(); + virtual ~OFormLayerXMLExport() override; public: OFormLayerXMLExport(SvXMLExport& _rContext); diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx index 26bdb2e3838c..cbb9dbfe477b 100644 --- a/include/xmloff/formlayerimport.hxx +++ b/include/xmloff/formlayerimport.hxx @@ -52,7 +52,7 @@ namespace xmloff public: OFormLayerXMLImport(SvXMLImport& _rImporter); - virtual ~OFormLayerXMLImport(); + virtual ~OFormLayerXMLImport() override; /** start importing the forms of the given page diff --git a/include/xmloff/prhdlfac.hxx b/include/xmloff/prhdlfac.hxx index 84827d64a215..0b517208aeee 100644 --- a/include/xmloff/prhdlfac.hxx +++ b/include/xmloff/prhdlfac.hxx @@ -47,7 +47,7 @@ class XMLOFF_DLLPUBLIC XMLPropertyHandlerFactory : public salhelper::SimpleRefer public: XMLPropertyHandlerFactory(); - virtual ~XMLPropertyHandlerFactory(); + virtual ~XMLPropertyHandlerFactory() override; /** This method retrieves a PropertyHandler for the given XML-type. diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx index 9e334ac9d526..c60c0f35d6de 100644 --- a/include/xmloff/prstylei.hxx +++ b/include/xmloff/prstylei.hxx @@ -96,7 +96,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily = 0, bool bDefaultStyle=false ); - virtual ~XMLPropStyleContext(); + virtual ~XMLPropStyleContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx index 000f9a731aa9..8b25a5b5e5fd 100644 --- a/include/xmloff/shapeexport.hxx +++ b/include/xmloff/shapeexport.hxx @@ -244,7 +244,7 @@ private: SAL_DLLPRIVATE void ImpExportTableShape(const css::uno::Reference< css::drawing::XShape >& xShape, XmlShapeType eShapeType, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr ); public: XMLShapeExport(SvXMLExport& rExp, SvXMLExportPropertyMapper *pExtMapper=nullptr ); - virtual ~XMLShapeExport(); + virtual ~XMLShapeExport() override; // This method collects all automatic styles for the given XShape void collectShapeAutoStyles( diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index 4402d585d825..bad298cc5037 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -190,7 +190,7 @@ public: sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); - virtual ~SdXML3DLightContext(); + virtual ~SdXML3DLightContext() override; sal_Int32 GetDiffuseColor() { return maDiffuseColor; } const ::basegfx::B3DVector& GetDirection() { return maDirection; } @@ -302,7 +302,7 @@ public: const css::uno::Reference< css::frame::XModel>& rModel, SvXMLImportPropertyMapper *pExtMapper=nullptr ); - virtual ~XMLShapeImportHelper(); + virtual ~XMLShapeImportHelper() override; SvXMLShapeContext* CreateGroupChildContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx index 0e89d4880ea5..f311175e7f20 100644 --- a/include/xmloff/styleexp.hxx +++ b/include/xmloff/styleexp.hxx @@ -87,7 +87,7 @@ public: SvXMLExport& rExp, const OUString& rPoolStyleName, SvXMLAutoStylePoolP *pAutoStyleP=nullptr ); - virtual ~XMLStyleExport(); + virtual ~XMLStyleExport() override; // void exportStyleFamily( // const OUString& rFamily, const OUString& rXMLFamily, diff --git a/include/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx index c91c734819ee..a98546421c00 100644 --- a/include/xmloff/table/XMLTableExport.hxx +++ b/include/xmloff/table/XMLTableExport.hxx @@ -59,7 +59,7 @@ class XMLOFF_DLLPUBLIC XMLTableExport : public salhelper::SimpleReferenceObject { public: XMLTableExport(SvXMLExport& rExp, const rtl::Reference< SvXMLExportPropertyMapper >& xCellExportPropertySetMapper, const rtl::Reference< XMLPropertyHandlerFactory >& xFactoryRef ); - virtual ~XMLTableExport(); + virtual ~XMLTableExport() override; // This method collects all automatic styles for the given table void collectTableAutoStyles(const css::uno::Reference < css::table::XColumnRowRange >& xColumnRowRange); diff --git a/include/xmloff/table/XMLTableImport.hxx b/include/xmloff/table/XMLTableImport.hxx index df5f5eddd619..c35c662b3086 100644 --- a/include/xmloff/table/XMLTableImport.hxx +++ b/include/xmloff/table/XMLTableImport.hxx @@ -44,7 +44,7 @@ class XMLOFF_DLLPUBLIC XMLTableImport : public salhelper::SimpleReferenceObject public: XMLTableImport( SvXMLImport& rImport, const rtl::Reference< XMLPropertySetMapper >& xCellPropertySetMapper, const rtl::Reference< XMLPropertyHandlerFactory >& xFactoryRef ); - virtual ~XMLTableImport(); + virtual ~XMLTableImport() override; SvXMLImportContext* CreateTableContext( sal_uInt16 nPrfx, const OUString& rLName, css::uno::Reference< css::table::XColumnRowRange >& xColumnRowRange ); diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx index ceaf392d6bb2..cab9f53653e4 100644 --- a/include/xmloff/txtimp.hxx +++ b/include/xmloff/txtimp.hxx @@ -410,7 +410,7 @@ public: bool const bProgress = false, bool const bBlockMode = false, bool const bOrganizerMode = false); - virtual ~XMLTextImportHelper(); + virtual ~XMLTextImportHelper() override; void SetCursor( const css::uno::Reference< css::text::XTextCursor >& rCursor ); diff --git a/include/xmloff/txtimppr.hxx b/include/xmloff/txtimppr.hxx index ae8989d2892b..910b074def4d 100644 --- a/include/xmloff/txtimppr.hxx +++ b/include/xmloff/txtimppr.hxx @@ -58,7 +58,7 @@ public: XMLTextImportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLImport& rImport ); - virtual ~XMLTextImportPropertyMapper(); + virtual ~XMLTextImportPropertyMapper() override; /** This method is called when all attributes have benn processed. It may be used to remove items that are incomplete */ virtual void finished( diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 99d9ce877ca4..c4f391ad3da3 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -428,7 +428,7 @@ public: SvXMLExport& rExp, SvXMLAutoStylePoolP & rASP ); - virtual ~XMLTextParagraphExport(); + virtual ~XMLTextParagraphExport() override; /// add autostyle for specified family void Add( diff --git a/include/xmloff/txtprmap.hxx b/include/xmloff/txtprmap.hxx index fc4039e0344c..f6c48e4435f8 100644 --- a/include/xmloff/txtprmap.hxx +++ b/include/xmloff/txtprmap.hxx @@ -222,7 +222,7 @@ class XMLOFF_DLLPUBLIC XMLTextPropertySetMapper : public XMLPropertySetMapper { public: XMLTextPropertySetMapper( TextPropMap nType, bool bForExport ); - virtual ~XMLTextPropertySetMapper(); + virtual ~XMLTextPropertySetMapper() override; static const XMLPropertyMapEntry* getPropertyMapForType( TextPropMap _nType ); }; diff --git a/include/xmloff/xmlaustp.hxx b/include/xmloff/xmlaustp.hxx index f4f02774b5e8..95b58b029ad4 100644 --- a/include/xmloff/xmlaustp.hxx +++ b/include/xmloff/xmlaustp.hxx @@ -69,7 +69,7 @@ public: SvXMLAutoStylePoolP( SvXMLExport& rExport); - virtual ~SvXMLAutoStylePoolP(); + virtual ~SvXMLAutoStylePoolP() override; SvXMLExport& GetExport() const; diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index 6ba10d56828e..c319789ed6e9 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -288,7 +288,7 @@ public: const css::uno::Reference< css::frame::XModel > &, FieldUnit const eDefaultFieldUnit ); - virtual ~SvXMLExport(); + virtual ~SvXMLExport() override; static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); static SvXMLExport* getImplementation( const css::uno::Reference< css::uno::XInterface >& ) throw(); diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx index 7ad68bb981f4..b77282c50a13 100644 --- a/include/xmloff/xmlexppr.hxx +++ b/include/xmloff/xmlexppr.hxx @@ -101,7 +101,7 @@ public: SvXMLExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper ); - virtual ~SvXMLExportPropertyMapper(); + virtual ~SvXMLExportPropertyMapper() override; // Add a ExportPropertyMapper at the end of the import mapper chain. // The added mapper MUST not be used outside the Mapper chain any longer, diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx index eddbf709b9a8..6e064e293a68 100644 --- a/include/xmloff/xmlictxt.hxx +++ b/include/xmloff/xmlictxt.hxx @@ -71,7 +71,7 @@ public: * ends. By default, nothing is done. * Note that virtual methods cannot be used inside destructors. Use * EndElement instead if this is required. */ - virtual ~SvXMLImportContext(); + virtual ~SvXMLImportContext() override; /** Create a children element context. By default, the import's * CreateContext method is called to create a new default context. */ diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index ba63b84ee65c..cc54fe1b9aeb 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -251,7 +251,7 @@ public: OUString const & implementationName, SvXMLImportFlags nImportFlags = SvXMLImportFlags::ALL ); - virtual ~SvXMLImport() throw(); + virtual ~SvXMLImport() throw() override; static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx index 308f6be0ec84..8247345c5bc5 100644 --- a/include/xmloff/xmlimppr.hxx +++ b/include/xmloff/xmlimppr.hxx @@ -70,7 +70,7 @@ public: SvXMLImportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLImport& rImport); - virtual ~SvXMLImportPropertyMapper(); + virtual ~SvXMLImportPropertyMapper() override; // Add a ImportPropertyMapper at the end of the import mapper chain. // The added mapper MUST not be used outside the Mapper chain any longer, diff --git a/include/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx index 94505f7bcac6..7cb181332713 100644 --- a/include/xmloff/xmlmetae.hxx +++ b/include/xmloff/xmlmetae.hxx @@ -71,7 +71,7 @@ public: SvXMLMetaExport( SvXMLExport& i_rExport, const css::uno::Reference< css::document::XDocumentProperties>& i_rDocProps); - virtual ~SvXMLMetaExport(); + virtual ~SvXMLMetaExport() override; /// export via XSAXWriter interface, with fallback to _MExport void Export(); diff --git a/include/xmloff/xmlmetai.hxx b/include/xmloff/xmlmetai.hxx index 12ec431ba6af..1ae3cec7142d 100644 --- a/include/xmloff/xmlmetai.hxx +++ b/include/xmloff/xmlmetai.hxx @@ -44,7 +44,7 @@ public: const OUString& rLName, const css::uno::Reference< css::document::XDocumentProperties>& xDocProps); - virtual ~SvXMLMetaDocumentContext(); + virtual ~SvXMLMetaDocumentContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx index a2ea8b47ac4a..a3eb59089651 100644 --- a/include/xmloff/xmlnumfi.hxx +++ b/include/xmloff/xmlnumfi.hxx @@ -168,7 +168,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, const sal_Int32 nKey, SvXMLStylesContext& rStyles ); - virtual ~SvXMLNumFormatContext(); + virtual ~SvXMLNumFormatContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/include/xmloff/xmlprcon.hxx b/include/xmloff/xmlprcon.hxx index e322a2238126..3961efe9bd8d 100644 --- a/include/xmloff/xmlprcon.hxx +++ b/include/xmloff/xmlprcon.hxx @@ -47,7 +47,7 @@ public: const rtl::Reference < SvXMLImportPropertyMapper > &rMap, sal_Int32 nStartIdx = -1, sal_Int32 nEndIdx = -1 ); - virtual ~SvXMLPropertySetContext(); + virtual ~SvXMLPropertySetContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx index 396aef4d4218..ab1690da7078 100644 --- a/include/xmloff/xmlprmap.hxx +++ b/include/xmloff/xmlprmap.hxx @@ -55,7 +55,7 @@ public: const rtl::Reference<XMLPropertyHandlerFactory>& rFactory, bool bForExport ); - virtual ~XMLPropertySetMapper(); + virtual ~XMLPropertySetMapper() override; void AddMapperEntry( const rtl::Reference < XMLPropertySetMapper >& rMapper ); diff --git a/include/xmloff/xmlscripti.hxx b/include/xmloff/xmlscripti.hxx index 464595d37aa1..85043df4a226 100644 --- a/include/xmloff/xmlscripti.hxx +++ b/include/xmloff/xmlscripti.hxx @@ -37,7 +37,7 @@ public: XMLScriptContext( SvXMLImport& rImport, const OUString& rLName, const css::uno::Reference< css::frame::XModel>& rDocModel ); - virtual ~XMLScriptContext(); + virtual ~XMLScriptContext() override; // Create child element. virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx index a73a24fc0800..0e7e5167a0a6 100644 --- a/include/xmloff/xmlstyle.hxx +++ b/include/xmloff/xmlstyle.hxx @@ -97,7 +97,7 @@ public: sal_uInt16 nFamily=0, bool bDefaultStyle = false ); - virtual ~SvXMLStyleContext(); + virtual ~SvXMLStyleContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -206,7 +206,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, bool bAutomatic = false ); - virtual ~SvXMLStylesContext(); + virtual ~SvXMLStylesContext() override; // Create child element. virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, |