summaryrefslogtreecommitdiff
path: root/sc/source/filter/inc/xeescher.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 /sc/source/filter/inc/xeescher.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 'sc/source/filter/inc/xeescher.hxx')
-rw-r--r--sc/source/filter/inc/xeescher.hxx10
1 files changed, 5 insertions, 5 deletions
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. */