summaryrefslogtreecommitdiff
path: root/oox/source/drawingml/diagram/diagramlayoutatoms.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 /oox/source/drawingml/diagram/diagramlayoutatoms.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 'oox/source/drawingml/diagram/diagramlayoutatoms.hxx')
-rw-r--r--oox/source/drawingml/diagram/diagramlayoutatoms.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 6153e9cb0957..8601424b4aee 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -105,7 +105,7 @@ public:
mnRefType(-1), mnRefPointType(-1), mfFactor(1.0), mfValue(0.0), mnOperator(0)
{}
- virtual ~ConstraintAtom() { }
+ virtual ~ConstraintAtom() override { }
virtual void accept( LayoutAtomVisitor& ) override;
@@ -151,7 +151,7 @@ class AlgAtom
public:
AlgAtom() : mnType(0), maMap() {}
- virtual ~AlgAtom() { }
+ virtual ~AlgAtom() override { }
typedef std::map<sal_Int32,sal_Int32> ParamMap;
@@ -177,7 +177,7 @@ class ForEachAtom
public:
explicit ForEachAtom(const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes);
- virtual ~ForEachAtom() { }
+ virtual ~ForEachAtom() override { }
IteratorAttr & iterator()
{ return maIter; }
@@ -194,7 +194,7 @@ class ConditionAtom
{
public:
explicit ConditionAtom(const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes);
- virtual ~ConditionAtom()
+ virtual ~ConditionAtom() override
{ }
virtual void accept( LayoutAtomVisitor& ) override;
void readElseBranch()
@@ -215,7 +215,7 @@ class ChooseAtom
: public LayoutAtom
{
public:
- virtual ~ChooseAtom()
+ virtual ~ChooseAtom() override
{ }
virtual void accept( LayoutAtomVisitor& ) override;
};
@@ -240,7 +240,7 @@ public:
typedef std::array<css::uno::Any, 9> VarMap;
LayoutNode() : mnChildOrder(0) {}
- virtual ~LayoutNode() { }
+ virtual ~LayoutNode() override { }
virtual void accept( LayoutAtomVisitor& ) override;
VarMap & variables()
{ return mVariables; }