summaryrefslogtreecommitdiff
path: root/toolkit
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 /toolkit
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 'toolkit')
-rw-r--r--toolkit/source/awt/asynccallback.cxx2
-rw-r--r--toolkit/source/awt/stylesettings.hxx2
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx4
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx2
-rw-r--r--toolkit/source/controls/grid/defaultgridcolumnmodel.cxx2
-rw-r--r--toolkit/source/controls/grid/defaultgriddatamodel.cxx2
-rw-r--r--toolkit/source/controls/grid/gridcolumn.hxx2
-rw-r--r--toolkit/source/controls/grid/gridcontrol.hxx2
-rw-r--r--toolkit/source/controls/grid/sortablegriddatamodel.cxx2
-rw-r--r--toolkit/source/controls/spinningprogress.cxx2
-rw-r--r--toolkit/source/controls/tree/treedatamodel.cxx4
-rw-r--r--toolkit/source/helper/accessibilityclient.cxx2
12 files changed, 14 insertions, 14 deletions
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index 2d30afedc206..35ccc6a547e6 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -63,7 +63,7 @@ private:
DECL_STATIC_LINK_TYPED( AsyncCallback, Notify_Impl, void*, void );
- virtual ~AsyncCallback() {}
+ virtual ~AsyncCallback() override {}
};
// com.sun.star.uno.XServiceInfo:
diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx
index 6e21c41c02f3..e0ada104ffa8 100644
--- a/toolkit/source/awt/stylesettings.hxx
+++ b/toolkit/source/awt/stylesettings.hxx
@@ -47,7 +47,7 @@ namespace toolkit
{
public:
WindowStyleSettings( ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow );
- virtual ~WindowStyleSettings();
+ virtual ~WindowStyleSettings() override;
void dispose();
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index d616e04fff0d..6acd3bbc090b 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -154,7 +154,7 @@ public:
Start();
}
- virtual ~Pause()
+ virtual ~Pause() override
{
}
@@ -219,7 +219,7 @@ protected:
public:
VCLXToolkit();
- virtual ~VCLXToolkit();
+ virtual ~VCLXToolkit() override;
// css::awt::XToolkitExperimental
virtual void SAL_CALL processEventsToIdle()
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 28ff16a5d01d..490b644faa81 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -149,7 +149,7 @@ protected:
public:
explicit UnoControlDialogModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
UnoControlDialogModel( const UnoControlDialogModel& rModel );
- virtual ~UnoControlDialogModel();
+ virtual ~UnoControlDialogModel() override;
UnoControlModel* Clone() const override;
// css::beans::XMultiPropertySet
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 317163344496..6099359ce8fe 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -56,7 +56,7 @@ class DefaultGridColumnModel :public ::cppu::BaseMutex
public:
DefaultGridColumnModel();
DefaultGridColumnModel( DefaultGridColumnModel const & i_copySource );
- virtual ~DefaultGridColumnModel();
+ virtual ~DefaultGridColumnModel() override;
// XGridColumnModel
virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index 5ab5a7dd6d79..e5c7e006a6a0 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -53,7 +53,7 @@ class DefaultGridDataModel :public ::cppu::BaseMutex
public:
DefaultGridDataModel();
DefaultGridDataModel( DefaultGridDataModel const & i_copySource );
- virtual ~DefaultGridDataModel();
+ virtual ~DefaultGridDataModel() override;
// XMutableGridDataModel
virtual void SAL_CALL addRow( const Any& i_heading, const css::uno::Sequence< css::uno::Any >& Data ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx
index b4329fd6fee2..d0001b0c20cb 100644
--- a/toolkit/source/controls/grid/gridcolumn.hxx
+++ b/toolkit/source/controls/grid/gridcolumn.hxx
@@ -47,7 +47,7 @@ class GridColumn :public ::cppu::BaseMutex
public:
GridColumn();
GridColumn( GridColumn const & i_copySource );
- virtual ~GridColumn();
+ virtual ~GridColumn() override;
// css::awt::grid::XGridColumn
virtual css::uno::Any SAL_CALL getIdentifier() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index e7e9cb7db709..afc22b760c00 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -134,7 +134,7 @@ public:
using UnoControl::getPeer;
protected:
- virtual ~UnoGridControl();
+ virtual ~UnoGridControl() override;
private:
SelectionListenerMultiplexer m_aSelectionListeners;
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index 1138c18d2e3b..af7898d07554 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -69,7 +69,7 @@ public:
bool isInitialized() const { return m_isInitialized; }
protected:
- virtual ~SortableGridDataModel();
+ virtual ~SortableGridDataModel() override;
public:
// XSortableGridData
diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx
index 73fd74fe920d..231a3e85f534 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -48,7 +48,7 @@ public:
css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
protected:
- virtual ~SpinningProgressControlModel();
+ virtual ~SpinningProgressControlModel() override;
};
SpinningProgressControlModel::SpinningProgressControlModel( Reference< XComponentContext > const & i_factory )
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index c94737775ee2..e952a2a328e4 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -54,7 +54,7 @@ class MutableTreeDataModel : public ::cppu::WeakAggImplHelper2< XMutableTreeData
{
public:
MutableTreeDataModel();
- virtual ~MutableTreeDataModel();
+ virtual ~MutableTreeDataModel() override;
void broadcast( broadcast_type eType, const Reference< XTreeNode >& xParentNode, const Reference< XTreeNode >& rNode );
@@ -88,7 +88,7 @@ class MutableTreeNode: public ::cppu::WeakAggImplHelper2< XMutableTreeNode, XSer
public:
MutableTreeNode( const MutableTreeDataModelRef& xModel, const Any& rValue, bool bChildrenOnDemand );
- virtual ~MutableTreeNode();
+ virtual ~MutableTreeNode() override;
void setParent( MutableTreeNode* pParent );
void broadcast_changes();
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index d004ba7edd0c..a551723119bd 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -57,7 +57,7 @@ namespace toolkit
AccessibleDummyFactory& operator=(const AccessibleDummyFactory&) = delete;
protected:
- virtual ~AccessibleDummyFactory();
+ virtual ~AccessibleDummyFactory() override;
public:
// IAccessibleFactory