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 /unotools | |
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 'unotools')
26 files changed, 30 insertions, 30 deletions
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index 6279a03555ed..fe99ca33557b 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -92,7 +92,7 @@ class SvtCommandOptions_Impl : public ConfigItem public: SvtCommandOptions_Impl(); - virtual ~SvtCommandOptions_Impl(); + virtual ~SvtCommandOptions_Impl() override; /*-**************************************************************************************************** @short called for notify of configmanager diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index 4460b5eae04b..cd86de8b32e8 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -219,7 +219,7 @@ class SvtCompatibilityOptions_Impl : public ConfigItem // constructor / destructor SvtCompatibilityOptions_Impl(); - virtual ~SvtCompatibilityOptions_Impl(); + virtual ~SvtCompatibilityOptions_Impl() override; void SetDefault( const OUString & sName, bool bValue ); diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 694acb7d1484..348cfc8ba562 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -71,7 +71,7 @@ namespace utl{ ConfigItem* pParent; const Sequence< OUString > aPropertyNames; ConfigChangeListener_Impl(ConfigItem& rItem, const Sequence< OUString >& rNames); - virtual ~ConfigChangeListener_Impl(); + virtual ~ConfigChangeListener_Impl() override; //XChangesListener virtual void SAL_CALL changesOccurred( const ChangesEvent& Event ) throw(RuntimeException, std::exception) override; diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx index 5d0ad67aef8f..160df5fa8ec6 100644 --- a/unotools/source/config/defaultoptions.cxx +++ b/unotools/source/config/defaultoptions.cxx @@ -93,7 +93,7 @@ public: OUString m_aUserDictionaryPath; SvtDefaultOptions_Impl(); - virtual ~SvtDefaultOptions_Impl(); + virtual ~SvtDefaultOptions_Impl() override; OUString GetDefaultPath( sal_uInt16 nId ) const; virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override; diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index 4259f06bd424..5cb168baff63 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.cxx @@ -155,7 +155,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem public: SvtDynamicMenuOptions_Impl(); - virtual ~SvtDynamicMenuOptions_Impl(); + virtual ~SvtDynamicMenuOptions_Impl() override; /*-**************************************************************************************************** @short called for notify of configmanager diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 353d1074d4f3..6b70a39e902d 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -92,7 +92,7 @@ private: public: GlobalEventConfig_Impl( ); - virtual ~GlobalEventConfig_Impl( ); + virtual ~GlobalEventConfig_Impl( ) override; void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override; diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index fbb665f088fb..a67aa9570b30 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -57,7 +57,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem { public: SvtExtendedSecurityOptions_Impl(); - virtual ~SvtExtendedSecurityOptions_Impl(); + virtual ~SvtExtendedSecurityOptions_Impl() override; /*-**************************************************************************************************** @short called for notify of configmanager diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index 55785aa9273d..0cb2b29f12e7 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.cxx @@ -67,7 +67,7 @@ public: utl::ConfigItem(rRoot), bLoadVBA(false), bSaveVBA(false) {} - virtual ~SvtAppFilterOptions_Impl(); + virtual ~SvtAppFilterOptions_Impl() override; virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override; void Load(); diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx index 12f8285df830..b51d4468e832 100644 --- a/unotools/source/config/fontoptions.cxx +++ b/unotools/source/config/fontoptions.cxx @@ -48,7 +48,7 @@ class SvtFontOptions_Impl : public ConfigItem public: SvtFontOptions_Impl(); - virtual ~SvtFontOptions_Impl(); + virtual ~SvtFontOptions_Impl() override; /*-**************************************************************************************************** @short called for notify of configmanager diff --git a/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx index 71383dfba57b..9a1626dadc88 100644 --- a/unotools/source/config/itemholder1.hxx +++ b/unotools/source/config/itemholder1.hxx @@ -37,7 +37,7 @@ class ItemHolder1 : private ItemHolderMutexBase public: ItemHolder1(); - virtual ~ItemHolder1(); + virtual ~ItemHolder1() override; static void holdConfigItem(EItem eItem); // uno interface diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 998bf16e40f8..451518e1bb6c 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -158,7 +158,7 @@ class SvtLinguConfigItem : public utl::ConfigItem public: SvtLinguConfigItem(); - virtual ~SvtLinguConfigItem(); + virtual ~SvtLinguConfigItem() override; // utl::ConfigItem virtual void Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override; diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx index a694ae356e90..4d5a953890ce 100644 --- a/unotools/source/config/misccfg.cxx +++ b/unotools/source/config/misccfg.cxx @@ -53,7 +53,7 @@ private: public: SfxMiscCfg( ); - virtual ~SfxMiscCfg( ); + virtual ~SfxMiscCfg( ) override; virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override; diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 1e2c1d7dc279..8823d04a1525 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -246,7 +246,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem // constructor / destructor SvtModuleOptions_Impl(); - virtual ~SvtModuleOptions_Impl(); + virtual ~SvtModuleOptions_Impl() override; // override methods of baseclass diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx index e325f63b92c5..7e9cc8719c99 100644 --- a/unotools/source/config/printwarningoptions.cxx +++ b/unotools/source/config/printwarningoptions.cxx @@ -55,7 +55,7 @@ public: // constructor / destructor SvtPrintWarningOptions_Impl(); - virtual ~SvtPrintWarningOptions_Impl(); + virtual ~SvtPrintWarningOptions_Impl() override; // override methods of baseclass diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 84f860dcc2ef..fdad10af5d0d 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -97,7 +97,7 @@ class SvtSaveOptions_Impl : public utl::ConfigItem public: SvtSaveOptions_Impl(); - virtual ~SvtSaveOptions_Impl(); + virtual ~SvtSaveOptions_Impl() override; virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; @@ -770,7 +770,7 @@ private: public: SvtLoadOptions_Impl(); - virtual ~SvtLoadOptions_Impl(); + virtual ~SvtLoadOptions_Impl() override; virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index 79e1030f604f..9e799138fb04 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -57,7 +57,7 @@ protected: public: SvtSearchOptions_Impl(); - virtual ~SvtSearchOptions_Impl(); + virtual ~SvtSearchOptions_Impl() override; virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index af8be604c5e1..72e103feb031 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -110,7 +110,7 @@ class SvtSecurityOptions_Impl : public ConfigItem // constructor / destructor SvtSecurityOptions_Impl(); - virtual ~SvtSecurityOptions_Impl(); + virtual ~SvtSecurityOptions_Impl() override; // override methods of baseclass diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index d3bbfbed99cc..b3d7647911a4 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -72,7 +72,7 @@ class SvtSysLocaleOptions_Impl : public utl::ConfigItem public: SvtSysLocaleOptions_Impl(); - virtual ~SvtSysLocaleOptions_Impl(); + virtual ~SvtSysLocaleOptions_Impl() override; virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; diff --git a/unotools/source/misc/ServiceDocumenter.hxx b/unotools/source/misc/ServiceDocumenter.hxx index fd62461ba15b..b600c5ff03be 100644 --- a/unotools/source/misc/ServiceDocumenter.hxx +++ b/unotools/source/misc/ServiceDocumenter.hxx @@ -37,7 +37,7 @@ class ServiceDocumenter : public ::cppu::WeakImplHelper< virtual void SAL_CALL showInterfaceDocs( const ::css::uno::Reference< ::css::lang::XTypeProvider >& xTypeProvider ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL showCoreDocs( const ::css::uno::Reference< ::css::lang::XServiceInfo >& xService) throw (css::uno::RuntimeException, std::exception) override; protected: - virtual ~ServiceDocumenter() + virtual ~ServiceDocumenter() override {}; private: css::uno::Reference< css::uno::XComponentContext> m_xContext; diff --git a/unotools/source/misc/closeveto.cxx b/unotools/source/misc/closeveto.cxx index 3eeabc8eaee2..18f352ff3b40 100644 --- a/unotools/source/misc/closeveto.cxx +++ b/unotools/source/misc/closeveto.cxx @@ -60,7 +60,7 @@ namespace utl bool hasOwnership() const { return m_bHasOwnership; } protected: - virtual ~CloseListener_Impl() + virtual ~CloseListener_Impl() override { } diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx index 08e353f4701a..4d27a6d49208 100644 --- a/unotools/source/misc/desktopterminationobserver.cxx +++ b/unotools/source/misc/desktopterminationobserver.cxx @@ -63,7 +63,7 @@ namespace utl protected: OObserverImpl(); - virtual ~OObserverImpl(); + virtual ~OObserverImpl() override; private: // XTerminateListener diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx index 21557c3dedd5..f4a2ae4536b9 100644 --- a/unotools/source/misc/sharedunocomponent.cxx +++ b/unotools/source/misc/sharedunocomponent.cxx @@ -84,7 +84,7 @@ namespace utl void nf_closeComponent(); protected: - virtual ~CloseableComponentImpl(); + virtual ~CloseableComponentImpl() override; // XCloseListener overridables virtual void SAL_CALL queryClosing( const EventObject& Source, sal_Bool GetsOwnership ) throw (CloseVetoException, RuntimeException, std::exception) override; diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx index b212100a6b06..6b0155b8653b 100644 --- a/unotools/source/misc/syslocale.cxx +++ b/unotools/source/misc/syslocale.cxx @@ -48,7 +48,7 @@ public: CharClass* pCharClass; SvtSysLocale_Impl(); - virtual ~SvtSysLocale_Impl(); + virtual ~SvtSysLocale_Impl() override; CharClass* GetCharClass(); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) override; diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx index 3ecd7766816a..38b38167547b 100644 --- a/unotools/source/ucbhelper/XTempFile.hxx +++ b/unotools/source/ucbhelper/XTempFile.hxx @@ -117,7 +117,7 @@ public: virtual void SAL_CALL truncate() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual ~OTempFileService (); + virtual ~OTempFileService () override; }; #endif diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 658899b9df85..b814387336da 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -229,7 +229,7 @@ public: RuntimeException ); - virtual ~Moderator(); + virtual ~Moderator() override; enum ResultType { NORESULT, @@ -341,7 +341,7 @@ public: explicit ModeratorsActiveDataStreamer(Moderator &theModerator); - virtual ~ModeratorsActiveDataStreamer(); + virtual ~ModeratorsActiveDataStreamer() override; // XActiveDataStreamer virtual void SAL_CALL @@ -377,7 +377,7 @@ public: explicit ModeratorsActiveDataSink(Moderator &theModerator); - virtual ~ModeratorsActiveDataSink(); + virtual ~ModeratorsActiveDataSink() override; // XActiveDataSink. virtual void SAL_CALL @@ -460,7 +460,7 @@ public: explicit ModeratorsInteractionHandler(Moderator &theModerator); - virtual ~ModeratorsInteractionHandler(); + virtual ~ModeratorsInteractionHandler() override; virtual void SAL_CALL handle( const Reference<XInteractionRequest >& Request ) diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx index 875f5a03d6f3..f9d3fb29de60 100644 --- a/unotools/source/ucbhelper/ucblockbytes.hxx +++ b/unotools/source/ucbhelper/ucblockbytes.hxx @@ -89,7 +89,7 @@ class UcbLockBytes : public virtual SvLockBytes UcbLockBytes(); protected: - virtual ~UcbLockBytes(); + virtual ~UcbLockBytes() override; public: // properties: Referer, PostMimeType |