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 /scripting | |
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 'scripting')
-rw-r--r-- | scripting/source/provider/ActiveMSPList.hxx | 2 | ||||
-rw-r--r-- | scripting/source/provider/BrowseNodeFactoryImpl.cxx | 10 | ||||
-rw-r--r-- | scripting/source/provider/MasterScriptProvider.hxx | 2 | ||||
-rw-r--r-- | scripting/source/provider/URIHelper.hxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx index ed4e1445a6d7..6b8d7d7618ac 100644 --- a/scripting/source/provider/ActiveMSPList.hxx +++ b/scripting/source/provider/ActiveMSPList.hxx @@ -60,7 +60,7 @@ public: ActiveMSPList( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - ~ActiveMSPList(); + virtual ~ActiveMSPList(); css::uno::Reference< css::script::provider::XScriptProvider > getMSPFromStringContext( const OUString& context ) diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index b2df40e2426c..8c938e418da5 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -65,7 +65,7 @@ public: m_Nodes[ 0 ] = node; } - ~BrowseNodeAggregator() + virtual ~BrowseNodeAggregator() { } @@ -190,7 +190,7 @@ public: m_origNode.set( node ); } - ~LocationBrowseNode() + virtual ~LocationBrowseNode() { if (m_hBNA) { @@ -420,7 +420,7 @@ public: } } - ~DefaultBrowseNode() + virtual ~DefaultBrowseNode() { if ( m_xAggProxy.is() ) { @@ -552,7 +552,7 @@ public: m_Name = "Root"; } - ~DefaultRootBrowseNode() + virtual ~DefaultRootBrowseNode() { } @@ -610,7 +610,7 @@ public: { } - ~SelectorBrowseNode() + virtual ~SelectorBrowseNode() { } diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx index 3b8bacdcb13e..29534633d604 100644 --- a/scripting/source/provider/MasterScriptProvider.hxx +++ b/scripting/source/provider/MasterScriptProvider.hxx @@ -52,7 +52,7 @@ public: MasterScriptProvider( const css::uno::Reference< css::uno::XComponentContext > & xContext ) throw( css::uno::RuntimeException ); - ~MasterScriptProvider(); + virtual ~MasterScriptProvider(); // XServiceInfo implementation virtual OUString SAL_CALL getImplementationName( ) diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx index c9d120e56cdb..702595175282 100644 --- a/scripting/source/provider/URIHelper.hxx +++ b/scripting/source/provider/URIHelper.hxx @@ -61,7 +61,7 @@ public: const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw( css::uno::RuntimeException ); - ~ScriptingFrameworkURIHelper(); + virtual ~ScriptingFrameworkURIHelper(); virtual void SAL_CALL initialize( const css::uno::Sequence < css::uno::Any > & args ) |