summaryrefslogtreecommitdiff
path: root/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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 'writerfilter/source/ooxml/OOXMLFastContextHandler.hxx')
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.hxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index a8ad379a7399..0550eecdf1ad 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -48,7 +48,7 @@ public:
explicit OOXMLFastContextHandler(OOXMLFastContextHandler * pContext);
- virtual ~OOXMLFastContextHandler();
+ virtual ~OOXMLFastContextHandler() override;
// css::xml::sax::XFastContextHandler:
virtual void SAL_CALL startFastElement (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs)
@@ -243,7 +243,7 @@ class OOXMLFastContextHandlerStream : public OOXMLFastContextHandler
{
public:
explicit OOXMLFastContextHandlerStream(OOXMLFastContextHandler * pContext);
- virtual ~OOXMLFastContextHandlerStream();
+ virtual ~OOXMLFastContextHandlerStream() override;
virtual ResourceEnum_t getResource() const override { return STREAM; }
@@ -263,7 +263,7 @@ class OOXMLFastContextHandlerProperties : public OOXMLFastContextHandler
{
public:
explicit OOXMLFastContextHandlerProperties(OOXMLFastContextHandler * pContext);
- virtual ~OOXMLFastContextHandlerProperties();
+ virtual ~OOXMLFastContextHandlerProperties() override;
virtual OOXMLValue::Pointer_t getValue() const override;
virtual ResourceEnum_t getResource() const override { return PROPERTIES; }
@@ -300,7 +300,7 @@ class OOXMLFastContextHandlerPropertyTable :
{
public:
explicit OOXMLFastContextHandlerPropertyTable(OOXMLFastContextHandler * pContext);
- virtual ~OOXMLFastContextHandlerPropertyTable();
+ virtual ~OOXMLFastContextHandlerPropertyTable() override;
protected:
OOXMLTable mTable;
@@ -314,7 +314,7 @@ class OOXMLFastContextHandlerValue :
{
public:
explicit OOXMLFastContextHandlerValue(OOXMLFastContextHandler * pContext);
- virtual ~OOXMLFastContextHandlerValue();
+ virtual ~OOXMLFastContextHandlerValue() override;
void setValue(const OOXMLValue::Pointer_t& pValue);
virtual OOXMLValue::Pointer_t getValue() const override;
@@ -337,7 +337,7 @@ class OOXMLFastContextHandlerTable : public OOXMLFastContextHandler
{
public:
explicit OOXMLFastContextHandlerTable(OOXMLFastContextHandler * pContext);
- virtual ~OOXMLFastContextHandlerTable();
+ virtual ~OOXMLFastContextHandlerTable() override;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext (Token_t Element,
const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
@@ -362,7 +362,7 @@ class OOXMLFastContextHandlerXNote : public OOXMLFastContextHandlerProperties
{
public:
explicit OOXMLFastContextHandlerXNote(OOXMLFastContextHandler * pContext);
- virtual ~OOXMLFastContextHandlerXNote();
+ virtual ~OOXMLFastContextHandlerXNote() override;
void checkId(const OOXMLValue::Pointer_t& pValue);
@@ -388,7 +388,7 @@ class OOXMLFastContextHandlerTextTableCell : public OOXMLFastContextHandler
{
public:
explicit OOXMLFastContextHandlerTextTableCell(OOXMLFastContextHandler * pContext);
- virtual ~OOXMLFastContextHandlerTextTableCell();
+ virtual ~OOXMLFastContextHandlerTextTableCell() override;
virtual std::string getType() const override { return "TextTableCell"; }
@@ -400,7 +400,7 @@ class OOXMLFastContextHandlerTextTableRow : public OOXMLFastContextHandler
{
public:
explicit OOXMLFastContextHandlerTextTableRow(OOXMLFastContextHandler * pContext);
- virtual ~OOXMLFastContextHandlerTextTableRow();
+ virtual ~OOXMLFastContextHandlerTextTableRow() override;
virtual std::string getType() const override { return "TextTableRow"; }
@@ -417,7 +417,7 @@ class OOXMLFastContextHandlerTextTable : public OOXMLFastContextHandler
public:
explicit OOXMLFastContextHandlerTextTable(OOXMLFastContextHandler * pContext);
- virtual ~OOXMLFastContextHandlerTextTable();
+ virtual ~OOXMLFastContextHandlerTextTable() override;
virtual std::string getType() const override { return "TextTable"; }
@@ -437,7 +437,7 @@ private:
public:
explicit OOXMLFastContextHandlerShape(OOXMLFastContextHandler * pContext);
- virtual ~OOXMLFastContextHandlerShape();
+ virtual ~OOXMLFastContextHandlerShape() override;
virtual std::string getType() const override { return "Shape"; }
@@ -486,7 +486,7 @@ class OOXMLFastContextHandlerWrapper : public OOXMLFastContextHandler
{
public:
explicit OOXMLFastContextHandlerWrapper(OOXMLFastContextHandler * pParent, css::uno::Reference<css::xml::sax::XFastContextHandler> const & xContext);
- virtual ~OOXMLFastContextHandlerWrapper();
+ virtual ~OOXMLFastContextHandlerWrapper() override;
// css::xml::sax::XFastContextHandler:
virtual void SAL_CALL startUnknownElement(const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)