diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:18:35 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:22:54 +0200 |
commit | 362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch) | |
tree | 0b432c049d580dcac6130bca9fb028bab8af8fa8 /unotools | |
parent | b66d87086804460c1986df1b832fd6b2ea075a90 (diff) |
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked
"override," but at least some MSVC versions complain about it, so at least make
sure such destructors are explicitly marked "virtual."
Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/source/config/cmdoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/compatibility.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/configitem.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/dynamicmenuoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/extendedsecurityoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/fltrcfg.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/fontoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/localisationoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/misccfg.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/moduleoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/printwarningoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/saveopt.cxx | 4 | ||||
-rw-r--r-- | unotools/source/config/securityoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/misc/closeveto.cxx | 2 | ||||
-rw-r--r-- | unotools/source/misc/desktopterminationobserver.cxx | 2 | ||||
-rw-r--r-- | unotools/source/ucbhelper/ucblockbytes.cxx | 10 |
16 files changed, 21 insertions, 21 deletions
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index cfa440ae2acf..4145357ae6f9 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -119,7 +119,7 @@ class SvtCommandOptions_Impl : public ConfigItem public: SvtCommandOptions_Impl(); - ~SvtCommandOptions_Impl(); + virtual ~SvtCommandOptions_Impl(); /*-**************************************************************************************************** @short called for notify of configmanager diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index cb1488cd83fe..51b27ce54148 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -225,7 +225,7 @@ class SvtCompatibilityOptions_Impl : public ConfigItem SvtCompatibilityOptions_Impl(); - ~SvtCompatibilityOptions_Impl(); + virtual ~SvtCompatibilityOptions_Impl(); void SetDefault( const OUString & sName, bool bValue ); diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 4285c4980ebc..5a7ea5328c0a 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -83,7 +83,7 @@ namespace utl{ ConfigItem* pParent; const Sequence< OUString > aPropertyNames; ConfigChangeListener_Impl(ConfigItem& rItem, const Sequence< OUString >& rNames); - ~ConfigChangeListener_Impl(); + virtual ~ConfigChangeListener_Impl(); //XChangesListener virtual void SAL_CALL changesOccurred( const ChangesEvent& Event ) throw(RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index 92052b1f698d..2751f7d186f9 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.cxx @@ -222,7 +222,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem public: SvtDynamicMenuOptions_Impl(); - ~SvtDynamicMenuOptions_Impl(); + virtual ~SvtDynamicMenuOptions_Impl(); /*-**************************************************************************************************** @short called for notify of configmanager diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index 0121fc09762f..f56319e2f572 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -63,7 +63,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem { public: SvtExtendedSecurityOptions_Impl(); - ~SvtExtendedSecurityOptions_Impl(); + virtual ~SvtExtendedSecurityOptions_Impl(); /*-**************************************************************************************************** @short called for notify of configmanager diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index 8371b3089e0a..c86926cb1dfc 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.cxx @@ -60,7 +60,7 @@ public: utl::ConfigItem(rRoot), bLoadVBA(false), bSaveVBA(false) {} - ~SvtAppFilterOptions_Impl(); + virtual ~SvtAppFilterOptions_Impl(); virtual void Commit() SAL_OVERRIDE; virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; void Load(); diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx index c6ac4757ed1e..dc5e62a9dd40 100644 --- a/unotools/source/config/fontoptions.cxx +++ b/unotools/source/config/fontoptions.cxx @@ -50,7 +50,7 @@ class SvtFontOptions_Impl : public ConfigItem public: SvtFontOptions_Impl(); - ~SvtFontOptions_Impl(); + virtual ~SvtFontOptions_Impl(); /*-**************************************************************************************************** @short called for notify of configmanager diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx index 2c30cd179357..f27941698701 100644 --- a/unotools/source/config/localisationoptions.cxx +++ b/unotools/source/config/localisationoptions.cxx @@ -49,7 +49,7 @@ class SvtLocalisationOptions_Impl : public ConfigItem public: SvtLocalisationOptions_Impl(); - ~SvtLocalisationOptions_Impl(); + virtual ~SvtLocalisationOptions_Impl(); /*-**************************************************************************************************** @short called for notify of configmanager diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx index 753f3aa7c77d..7fa66b9037b4 100644 --- a/unotools/source/config/misccfg.cxx +++ b/unotools/source/config/misccfg.cxx @@ -49,7 +49,7 @@ class SfxMiscCfg : public utl::ConfigItem public: SfxMiscCfg( ); - ~SfxMiscCfg( ); + virtual ~SfxMiscCfg( ); virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; virtual void Commit() SAL_OVERRIDE; diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 6076435dddde..a246788903b9 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -307,7 +307,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem // constructor / destructor SvtModuleOptions_Impl(); - ~SvtModuleOptions_Impl(); + virtual ~SvtModuleOptions_Impl(); // overloaded methods of baseclass diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx index af844f530e29..abe3e5b81356 100644 --- a/unotools/source/config/printwarningoptions.cxx +++ b/unotools/source/config/printwarningoptions.cxx @@ -61,7 +61,7 @@ public: SvtPrintWarningOptions_Impl(); - ~SvtPrintWarningOptions_Impl(); + virtual ~SvtPrintWarningOptions_Impl(); // overloaded methods of baseclass diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index d3c659256aff..c739dff6b266 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -91,7 +91,7 @@ class SvtSaveOptions_Impl : public utl::ConfigItem public: SvtSaveOptions_Impl(); - ~SvtSaveOptions_Impl(); + virtual ~SvtSaveOptions_Impl(); virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; virtual void Commit() SAL_OVERRIDE; @@ -759,7 +759,7 @@ class SvtLoadOptions_Impl : public utl::ConfigItem public: SvtLoadOptions_Impl(); - ~SvtLoadOptions_Impl(); + virtual ~SvtLoadOptions_Impl(); virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; virtual void Commit() SAL_OVERRIDE; diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 1ee9f67777b9..ad4015bbae07 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -117,7 +117,7 @@ class SvtSecurityOptions_Impl : public ConfigItem SvtSecurityOptions_Impl(); - ~SvtSecurityOptions_Impl(); + virtual ~SvtSecurityOptions_Impl(); // overloaded methods of baseclass diff --git a/unotools/source/misc/closeveto.cxx b/unotools/source/misc/closeveto.cxx index 7fef9334c64a..39ebc9bf0d47 100644 --- a/unotools/source/misc/closeveto.cxx +++ b/unotools/source/misc/closeveto.cxx @@ -69,7 +69,7 @@ namespace utl bool hasOwnership() const { return m_bHasOwnership; } protected: - ~CloseListener_Impl() + virtual ~CloseListener_Impl() { } diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx index 27afe06b1a24..42ef51c13dc0 100644 --- a/unotools/source/misc/desktopterminationobserver.cxx +++ b/unotools/source/misc/desktopterminationobserver.cxx @@ -66,7 +66,7 @@ namespace utl protected: OObserverImpl(); - ~OObserverImpl(); + virtual ~OObserverImpl(); private: // XTerminateListener diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 8193fa63c73a..c4c6c24ae1c5 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -252,7 +252,7 @@ public: RuntimeException ); - ~Moderator(); + virtual ~Moderator(); enum ResultType { @@ -373,7 +373,7 @@ public: ModeratorsActiveDataStreamer(Moderator &theModerator); - ~ModeratorsActiveDataStreamer(); + virtual ~ModeratorsActiveDataStreamer(); // XActiveDataStreamer virtual void SAL_CALL @@ -411,7 +411,7 @@ public: ModeratorsActiveDataSink(Moderator &theModerator); - ~ModeratorsActiveDataSink(); + virtual ~ModeratorsActiveDataSink(); // XActiveDataSink. virtual void SAL_CALL @@ -502,7 +502,7 @@ public: ModeratorsInteractionHandler(Moderator &theModerator); - ~ModeratorsInteractionHandler(); + virtual ~ModeratorsInteractionHandler(); virtual void SAL_CALL handle( const Reference<XInteractionRequest >& Request ) @@ -520,7 +520,7 @@ class ModeratorsProgressHandler public: ModeratorsProgressHandler(Moderator &theModerator); - ~ModeratorsProgressHandler(); + virtual ~ModeratorsProgressHandler(); virtual void SAL_CALL push( const Any& Status ) throw ( |