summaryrefslogtreecommitdiff
path: root/forms/source/xforms
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 /forms/source/xforms
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 'forms/source/xforms')
-rw-r--r--forms/source/xforms/NameContainer.hxx2
-rw-r--r--forms/source/xforms/binding.hxx2
-rw-r--r--forms/source/xforms/collection.hxx2
-rw-r--r--forms/source/xforms/datatyperepository.hxx2
-rw-r--r--forms/source/xforms/datatypes.hxx2
-rw-r--r--forms/source/xforms/model.hxx2
-rw-r--r--forms/source/xforms/model_helper.hxx4
-rw-r--r--forms/source/xforms/propertysetbase.hxx4
-rw-r--r--forms/source/xforms/submission.hxx2
-rw-r--r--forms/source/xforms/xformsevent.hxx2
10 files changed, 12 insertions, 12 deletions
diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx
index e32797772e36..8e4cd809dbcc 100644
--- a/forms/source/xforms/NameContainer.hxx
+++ b/forms/source/xforms/NameContainer.hxx
@@ -84,7 +84,7 @@ protected:
public:
NameContainer() {}
- virtual ~NameContainer() {}
+ virtual ~NameContainer() override {}
// methods for XElementAccess
diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx
index a413e39eda63..42fba2ca7d72 100644
--- a/forms/source/xforms/binding.hxx
+++ b/forms/source/xforms/binding.hxx
@@ -157,7 +157,7 @@ private:
public:
Binding();
- virtual ~Binding();
+ virtual ~Binding() override;
// property methods: get/set value
diff --git a/forms/source/xforms/collection.hxx b/forms/source/xforms/collection.hxx
index 11ae4de55108..8ea1ae147c6e 100644
--- a/forms/source/xforms/collection.hxx
+++ b/forms/source/xforms/collection.hxx
@@ -61,7 +61,7 @@ protected:
public:
Collection() {}
- virtual ~Collection() {}
+ virtual ~Collection() override {}
const T& getItem( sal_Int32 n ) const
{
diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx
index 0d3723cdba48..15c7702c19f3 100644
--- a/forms/source/xforms/datatyperepository.hxx
+++ b/forms/source/xforms/datatyperepository.hxx
@@ -47,7 +47,7 @@ namespace xforms
ODataTypeRepository( );
protected:
- virtual ~ODataTypeRepository( );
+ virtual ~ODataTypeRepository( ) override;
// XDataTypeRepository
virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL getBasicDataType( sal_Int16 dataTypeClass ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx
index a319c56975ac..5f1d40551535 100644
--- a/forms/source/xforms/datatypes.hxx
+++ b/forms/source/xforms/datatypes.hxx
@@ -75,7 +75,7 @@ namespace xforms
protected:
// create basic data type
OXSDDataType( const OUString& _rName, sal_Int16 _nTypeClass );
- virtual ~OXSDDataType();
+ virtual ~OXSDDataType() override;
public:
DECLARE_XINTERFACE()
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index 70e067c8834c..87fe6066be3d 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -117,7 +117,7 @@ public:
/// create a new model with an empty, default instance
Model();
- virtual ~Model() throw();
+ virtual ~Model() throw() override;
// get Model implementation from API object
static Model* getModel( const css::uno::Reference<css::xforms::XModel>& );
diff --git a/forms/source/xforms/model_helper.hxx b/forms/source/xforms/model_helper.hxx
index c331861efd8d..23423b4a031f 100644
--- a/forms/source/xforms/model_helper.hxx
+++ b/forms/source/xforms/model_helper.hxx
@@ -53,7 +53,7 @@ class BindingCollection : public NamedCollection<css::uno::Reference<css::beans:
public:
explicit BindingCollection( Model* pModel ) : mpModel( pModel ) {}
- virtual ~BindingCollection() {}
+ virtual ~BindingCollection() override {}
virtual bool isValid( const T& t ) const override
{
@@ -80,7 +80,7 @@ class SubmissionCollection : public NamedCollection<css::uno::Reference<css::bea
public:
explicit SubmissionCollection( Model* pModel ) : mpModel( pModel ) {}
- virtual ~SubmissionCollection() {}
+ virtual ~SubmissionCollection() override {}
public:
virtual bool isValid( const T& t ) const override
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index 8563f0b9160c..4408f8a23c94 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -45,7 +45,7 @@ class PropertyAccessorBase : public salhelper::SimpleReferenceObject
{
protected:
PropertyAccessorBase() { }
- virtual ~PropertyAccessorBase();
+ virtual ~PropertyAccessorBase() override;
public:
@@ -188,7 +188,7 @@ private:
protected:
PropertySetBase();
- virtual ~PropertySetBase();
+ virtual ~PropertySetBase() override;
/** registers a new property to be supported by this instance
@param rProperty
diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx
index b847477298a5..d4521818839d 100644
--- a/forms/source/xforms/submission.hxx
+++ b/forms/source/xforms/submission.hxx
@@ -94,7 +94,7 @@ private:
public:
Submission();
- virtual ~Submission() throw();
+ virtual ~Submission() throw() override;
// property methods: get/set value
diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx
index 414458c04128..e3aff320f306 100644
--- a/forms/source/xforms/xformsevent.hxx
+++ b/forms/source/xforms/xformsevent.hxx
@@ -40,7 +40,7 @@ class XFormsEventConcrete : public cppu::WeakImplHelper< XFormsEvent > {
, m_cancelable(false)
{
}
- virtual ~XFormsEventConcrete() {}
+ virtual ~XFormsEventConcrete() override {}
virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override;