diff options
67 files changed, 4 insertions, 218 deletions
diff --git a/include/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx index cc6a2a712bb8..d671e654880a 100644 --- a/include/xmloff/XMLFontStylesContext.hxx +++ b/include/xmloff/XMLFontStylesContext.hxx @@ -59,8 +59,6 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, rtl_TextEncoding eDfltEnc ); - ~XMLFontStylesContext() override; - const SvXMLTokenMap& GetFontStyleAttrTokenMap() const { return *pFontStyleAttrTokenMap; diff --git a/include/xmloff/XMLTextTableContext.hxx b/include/xmloff/XMLTextTableContext.hxx index 6077ccd5ae18..333716dc03d7 100644 --- a/include/xmloff/XMLTextTableContext.hxx +++ b/include/xmloff/XMLTextTableContext.hxx @@ -30,14 +30,10 @@ namespace com { namespace sun { namespace star { class XMLOFF_DLLPUBLIC XMLTextTableContext : public SvXMLImportContext { - public: - - XMLTextTableContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName ); - virtual ~XMLTextTableContext() override; }; #endif diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx index a142e3d484e6..8eca3bdfa251 100644 --- a/include/xmloff/txtstyli.hxx +++ b/include/xmloff/txtstyli.hxx @@ -63,13 +63,11 @@ protected: public: - XMLTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false ); - ~XMLTextStyleContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx index b1a068707c8c..ee7913a40edd 100644 --- a/include/xmloff/xmlnumi.hxx +++ b/include/xmloff/xmlnumi.hxx @@ -66,8 +66,6 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, bool bOutl = false ); - ~SvxXMLListStyleContext() override; - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/xmloff/inc/forms/property_handler.hxx b/xmloff/inc/forms/property_handler.hxx index e495d45d65dd..7a799eb10d50 100644 --- a/xmloff/inc/forms/property_handler.hxx +++ b/xmloff/inc/forms/property_handler.hxx @@ -52,8 +52,6 @@ namespace xmloff */ virtual bool getPropertyValues( const OUString& i_attributeValue, PropertyValues& o_propertyValues ) const = 0; - - virtual ~PropertyHandlerBase() override {} }; //= PPropertyHandler diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index cc457c1c5942..61eb03c7f765 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -132,8 +132,6 @@ public: sal_uInt16 nPrfx, /// namespace prefix const OUString& rLocalName); /// element name w/o prefix - virtual ~XMLTextFieldImportContext() override; - /// process character data: will be collected in member sContentBuffer virtual void Characters( const OUString& sContent ) override; diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index c7a8dcd4b1ae..bfe990375d7c 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -64,8 +64,6 @@ public: bool bValue, /// process value (Prep.Field) bool bFormula); /// process formula (Prep.F.) - ~XMLValueImportHelper(); - /// process attribute values void ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ); @@ -442,13 +440,11 @@ class XMLTableFormulaImportContext : public XMLTextFieldImportContext public: - XMLTableFormulaImportContext( SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// text import helper sal_uInt16 nPrfx, /// namespace prefix const OUString& rLocalName); /// element name w/o prefix - virtual ~XMLTableFormulaImportContext() override; protected: diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx index df29a971927c..303e0e16c76f 100644 --- a/xmloff/inc/xmlversion.hxx +++ b/xmloff/inc/xmlversion.hxx @@ -42,7 +42,6 @@ public: const css::uno::Sequence < css::util::RevisionTag >& rVersions, const OUString &rFileName, css::uno::Reference< css::xml::sax::XDocumentHandler > &rHandler ); - virtual ~XMLVersionListExport() override {} sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override; void ExportAutoStyles_() override {} diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx index 1d486da7c766..797ecd00ea32 100644 --- a/xmloff/source/chart/contexts.cxx +++ b/xmloff/source/chart/contexts.cxx @@ -135,8 +135,6 @@ SchXMLFlatDocContext_Impl::SchXMLFlatDocContext_Impl( { } -SchXMLFlatDocContext_Impl::~SchXMLFlatDocContext_Impl() { } - SvXMLImportContext *SchXMLFlatDocContext_Impl::CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx index 8c9a561d3bba..2f77de2bce8a 100644 --- a/xmloff/source/chart/contexts.hxx +++ b/xmloff/source/chart/contexts.hxx @@ -67,8 +67,6 @@ public: sal_uInt16 i_nPrefix, const OUString & i_rLName, const css::uno::Reference<css::document::XDocumentProperties>& i_xDocProps); - virtual ~SchXMLFlatDocContext_Impl() override; - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& i_xAttrList) override; diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index 925d7966958d..23b489ddf8e2 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -173,7 +173,6 @@ struct ImpSdXMLExpTransObj2DBase sal_uInt16 mnType; explicit ImpSdXMLExpTransObj2DBase(sal_uInt16 nType) : mnType(nType) {} - virtual ~ImpSdXMLExpTransObj2DBase() {} }; // possible object types for 2D @@ -544,7 +543,6 @@ struct ImpSdXMLExpTransObj3DBase sal_uInt16 mnType; explicit ImpSdXMLExpTransObj3DBase(sal_uInt16 nType) : mnType(nType) {} - virtual ~ImpSdXMLExpTransObj3DBase() {} }; // possible object types for 3D diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx index 5b36df0b9e58..f6f29024269b 100644 --- a/xmloff/source/forms/attriblistmerge.hxx +++ b/xmloff/source/forms/attriblistmerge.hxx @@ -44,8 +44,6 @@ namespace xmloff typedef std::vector< css::uno::Reference< css::xml::sax::XAttributeList > > AttributeListArray; AttributeListArray m_aLists; - virtual ~OAttribListMerger() override { } - public: OAttribListMerger() { } diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index 05fa61cc6e8e..d3109884860c 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -131,7 +131,10 @@ struct XMLFontAutoStylePoolEntryCmp_Impl { class XMLFontAutoStylePool_Impl : public o3tl::sorted_vector<XMLFontAutoStylePoolEntry_Impl*, XMLFontAutoStylePoolEntryCmp_Impl> { public: - ~XMLFontAutoStylePool_Impl() { DeleteAndDestroyAll(); } + ~XMLFontAutoStylePool_Impl() + { + DeleteAndDestroyAll(); + } }; XMLFontAutoStylePool::XMLFontAutoStylePool( SvXMLExport& rExp, bool _tryToEmbedFonts ) : diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index 8303ee99f1d7..76aebf935b25 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -377,8 +377,6 @@ XMLFontStylesContext::XMLFontStylesContext( SvXMLImport& rImport, { } -XMLFontStylesContext::~XMLFontStylesContext() {} - bool XMLFontStylesContext::FillProperties( const OUString& rName, ::std::vector< XMLPropertyState > &rProps, sal_Int32 nFamilyNameIdx, diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx index 7a4cbce8233f..0a20118c83e7 100644 --- a/xmloff/source/style/impastpl.cxx +++ b/xmloff/source/style/impastpl.cxx @@ -56,8 +56,6 @@ XMLAutoStyleFamily::XMLAutoStyleFamily( XMLAutoStyleFamily::XMLAutoStyleFamily( sal_Int32 nFamily ) : mnFamily(nFamily), mnCount(0), mnName(0), mbAsFamily(false) {} -XMLAutoStyleFamily::~XMLAutoStyleFamily() {} - void XMLAutoStyleFamily::ClearEntries() { m_ParentSet.clear(); diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index 45ea50995ffc..7cded325bbf6 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -122,7 +122,6 @@ struct XMLAutoStyleFamily const OUString& rStrPrefix, bool bAsFamily ); explicit XMLAutoStyleFamily( sal_Int32 nFamily ); - ~XMLAutoStyleFamily(); XMLAutoStyleFamily(const XMLAutoStyleFamily&) = delete; XMLAutoStyleFamily& operator=(const XMLAutoStyleFamily&) = delete; diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index cb130d8e00b1..b6c4eab5a3f1 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -1018,8 +1018,6 @@ SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport, { } -SvxXMLListStyleContext::~SvxXMLListStyleContext() {} - SvXMLImportContext *SvxXMLListStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/xmloff/source/text/XMLTextTableContext.cxx b/xmloff/source/text/XMLTextTableContext.cxx index 5fcfd88bdfc5..2a5f652e3d99 100644 --- a/xmloff/source/text/XMLTextTableContext.cxx +++ b/xmloff/source/text/XMLTextTableContext.cxx @@ -31,8 +31,4 @@ XMLTextTableContext::XMLTextTableContext( { } -XMLTextTableContext::~XMLTextTableContext() -{ -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index c9901616b5c3..909cebb61c16 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -147,9 +147,6 @@ void XMLTextFieldImportContext::StartElement( } } -XMLTextFieldImportContext::~XMLTextFieldImportContext() { -} - OUString const & XMLTextFieldImportContext::GetContent() { if (sContent.isEmpty()) diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index d35a05224448..74da4e6d6f5d 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -2263,10 +2263,6 @@ XMLNumberedParaContext::XMLNumberedParaContext( i_rImport.GetTextImport()->GetTextListHelper().PushListContext( this ); } -XMLNumberedParaContext::~XMLNumberedParaContext() -{ -} - void XMLNumberedParaContext::EndElement() { if (!m_ListId.isEmpty()) { diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx index 495bd26a73ab..18dc3e78523a 100644 --- a/xmloff/source/text/txtparai.hxx +++ b/xmloff/source/text/txtparai.hxx @@ -94,8 +94,6 @@ public: const OUString& i_rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & i_xAttrList ); - virtual ~XMLNumberedParaContext() override; - virtual void EndElement() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 i_nPrefix, diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx index eebc5f763951..22301b014221 100644 --- a/xmloff/source/text/txtparaimphint.hxx +++ b/xmloff/source/text/txtparaimphint.hxx @@ -76,7 +76,6 @@ public: sStyleName( rStyleName ) { } - virtual ~XMLStyleHint_Impl() override {} const OUString& GetStyleName() const { return sStyleName; } }; @@ -94,8 +93,6 @@ public: { } - virtual ~XMLReferenceHint_Impl() override {} - const OUString& GetRefName() const { return sRefName; } }; @@ -160,8 +157,6 @@ public: { } - virtual ~XMLIndexMarkHint_Impl() override {} - const css::uno::Reference<css::beans::XPropertySet> & GetMark() const { return xIndexMarkPropSet; } const OUString& GetID() const { return sID; } @@ -181,10 +176,6 @@ public: { } - virtual ~XMLTextFrameHint_Impl() override - { - } - css::uno::Reference < css::text::XTextContent > GetTextContent() const { css::uno::Reference < css::text::XTextContent > xTxt; @@ -238,10 +229,6 @@ public: { } - virtual ~XMLDrawHint_Impl() override - { - } - // Frame "to character": anchor moves from first to last char after saving (#i33242#) css::uno::Reference < css::drawing::XShape > GetShape() const { diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index e79609004484..a19f05f331c1 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -1336,10 +1336,6 @@ XMLTextPropertyHandlerFactory::XMLTextPropertyHandlerFactory() : { } -XMLTextPropertyHandlerFactory::~XMLTextPropertyHandlerFactory() -{ -} - const XMLPropertyHandler *XMLTextPropertyHandlerFactory::GetPropertyHandler( sal_Int32 nType ) const { diff --git a/xmloff/source/text/txtprhdl.hxx b/xmloff/source/text/txtprhdl.hxx index 2a823ac32e8b..8870268eb0a8 100644 --- a/xmloff/source/text/txtprhdl.hxx +++ b/xmloff/source/text/txtprhdl.hxx @@ -30,12 +30,10 @@ class XMLTextPropertyHandlerFactory : public XMLPropertyHandlerFactory public: XMLTextPropertyHandlerFactory(); - virtual ~XMLTextPropertyHandlerFactory() override; virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const override ; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 8df44e21c744..6a78c2d77e27 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -149,9 +149,6 @@ XMLTextStyleContext::XMLTextStyleContext( SvXMLImport& rImport, { } -XMLTextStyleContext::~XMLTextStyleContext() -{} - SvXMLImportContext *XMLTextStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 4d67e17baca6..66bd617e6762 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -602,10 +602,6 @@ XMLTableFormulaImportContext::XMLTableFormulaImportContext( { } -XMLTableFormulaImportContext::~XMLTableFormulaImportContext() -{ -} - void XMLTableFormulaImportContext::ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ) @@ -1120,10 +1116,6 @@ XMLValueImportHelper::XMLValueImportHelper( { } -XMLValueImportHelper::~XMLValueImportHelper() -{ -} - void XMLValueImportHelper::ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ) { diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx index b016011d7aa3..ee9c86acfd68 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx @@ -111,16 +111,12 @@ void XMLAxisOOoContext::StartElement( XMLPersElemContentTContext::StartElement( xAttrList ); } - XMLChartPlotAreaOOoTContext::XMLChartPlotAreaOOoTContext( XMLTransformerBase & rTransformer, const OUString & rQName ) : XMLProcAttrTransformerContext( rTransformer, rQName, OOO_SHAPE_ACTIONS ) { } -XMLChartPlotAreaOOoTContext::~XMLChartPlotAreaOOoTContext() -{} - rtl::Reference<XMLTransformerContext> XMLChartPlotAreaOOoTContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx index ea1d5eff793f..6073f5efbf54 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx @@ -37,7 +37,6 @@ class XMLChartPlotAreaOOoTContext : public XMLProcAttrTransformerContext public: explicit XMLChartPlotAreaOOoTContext( XMLTransformerBase & rTransformer, const OUString & rQName ); - virtual ~XMLChartPlotAreaOOoTContext() override; virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/xmloff/source/transform/ControlOASISTContext.cxx b/xmloff/source/transform/ControlOASISTContext.cxx index b2f570217a34..3b5ece6da769 100644 --- a/xmloff/source/transform/ControlOASISTContext.cxx +++ b/xmloff/source/transform/ControlOASISTContext.cxx @@ -42,10 +42,6 @@ XMLControlOASISTransformerContext::XMLControlOASISTransformerContext( { } -XMLControlOASISTransformerContext::~XMLControlOASISTransformerContext() -{ -} - void XMLControlOASISTransformerContext::StartElement( const Reference< XAttributeList >& rAttrList ) { diff --git a/xmloff/source/transform/ControlOASISTContext.hxx b/xmloff/source/transform/ControlOASISTContext.hxx index 88af8e161032..9b223bc64ae0 100644 --- a/xmloff/source/transform/ControlOASISTContext.hxx +++ b/xmloff/source/transform/ControlOASISTContext.hxx @@ -32,8 +32,6 @@ public: const OUString& rQName, bool bCreateControl ); - virtual ~XMLControlOASISTransformerContext() override; - virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; diff --git a/xmloff/source/transform/ControlOOoTContext.cxx b/xmloff/source/transform/ControlOOoTContext.cxx index 1961da430869..b37a73491f94 100644 --- a/xmloff/source/transform/ControlOOoTContext.cxx +++ b/xmloff/source/transform/ControlOOoTContext.cxx @@ -38,10 +38,6 @@ XMLControlOOoTransformerContext::XMLControlOOoTransformerContext( { } -XMLControlOOoTransformerContext::~XMLControlOOoTransformerContext() -{ -} - void XMLControlOOoTransformerContext::StartElement( const Reference< XAttributeList >& rAttrList ) { diff --git a/xmloff/source/transform/ControlOOoTContext.hxx b/xmloff/source/transform/ControlOOoTContext.hxx index d95510d5a9ab..22cf1c5f5235 100644 --- a/xmloff/source/transform/ControlOOoTContext.hxx +++ b/xmloff/source/transform/ControlOOoTContext.hxx @@ -32,8 +32,6 @@ public: XMLControlOOoTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName ); - virtual ~XMLControlOOoTransformerContext() override; - virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, diff --git a/xmloff/source/transform/CreateElemTContext.cxx b/xmloff/source/transform/CreateElemTContext.cxx index 48fad335200d..d4943f62840e 100644 --- a/xmloff/source/transform/CreateElemTContext.cxx +++ b/xmloff/source/transform/CreateElemTContext.cxx @@ -43,10 +43,6 @@ XMLCreateElemTransformerContext::XMLCreateElemTransformerContext( { } -XMLCreateElemTransformerContext::~XMLCreateElemTransformerContext() -{ -} - void XMLCreateElemTransformerContext::StartElement( const Reference< XAttributeList >& rAttrList ) { diff --git a/xmloff/source/transform/CreateElemTContext.hxx b/xmloff/source/transform/CreateElemTContext.hxx index 3fe38d40860b..2d34e562e6c5 100644 --- a/xmloff/source/transform/CreateElemTContext.hxx +++ b/xmloff/source/transform/CreateElemTContext.hxx @@ -32,8 +32,6 @@ public: const OUString& rQName, sal_uInt16 nActionMap ); - virtual ~XMLCreateElemTransformerContext() override; - virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; }; diff --git a/xmloff/source/transform/DocumentTContext.cxx b/xmloff/source/transform/DocumentTContext.cxx index 3ae6b0dfe5f3..65b5f5beab71 100644 --- a/xmloff/source/transform/DocumentTContext.cxx +++ b/xmloff/source/transform/DocumentTContext.cxx @@ -43,10 +43,6 @@ XMLDocumentTransformerContext::XMLDocumentTransformerContext( XMLTransformerBase { } -XMLDocumentTransformerContext::~XMLDocumentTransformerContext() -{ -} - void XMLDocumentTransformerContext::StartElement( const Reference< XAttributeList >& rAttrList ) { Reference< XAttributeList > xAttrList( rAttrList ); diff --git a/xmloff/source/transform/DocumentTContext.hxx b/xmloff/source/transform/DocumentTContext.hxx index eaf66137e4b6..1b8aaacc2693 100644 --- a/xmloff/source/transform/DocumentTContext.hxx +++ b/xmloff/source/transform/DocumentTContext.hxx @@ -32,12 +32,6 @@ public: XMLDocumentTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName ); - // A contexts destructor does anything that is required if an element - // ends. By default, nothing is done. - // Note that virtual methods cannot be used inside destructors. Use - // EndElement instead if this is required. - virtual ~XMLDocumentTransformerContext() override; - // StartElement is called after a context has been constructed and // before a elements context is parsed. It may be used for actions that // require virtual methods. The default is to do nothing. diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index cc7b17365247..42cc1ab93ab0 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -43,7 +43,6 @@ public: XMLTransformerOOoEventMap_Impl( XMLTransformerEventMapEntry *pInit, XMLTransformerEventMapEntry *pInit2 ); - ~XMLTransformerOOoEventMap_Impl(); }; void XMLTransformerOOoEventMap_Impl::AddMap( XMLTransformerEventMapEntry *pInit ) @@ -80,10 +79,6 @@ XMLTransformerOOoEventMap_Impl::XMLTransformerOOoEventMap_Impl( AddMap( pInit2 ); } -XMLTransformerOOoEventMap_Impl::~XMLTransformerOOoEventMap_Impl() -{ -} - XMLEventOOoTransformerContext::XMLEventOOoTransformerContext( XMLTransformerBase& rImp, const OUString& rQName, diff --git a/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx index 74385d604e03..0176964f7711 100644 --- a/xmloff/source/transform/FrameOOoTContext.cxx +++ b/xmloff/source/transform/FrameOOoTContext.cxx @@ -42,10 +42,6 @@ XMLFrameOOoTransformerContext::XMLFrameOOoTransformerContext( { } -XMLFrameOOoTransformerContext::~XMLFrameOOoTransformerContext() -{ -} - void XMLFrameOOoTransformerContext::StartElement( const Reference< XAttributeList >& rAttrList ) { diff --git a/xmloff/source/transform/FrameOOoTContext.hxx b/xmloff/source/transform/FrameOOoTContext.hxx index 595c0ac6756c..eb31e9305916 100644 --- a/xmloff/source/transform/FrameOOoTContext.hxx +++ b/xmloff/source/transform/FrameOOoTContext.hxx @@ -30,8 +30,6 @@ public: XMLFrameOOoTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName ); - virtual ~XMLFrameOOoTransformerContext() override; - virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, diff --git a/xmloff/source/transform/IgnoreTContext.cxx b/xmloff/source/transform/IgnoreTContext.cxx index 1dde4f753306..db4e212eaf3f 100644 --- a/xmloff/source/transform/IgnoreTContext.cxx +++ b/xmloff/source/transform/IgnoreTContext.cxx @@ -49,10 +49,6 @@ XMLIgnoreTransformerContext::XMLIgnoreTransformerContext( { } -XMLIgnoreTransformerContext::~XMLIgnoreTransformerContext() -{ -} - rtl::Reference<XMLTransformerContext> XMLIgnoreTransformerContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/xmloff/source/transform/IgnoreTContext.hxx b/xmloff/source/transform/IgnoreTContext.hxx index 639c32ccc0c9..c61e330ab432 100644 --- a/xmloff/source/transform/IgnoreTContext.hxx +++ b/xmloff/source/transform/IgnoreTContext.hxx @@ -47,12 +47,6 @@ public: const OUString& rQName, bool bAllowCharactersRecursive ); - // A contexts destructor does anything that is required if an element - // ends. By default, nothing is done. - // Note that virtual methods cannot be used inside destructors. Use - // EndElement instead if this is required. - virtual ~XMLIgnoreTransformerContext() override; - // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix, diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index e634513b6564..ba988a3cef17 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -117,10 +117,6 @@ XMLMergeElemTransformerContext::XMLMergeElemTransformerContext( { } -XMLMergeElemTransformerContext::~XMLMergeElemTransformerContext() -{ -} - void XMLMergeElemTransformerContext::StartElement( const Reference< XAttributeList >& rAttrList ) { diff --git a/xmloff/source/transform/MergeElemTContext.hxx b/xmloff/source/transform/MergeElemTContext.hxx index 5cce49567cc2..dedba943a0e1 100644 --- a/xmloff/source/transform/MergeElemTContext.hxx +++ b/xmloff/source/transform/MergeElemTContext.hxx @@ -41,8 +41,6 @@ public: const OUString& rQName, sal_uInt16 nActionMap ); - virtual ~XMLMergeElemTransformerContext() override; - virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, diff --git a/xmloff/source/transform/PersAttrListTContext.cxx b/xmloff/source/transform/PersAttrListTContext.cxx index 21bd235c3a30..c604a095cc21 100644 --- a/xmloff/source/transform/PersAttrListTContext.cxx +++ b/xmloff/source/transform/PersAttrListTContext.cxx @@ -106,10 +106,6 @@ XMLPersAttrListTContext::XMLPersAttrListTContext( { } -XMLPersAttrListTContext::~XMLPersAttrListTContext() -{ -} - rtl::Reference<XMLTransformerContext> XMLPersAttrListTContext::CreateChildContext( sal_uInt16 /*nPrefix*/, const OUString& /*rLocalName*/, diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx index 4206c3de1a72..1112376503ce 100644 --- a/xmloff/source/transform/PersAttrListTContext.hxx +++ b/xmloff/source/transform/PersAttrListTContext.hxx @@ -61,12 +61,6 @@ public: ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nActionMap ); - // A contexts destructor does anything that is required if an element - // ends. By default, nothing is done. - // Note that virtual methods cannot be used inside destructors. Use - // EndElement instead if this is required. - virtual ~XMLPersAttrListTContext() override; - // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix, diff --git a/xmloff/source/transform/ProcAttrTContext.cxx b/xmloff/source/transform/ProcAttrTContext.cxx index 15a51eb45ce8..4f142b3dadf1 100644 --- a/xmloff/source/transform/ProcAttrTContext.cxx +++ b/xmloff/source/transform/ProcAttrTContext.cxx @@ -51,10 +51,6 @@ XMLProcAttrTransformerContext::XMLProcAttrTransformerContext( { } -XMLProcAttrTransformerContext::~XMLProcAttrTransformerContext() -{ -} - void XMLProcAttrTransformerContext::StartElement( const Reference< XAttributeList >& rAttrList ) { diff --git a/xmloff/source/transform/ProcAttrTContext.hxx b/xmloff/source/transform/ProcAttrTContext.hxx index f710db3ad2c0..5bc9d2b41b5c 100644 --- a/xmloff/source/transform/ProcAttrTContext.hxx +++ b/xmloff/source/transform/ProcAttrTContext.hxx @@ -44,8 +44,6 @@ public: ::xmloff::token::XMLTokenEnum eToken, sal_uInt16 nActionMap ); - virtual ~XMLProcAttrTransformerContext() override; - virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; }; diff --git a/xmloff/source/transform/TransformerContext.cxx b/xmloff/source/transform/TransformerContext.cxx index 71b2b44a1171..7181c2a1af11 100644 --- a/xmloff/source/transform/TransformerContext.cxx +++ b/xmloff/source/transform/TransformerContext.cxx @@ -52,10 +52,6 @@ XMLTransformerContext::XMLTransformerContext( XMLTransformerBase& rImp, { } -XMLTransformerContext::~XMLTransformerContext() -{ -} - rtl::Reference<XMLTransformerContext> XMLTransformerContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName, diff --git a/xmloff/source/transform/TransformerContext.hxx b/xmloff/source/transform/TransformerContext.hxx index 6f7a13add4cc..0a2446f252d4 100644 --- a/xmloff/source/transform/TransformerContext.hxx +++ b/xmloff/source/transform/TransformerContext.hxx @@ -64,12 +64,6 @@ public: XMLTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName ); - // A contexts destructor does anything that is required if an element - // ends. By default, nothing is done. - // Note that virtual methods cannot be used inside destructors. Use - // EndElement instead if this is required. - virtual ~XMLTransformerContext() override; - // Create a children element context. By default, the import's // CreateContext method is called to create a new default context. virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix, diff --git a/xmloff/source/transform/TransformerTokenMap.cxx b/xmloff/source/transform/TransformerTokenMap.cxx index dd260e762501..fd599e9980c5 100644 --- a/xmloff/source/transform/TransformerTokenMap.cxx +++ b/xmloff/source/transform/TransformerTokenMap.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "TransformerTokenMap.hxx" - using namespace ::xmloff::token; XMLTransformerTokenMap::XMLTransformerTokenMap( XMLTokenEnum *pInit ) @@ -37,8 +35,4 @@ XMLTransformerTokenMap::XMLTransformerTokenMap( XMLTokenEnum *pInit ) } } -XMLTransformerTokenMap::~XMLTransformerTokenMap() -{ -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx index c9dc03f9b764..0379ed544d64 100644 --- a/xmloff/source/transform/TransformerTokenMap.hxx +++ b/xmloff/source/transform/TransformerTokenMap.hxx @@ -30,7 +30,6 @@ class XMLTransformerTokenMap : { public: explicit XMLTransformerTokenMap( ::xmloff::token::XMLTokenEnum *pInit ); - ~XMLTransformerTokenMap(); }; #endif // INCLUDED_XMLOFF_SOURCE_TRANSFORM_TRANSFORMERTOKENMAP_HXX diff --git a/xmloff/source/xforms/SchemaContext.cxx b/xmloff/source/xforms/SchemaContext.cxx index 928f4c37deb0..27ac6bed31b7 100644 --- a/xmloff/source/xforms/SchemaContext.cxx +++ b/xmloff/source/xforms/SchemaContext.cxx @@ -49,7 +49,6 @@ static const SvXMLTokenMapEntry aChildren[] = XML_TOKEN_MAP_END }; - SchemaContext::SchemaContext( SvXMLImport& rImport, sal_uInt16 nPrefix, @@ -60,10 +59,6 @@ SchemaContext::SchemaContext( { } -SchemaContext::~SchemaContext() -{ -} - void SchemaContext::HandleAttribute( sal_uInt16, const OUString& ) diff --git a/xmloff/source/xforms/SchemaContext.hxx b/xmloff/source/xforms/SchemaContext.hxx index cd03695cc36a..1e65995eb2a2 100644 --- a/xmloff/source/xforms/SchemaContext.hxx +++ b/xmloff/source/xforms/SchemaContext.hxx @@ -42,7 +42,6 @@ public: sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference<css::xforms::XDataTypeRepository>& rRepository ); - virtual ~SchemaContext() override; // implement TokenContext methods: diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx index e595a88bd79f..994c17480f12 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.cxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx @@ -93,10 +93,6 @@ SchemaRestrictionContext::SchemaRestrictionContext( SAL_WARN_IF( !mxRepository.is(), "xmloff", "need repository" ); } -SchemaRestrictionContext::~SchemaRestrictionContext() -{ -} - void SchemaRestrictionContext::CreateDataType() { // only do something if we don't have a data type already diff --git a/xmloff/source/xforms/SchemaRestrictionContext.hxx b/xmloff/source/xforms/SchemaRestrictionContext.hxx index d5808aa459b5..2de3fcea7cca 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.hxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.hxx @@ -46,7 +46,6 @@ public: const OUString& rLName, css::uno::Reference<css::xforms::XDataTypeRepository>& rRepository, const OUString& sTypeName ); - virtual ~SchemaRestrictionContext() override; protected: // create mxDataType (if not already present) diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx index 5374a9abac2e..f558c3e997d2 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx @@ -49,7 +49,6 @@ static const SvXMLTokenMapEntry aChildren[] = XML_TOKEN_MAP_END }; - SchemaSimpleTypeContext::SchemaSimpleTypeContext( SvXMLImport& rImport, sal_uInt16 nPrefix, @@ -60,10 +59,6 @@ SchemaSimpleTypeContext::SchemaSimpleTypeContext( { } -SchemaSimpleTypeContext::~SchemaSimpleTypeContext() -{ -} - void SchemaSimpleTypeContext::HandleAttribute( sal_uInt16 nToken, const OUString& rValue ) diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx index 3ac9bf9a95ea..0280b0870f3c 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.hxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.hxx @@ -44,8 +44,6 @@ public: const OUString& rLName, const css::uno::Reference<css::xforms::XDataTypeRepository>& rRepository ); - virtual ~SchemaSimpleTypeContext() override; - // implement TokenContext methods: protected: diff --git a/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx index a1341b90c1b0..3aefb3a89f1a 100644 --- a/xmloff/source/xforms/TokenContext.cxx +++ b/xmloff/source/xforms/TokenContext.cxx @@ -31,13 +31,11 @@ using com::sun::star::uno::Reference; using com::sun::star::xml::sax::XAttributeList; - struct SvXMLTokenMapEntry aEmptyMap[1] = { XML_TOKEN_MAP_END }; - TokenContext::TokenContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, @@ -49,10 +47,6 @@ TokenContext::TokenContext( SvXMLImport& rImport, { } -TokenContext::~TokenContext() -{ -} - void TokenContext::StartElement( const Reference<XAttributeList>& xAttributeList ) { diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx index 70d1ee5e3bc9..a19b8503758e 100644 --- a/xmloff/source/xforms/TokenContext.hxx +++ b/xmloff/source/xforms/TokenContext.hxx @@ -47,8 +47,6 @@ public: const SvXMLTokenMapEntry* pAttributes, const SvXMLTokenMapEntry* pChildren ); - virtual ~TokenContext() override; - // implement SvXMLImportContext methods: /** call HandleAttribute for each attribute in the token map; diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx index 9c7c811ceab4..c19c9b5838a4 100644 --- a/xmloff/source/xforms/XFormsBindContext.cxx +++ b/xmloff/source/xforms/XFormsBindContext.cxx @@ -76,10 +76,6 @@ XFormsBindContext::XFormsBindContext( mxModel->getBindings()->insert( makeAny( mxBinding ) ); } -XFormsBindContext::~XFormsBindContext() -{ -} - void XFormsBindContext::HandleAttribute( sal_uInt16 nToken, const OUString& rValue ) { diff --git a/xmloff/source/xforms/XFormsBindContext.hxx b/xmloff/source/xforms/XFormsBindContext.hxx index d5b962f10ce9..26424b8c406f 100644 --- a/xmloff/source/xforms/XFormsBindContext.hxx +++ b/xmloff/source/xforms/XFormsBindContext.hxx @@ -43,7 +43,6 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xforms::XModel2>& xModel ); - virtual ~XFormsBindContext() override; // implement SvXMLImportContext & TokenContext methods: diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx index cf5a24ce1971..77b5a4806632 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.cxx +++ b/xmloff/source/xforms/XFormsInstanceContext.cxx @@ -66,10 +66,6 @@ XFormsInstanceContext::XFormsInstanceContext( SAL_WARN_IF( !mxModel.is(), "xmloff", "need model" ); } -XFormsInstanceContext::~XFormsInstanceContext() -{ -} - SvXMLImportContext* XFormsInstanceContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx index 76f0fa7df429..1bcdd16883d7 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.hxx +++ b/xmloff/source/xforms/XFormsInstanceContext.hxx @@ -46,7 +46,6 @@ public: sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference<css::xforms::XModel2> & xModel ); - virtual ~XFormsInstanceContext() override; // implement SvXMLImportContext & TokenContext methods: // We override CreateChildContext, because we want to read diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx index 8f802d3adfa3..3ab4701a9b70 100644 --- a/xmloff/source/xforms/XFormsModelContext.cxx +++ b/xmloff/source/xforms/XFormsModelContext.cxx @@ -70,11 +70,6 @@ XFormsModelContext::XFormsModelContext( SvXMLImport& rImport, { } -XFormsModelContext::~XFormsModelContext() -{ -} - - void XFormsModelContext::HandleAttribute( sal_uInt16 nToken, const OUString& rValue ) diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx index ca4b8379a3ce..8546c5d74105 100644 --- a/xmloff/source/xforms/XFormsModelContext.hxx +++ b/xmloff/source/xforms/XFormsModelContext.hxx @@ -41,7 +41,6 @@ public: XFormsModelContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName ); - virtual ~XFormsModelContext() override; const css::uno::Reference<css::xforms::XModel2>& getModel() { return mxModel;} diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx index 0ebad871ac6d..88fb3e374abd 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.cxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx @@ -78,10 +78,6 @@ XFormsSubmissionContext::XFormsSubmissionContext( xModel->getSubmissions()->insert( makeAny( mxSubmission ) ); } -XFormsSubmissionContext::~XFormsSubmissionContext() -{ -} - Any toBool( const OUString& rValue ) { Any aValue; diff --git a/xmloff/source/xforms/XFormsSubmissionContext.hxx b/xmloff/source/xforms/XFormsSubmissionContext.hxx index d93444f07ad4..33ac54542bd8 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.hxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.hxx @@ -42,7 +42,6 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xforms::XModel2>& xModel ); - virtual ~XFormsSubmissionContext() override; // implement TokenContext methods: |