summaryrefslogtreecommitdiff
path: root/include/tools
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 /include/tools
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 'include/tools')
-rw-r--r--include/tools/b3dtrans.hxx4
-rw-r--r--include/tools/errinf.hxx4
-rw-r--r--include/tools/pstm.hxx2
-rw-r--r--include/tools/stream.hxx8
4 files changed, 9 insertions, 9 deletions
diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index 75129a63d95e..d12f26c6b349 100644
--- a/include/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
@@ -159,7 +159,7 @@ private:
public:
B3dViewport();
- virtual ~B3dViewport();
+ virtual ~B3dViewport() override;
void SetVUV(const basegfx::B3DVector& rNewVUV);
void SetViewportValues(
@@ -191,7 +191,7 @@ public:
const basegfx::B3DPoint& rPos = basegfx::B3DPoint(0.0, 0.0, 1.0),
const basegfx::B3DVector& rLkAt = basegfx::B3DVector(0.0, 0.0, 0.0),
double fFocLen = 35.0, double fBnkAng = 0.0);
- virtual ~B3dCamera();
+ virtual ~B3dCamera() override;
protected:
void CalcNewViewportValues();
diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx
index e7777eb72173..ededffb5f77a 100644
--- a/include/tools/errinf.hxx
+++ b/include/tools/errinf.hxx
@@ -60,7 +60,7 @@ private:
public:
DynamicErrorInfo(sal_uIntPtr lUserId, sal_uInt16 nMask);
- virtual ~DynamicErrorInfo();
+ virtual ~DynamicErrorInfo() override;
operator sal_uIntPtr() const;
sal_uInt16 GetDialogMask() const;
@@ -91,7 +91,7 @@ public:
const OUString & rTheArg2, sal_uInt16 nMask = 0):
DynamicErrorInfo(nUserID, nMask), aArg1(rTheArg1), aArg2(rTheArg2) {}
- virtual ~TwoStringErrorInfo() {}
+ virtual ~TwoStringErrorInfo() override {}
const OUString& GetArg1() const { return aArg1; }
const OUString& GetArg2() const { return aArg2; }
diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx
index cb778d2dc60c..b0cbd3b9f445 100644
--- a/include/tools/pstm.hxx
+++ b/include/tools/pstm.hxx
@@ -152,7 +152,7 @@ public:
virtual void ResetError() override;
SvPersistStream( SvClassManager &, SvStream * pStream );
- virtual ~SvPersistStream();
+ virtual ~SvPersistStream() override;
void ClearStream();
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 8a9f3d04db6e..5f8b9388dba5 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -116,7 +116,7 @@ public:
SvLockBytes(SvStream * pTheStream, bool bTheOwner = false) :
m_pStream(pTheStream), m_bOwner(bTheOwner), m_bSync(false) {}
- virtual ~SvLockBytes() { close(); }
+ virtual ~SvLockBytes() override { close(); }
const SvStream * GetStream() const { return m_pStream; }
@@ -589,7 +589,7 @@ public:
// Switches to Read StreamMode on failed attempt of Write opening
SvFileStream( const OUString& rFileName, StreamMode eOpenMode );
SvFileStream();
- virtual ~SvFileStream();
+ virtual ~SvFileStream() override;
virtual void ResetError() override;
@@ -640,7 +640,7 @@ protected:
public:
SvMemoryStream( void* pBuf, sal_Size nSize, StreamMode eMode);
SvMemoryStream( sal_Size nInitSize=512, sal_Size nResize=64 );
- virtual ~SvMemoryStream();
+ virtual ~SvMemoryStream() override;
virtual void ResetError() override;
@@ -665,7 +665,7 @@ class TOOLS_DLLPUBLIC SvScriptStream: public SvStream
public:
SvScriptStream(const OUString& rUrl);
- virtual ~SvScriptStream();
+ virtual ~SvScriptStream() override;
/** Read a line of bytes.