summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc/undobase.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/ui/inc/undobase.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/ui/inc/undobase.hxx')
-rw-r--r--sc/source/ui/inc/undobase.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index de3ae5f238a1..00d1532ab4b2 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -43,7 +43,7 @@ public:
typedef std::map<SCTAB, std::unique_ptr<sc::ColumnSpanSet>> DataSpansType;
ScSimpleUndo( ScDocShell* pDocSh );
- virtual ~ScSimpleUndo();
+ virtual ~ScSimpleUndo() override;
virtual bool Merge( SfxUndoAction *pNextAction ) override;
/// See SfxUndoAction::GetViewShellId().
@@ -84,7 +84,7 @@ class ScBlockUndo: public ScSimpleUndo
public:
ScBlockUndo( ScDocShell* pDocSh, const ScRange& rRange,
ScBlockUndoMode eBlockMode );
- virtual ~ScBlockUndo();
+ virtual ~ScBlockUndo() override;
protected:
ScRange aBlockRange;
@@ -104,7 +104,7 @@ class ScMultiBlockUndo: public ScSimpleUndo
{
public:
ScMultiBlockUndo(ScDocShell* pDocSh, const ScRangeList& rRanges);
- virtual ~ScMultiBlockUndo();
+ virtual ~ScMultiBlockUndo() override;
protected:
ScRangeList maBlockRanges;
@@ -130,7 +130,7 @@ protected:
public:
ScDBFuncUndo( ScDocShell* pDocSh, const ScRange& rOriginal );
- virtual ~ScDBFuncUndo();
+ virtual ~ScDBFuncUndo() override;
void BeginUndo();
void EndUndo();
@@ -146,7 +146,7 @@ public:
ScMoveUndo( ScDocShell* pDocSh,
ScDocument* pRefDoc, ScRefUndoData* pRefData,
ScMoveUndoMode eRefMode );
- virtual ~ScMoveUndo();
+ virtual ~ScMoveUndo() override;
protected:
SdrUndoAction* pDrawUndo;
@@ -170,7 +170,7 @@ class ScUndoWrapper: public SfxUndoAction // for manual merging of act
public:
ScUndoWrapper( SfxUndoAction* pUndo );
- virtual ~ScUndoWrapper();
+ virtual ~ScUndoWrapper() override;
SfxUndoAction* GetWrappedUndo() { return pWrappedUndo; }
void ForgetWrappedUndo();