diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /include/connectivity | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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/connectivity')
-rw-r--r-- | include/connectivity/CommonTools.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/PColumn.hxx | 4 | ||||
-rw-r--r-- | include/connectivity/ParameterCont.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/TColumnsHelper.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/TTableHelper.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/internalnode.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/paramwrapper.hxx | 4 | ||||
-rw-r--r-- | include/connectivity/sdbcx/VCatalog.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/sdbcx/VColumn.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/sdbcx/VDescriptor.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/sdbcx/VGroup.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/sdbcx/VIndex.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/sdbcx/VKey.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/sdbcx/VKeyColumn.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/sdbcx/VTable.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/sdbcx/VUser.hxx | 2 | ||||
-rw-r--r-- | include/connectivity/sdbcx/VView.hxx | 2 |
17 files changed, 19 insertions, 19 deletions
diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx index 594619d489d8..16f7e070d627 100644 --- a/include/connectivity/CommonTools.hxx +++ b/include/connectivity/CommonTools.hxx @@ -68,7 +68,7 @@ namespace connectivity std::vector< VectorVal > m_vector; protected: - virtual ~ORefVector(){} + virtual ~ORefVector() override {} public: typedef std::vector< VectorVal > Vector; diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx index 76d61eee986f..153b57a53054 100644 --- a/include/connectivity/PColumn.hxx +++ b/include/connectivity/PColumn.hxx @@ -55,7 +55,7 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; - virtual ~OParseColumn(); + virtual ~OParseColumn() override; public: OParseColumn(const css::uno::Reference< css::beans::XPropertySet>& _xColumn, bool _bCase); OParseColumn(const OUString& Name, @@ -122,7 +122,7 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; - virtual ~OOrderColumn(); + virtual ~OOrderColumn() override; public: OOrderColumn( const css::uno::Reference< css::beans::XPropertySet>& _xColumn, diff --git a/include/connectivity/ParameterCont.hxx b/include/connectivity/ParameterCont.hxx index ff6686f5d7db..c2572ef8030b 100644 --- a/include/connectivity/ParameterCont.hxx +++ b/include/connectivity/ParameterCont.hxx @@ -41,7 +41,7 @@ namespace dbtools virtual void SAL_CALL setParameters( const css::uno::Sequence< css::beans::PropertyValue >& _rValues ) throw(css::uno::RuntimeException, std::exception) override; protected: - virtual ~OParameterContinuation() { } + virtual ~OParameterContinuation() override { } private: OParameterContinuation(const OParameterContinuation&) = delete; void operator =(const OParameterContinuation&) = delete; diff --git a/include/connectivity/TColumnsHelper.hxx b/include/connectivity/TColumnsHelper.hxx index d4e52960ef12..80de90eb10fc 100644 --- a/include/connectivity/TColumnsHelper.hxx +++ b/include/connectivity/TColumnsHelper.hxx @@ -49,7 +49,7 @@ namespace connectivity ,const TStringVector &_rVector ,bool _bUseHardRef = true ); - virtual ~OColumnsHelper(); + virtual ~OColumnsHelper() override; /** set the parent of the columns. Can also be <NULL/>. @param _pTable diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx index 0000cf974a45..847094bf709b 100644 --- a/include/connectivity/TTableHelper.hxx +++ b/include/connectivity/TTableHelper.hxx @@ -112,7 +112,7 @@ namespace connectivity */ virtual OUString getRenameStart() const; - virtual ~OTableHelper(); + virtual ~OTableHelper() override; public: virtual void refreshColumns() override; diff --git a/include/connectivity/internalnode.hxx b/include/connectivity/internalnode.hxx index b0d3ead82752..600cab490bb1 100644 --- a/include/connectivity/internalnode.hxx +++ b/include/connectivity/internalnode.hxx @@ -42,7 +42,7 @@ namespace connectivity SQLNodeType eNodeType, sal_uInt32 nNodeID = 0); - virtual ~OSQLInternalNode(); + virtual ~OSQLInternalNode() override; }; } diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index 39e45674c20f..2ccd288f87dd 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -107,7 +107,7 @@ namespace param void SAL_CALL dispose(); protected: - virtual ~ParameterWrapper(); + virtual ~ParameterWrapper() override; // disambiguations using ::cppu::OPropertySetHelper::getFastPropertyValue; @@ -137,7 +137,7 @@ namespace param Parameters m_aParameters; protected: - virtual ~ParameterWrapperContainer(); + virtual ~ParameterWrapperContainer() override; public: /** creates an empty container diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx index 4254fdb2ee78..f7eee9ea6a26 100644 --- a/include/connectivity/sdbcx/VCatalog.hxx +++ b/include/connectivity/sdbcx/VCatalog.hxx @@ -90,7 +90,7 @@ namespace connectivity public: OCatalog(const css::uno::Reference< css::sdbc::XConnection> &_xConnection); - virtual ~OCatalog(); + virtual ~OCatalog() override; DECLARE_SERVICE_INFO(); diff --git a/include/connectivity/sdbcx/VColumn.hxx b/include/connectivity/sdbcx/VColumn.hxx index 1bc671d8f29d..e28b01344d0b 100644 --- a/include/connectivity/sdbcx/VColumn.hxx +++ b/include/connectivity/sdbcx/VColumn.hxx @@ -71,7 +71,7 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; - virtual ~OColumn(); + virtual ~OColumn() override; public: virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; diff --git a/include/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx index 6aff71c61e5a..d2470578121e 100644 --- a/include/connectivity/sdbcx/VDescriptor.hxx +++ b/include/connectivity/sdbcx/VDescriptor.hxx @@ -59,7 +59,7 @@ namespace connectivity public: ODescriptor(::cppu::OBroadcastHelper& _rBHelper, bool _bCase, bool _bNew = false); - virtual ~ODescriptor(); + virtual ~ODescriptor() override; bool isNew() const { return m_bNew; } void setNew(bool _bNew); diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx index bb985e69c55b..3ab99f5a4721 100644 --- a/include/connectivity/sdbcx/VGroup.hxx +++ b/include/connectivity/sdbcx/VGroup.hxx @@ -66,7 +66,7 @@ namespace connectivity public: OGroup(bool _bCase); OGroup( const OUString& Name, bool _bCase); - virtual ~OGroup(); + virtual ~OGroup() override; DECLARE_SERVICE_INFO(); // XInterface diff --git a/include/connectivity/sdbcx/VIndex.hxx b/include/connectivity/sdbcx/VIndex.hxx index 2f1345f75e42..4cd32c218671 100644 --- a/include/connectivity/sdbcx/VIndex.hxx +++ b/include/connectivity/sdbcx/VIndex.hxx @@ -73,7 +73,7 @@ namespace connectivity bool _isClustered, bool _bCase); - virtual ~OIndex( ); + virtual ~OIndex( ) override; DECLARE_SERVICE_INFO(); diff --git a/include/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx index d856e7399af2..2290ed7669e2 100644 --- a/include/connectivity/sdbcx/VKey.hxx +++ b/include/connectivity/sdbcx/VKey.hxx @@ -80,7 +80,7 @@ namespace connectivity OKey(bool _bCase); OKey(const OUString& Name,const std::shared_ptr<KeyProperties>& _rProps,bool _bCase); - virtual ~OKey( ); + virtual ~OKey( ) override; DECLARE_SERVICE_INFO(); //XInterface diff --git a/include/connectivity/sdbcx/VKeyColumn.hxx b/include/connectivity/sdbcx/VKeyColumn.hxx index 0db663491105..b01076093ead 100644 --- a/include/connectivity/sdbcx/VKeyColumn.hxx +++ b/include/connectivity/sdbcx/VKeyColumn.hxx @@ -55,7 +55,7 @@ namespace connectivity const OUString& SchemaName, const OUString& TableName); // just to make it not inline - virtual ~OKeyColumn(); + virtual ~OKeyColumn() override; virtual void construct() override; DECLARE_SERVICE_INFO(); diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx index 00be9f3746a6..83047e6f31f4 100644 --- a/include/connectivity/sdbcx/VTable.hxx +++ b/include/connectivity/sdbcx/VTable.hxx @@ -94,7 +94,7 @@ namespace connectivity const OUString& SchemaName = OUString(), const OUString& CatalogName = OUString()); - virtual ~OTable(); + virtual ~OTable() override; DECLARE_SERVICE_INFO(); //XInterface diff --git a/include/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx index 2dcd02fdf755..0bef5e90cb97 100644 --- a/include/connectivity/sdbcx/VUser.hxx +++ b/include/connectivity/sdbcx/VUser.hxx @@ -64,7 +64,7 @@ namespace connectivity OUser(bool _bCase); OUser(const OUString& Name,bool _bCase); - virtual ~OUser( ); + virtual ~OUser( ) override; DECLARE_SERVICE_INFO(); diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx index 7778ac179667..2cb6e25f8ca2 100644 --- a/include/connectivity/sdbcx/VView.hxx +++ b/include/connectivity/sdbcx/VView.hxx @@ -71,7 +71,7 @@ namespace connectivity const OUString& _rCommand = OUString(), const OUString& _rSchemaName = OUString(), const OUString& _rCatalogName = OUString()); - virtual ~OView(); + virtual ~OView() override; // ODescriptor virtual void construct() override; |