summaryrefslogtreecommitdiff
path: root/reportdesign/inc
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 /reportdesign/inc
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 'reportdesign/inc')
-rw-r--r--reportdesign/inc/PropertyForward.hxx2
-rw-r--r--reportdesign/inc/ReportDefinition.hxx2
-rw-r--r--reportdesign/inc/RptModel.hxx2
-rw-r--r--reportdesign/inc/RptObject.hxx8
-rw-r--r--reportdesign/inc/RptPage.hxx2
-rw-r--r--reportdesign/inc/UndoActions.hxx4
-rw-r--r--reportdesign/inc/UndoEnv.hxx2
7 files changed, 11 insertions, 11 deletions
diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx
index caf0d530331e..87a18b059b16 100644
--- a/reportdesign/inc/PropertyForward.hxx
+++ b/reportdesign/inc/PropertyForward.hxx
@@ -51,7 +51,7 @@ namespace rptui
OPropertyMediator(OPropertyMediator&) = delete;
void operator =(OPropertyMediator&) = delete;
protected:
- virtual ~OPropertyMediator();
+ virtual ~OPropertyMediator() override;
/** this function is called upon disposing the component
*/
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index e8c404b34a50..daad8704918f 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -166,7 +166,7 @@ namespace reportdesign
);
protected:
- virtual ~OReportDefinition();
+ virtual ~OReportDefinition() override;
/** this function is called upon disposing the component
*/
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index 5992d21fcd78..d20ce8a329c5 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -55,7 +55,7 @@ private:
public:
OReportModel(::reportdesign::OReportDefinition* _pReportDefinition);
- virtual ~OReportModel();
+ virtual ~OReportModel() override;
virtual void SetChanged(bool bFlg = true) override;
virtual SdrPage* AllocPage(bool bMasterPage) override;
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 6d96397fd685..8058bb2d472a 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -53,7 +53,7 @@ typedef ::std::multimap< sal_Int16, OUString, ::std::less< sal_Int16 > > IndexTo
void operator =(DlgEdHint&) = delete;
public:
DlgEdHint( DlgEdHintKind eHint );
- virtual ~DlgEdHint();
+ virtual ~DlgEdHint() override;
inline DlgEdHintKind GetKind() const { return eHintKind; }
};
@@ -145,7 +145,7 @@ protected:
public:
- virtual ~OCustomShape();
+ virtual ~OCustomShape() override;
virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override;
@@ -189,7 +189,7 @@ protected:
public:
- virtual ~OOle2Obj();
+ virtual ~OOle2Obj() override;
virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override;
@@ -223,7 +223,7 @@ protected:
,const OUString& rModelName
,sal_uInt16 _nObjectType);
- virtual ~OUnoObject();
+ virtual ~OUnoObject() override;
virtual void NbcMove( const Size& rSize ) override;
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override;
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index 0ae4902119ea..a6f1683a399d 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -47,7 +47,7 @@ class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage
// (BegDragObj)
void removeTempObject(SdrObject *_pToRemoveObj);
- virtual ~OReportPage();
+ virtual ~OReportPage() override;
protected:
virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override;
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 3d56330fac68..5038bf0c4301 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -157,7 +157,7 @@ namespace rptui
public:
OCommentUndoAction( SdrModel& rMod
,sal_uInt16 nCommentID);
- virtual ~OCommentUndoAction();
+ virtual ~OCommentUndoAction() override;
virtual OUString GetComment() const override { return m_strComment; }
virtual void Undo() override;
@@ -185,7 +185,7 @@ namespace rptui
,const css::uno::Reference< css::container::XIndexContainer >& rContainer
,const css::uno::Reference< css::uno::XInterface>& xElem
,sal_uInt16 _nCommentId);
- virtual ~OUndoContainerAction();
+ virtual ~OUndoContainerAction() override;
virtual void Undo() override;
virtual void Redo() override;
diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index d7cf5e5173b9..42563f437094 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -46,7 +46,7 @@ namespace rptui
OXUndoEnvironment& operator=(const OXUndoEnvironment&) = delete;
protected:
- virtual ~OXUndoEnvironment();
+ virtual ~OXUndoEnvironment() override;
void SetUndoMode(bool _bUndo);