summaryrefslogtreecommitdiff
path: root/scripting
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 /scripting
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 'scripting')
-rw-r--r--scripting/source/basprov/baslibnode.hxx2
-rw-r--r--scripting/source/basprov/basmethnode.hxx2
-rw-r--r--scripting/source/basprov/basmodnode.hxx2
-rw-r--r--scripting/source/basprov/basprov.hxx2
-rw-r--r--scripting/source/basprov/basscript.hxx2
-rw-r--r--scripting/source/dlgprov/dlgevtatt.hxx6
-rw-r--r--scripting/source/dlgprov/dlgprov.hxx2
-rw-r--r--scripting/source/protocolhandler/scripthandler.hxx2
-rw-r--r--scripting/source/provider/ActiveMSPList.hxx2
-rw-r--r--scripting/source/provider/BrowseNodeFactoryImpl.cxx10
-rw-r--r--scripting/source/provider/BrowseNodeFactoryImpl.hxx2
-rw-r--r--scripting/source/provider/MasterScriptProvider.hxx2
-rw-r--r--scripting/source/provider/MasterScriptProviderFactory.hxx2
-rw-r--r--scripting/source/provider/URIHelper.hxx2
-rw-r--r--scripting/source/stringresource/stringresource.hxx8
15 files changed, 24 insertions, 24 deletions
diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx
index 0fd6174905c4..98f1a753477a 100644
--- a/scripting/source/basprov/baslibnode.hxx
+++ b/scripting/source/basprov/baslibnode.hxx
@@ -57,7 +57,7 @@ namespace basprov
BasicManager* pBasicManager,
const css::uno::Reference< css::script::XLibraryContainer >& xLibContainer,
const OUString& sLibName, bool isAppScript=true );
- virtual ~BasicLibraryNodeImpl();
+ virtual ~BasicLibraryNodeImpl() override;
// XBrowseNode
virtual OUString SAL_CALL getName( )
diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx
index 537d15c4735e..41c45a209c5f 100644
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
@@ -72,7 +72,7 @@ namespace basprov
BasicMethodNodeImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const OUString& sScriptingContext,
SbMethod* pMethod, bool isAppScript = true );
- virtual ~BasicMethodNodeImpl();
+ virtual ~BasicMethodNodeImpl() override;
// XInterface
DECLARE_XINTERFACE()
diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx
index 914184c5f4b7..1be19e286603 100644
--- a/scripting/source/basprov/basmodnode.hxx
+++ b/scripting/source/basprov/basmodnode.hxx
@@ -51,7 +51,7 @@ namespace basprov
BasicModuleNodeImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const OUString& sScriptingContext,
SbModule* pModule, bool isAppScript = true );
- virtual ~BasicModuleNodeImpl();
+ virtual ~BasicModuleNodeImpl() override;
// XBrowseNode
virtual OUString SAL_CALL getName( )
diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx
index c99a536ce993..8026a5c034ca 100644
--- a/scripting/source/basprov/basprov.hxx
+++ b/scripting/source/basprov/basprov.hxx
@@ -67,7 +67,7 @@ namespace basprov
public:
explicit BasicProviderImpl(
const css::uno::Reference< css::uno::XComponentContext >& xContext );
- virtual ~BasicProviderImpl();
+ virtual ~BasicProviderImpl() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx
index 0e5d84e676f3..cf964a8cdc0a 100644
--- a/scripting/source/basprov/basscript.hxx
+++ b/scripting/source/basprov/basscript.hxx
@@ -77,7 +77,7 @@ namespace basprov
BasicManager& documentBasicManager,
const css::uno::Reference< css::document::XScriptInvocationContext >& documentScriptContext
);
- virtual ~BasicScriptImpl();
+ virtual ~BasicScriptImpl() override;
// XInterface
DECLARE_XINTERFACE()
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index 0e2660d8d38e..033f25831b96 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -64,7 +64,7 @@ namespace dlgprov
const css::uno::Reference< css::beans::XIntrospectionAccess >& xIntrospect,
bool bProviderMode,
const css::uno::Reference< css::script::XScriptListener >& xRTLListener ,const OUString& sDialogLibName );
- virtual ~DialogEventsAttacherImpl();
+ virtual ~DialogEventsAttacherImpl() override;
// XScriptEventsAttacher
virtual void SAL_CALL attachEvents( const css::uno::Sequence<
@@ -98,7 +98,7 @@ namespace dlgprov
public:
DialogAllListenerImpl( const css::uno::Reference< css::script::XScriptListener >& rxListener,
const OUString& rScriptType, const OUString& rScriptCode );
- virtual ~DialogAllListenerImpl();
+ virtual ~DialogAllListenerImpl() override;
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
@@ -126,7 +126,7 @@ namespace dlgprov
virtual void firing_impl( const css::script::ScriptEvent& aScriptEvent, css::uno::Any* pRet ) = 0;
public:
explicit DialogScriptListenerImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : m_xContext( rxContext ) {}
- virtual ~DialogScriptListenerImpl();
+ virtual ~DialogScriptListenerImpl() override;
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx
index 39ef5fa793a2..868b7df9931b 100644
--- a/scripting/source/dlgprov/dlgprov.hxx
+++ b/scripting/source/dlgprov/dlgprov.hxx
@@ -111,7 +111,7 @@ namespace dlgprov
public:
explicit DialogProviderImpl(
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
- virtual ~DialogProviderImpl();
+ virtual ~DialogProviderImpl() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
diff --git a/scripting/source/protocolhandler/scripthandler.hxx b/scripting/source/protocolhandler/scripthandler.hxx
index 303006b8dcdc..b550e1c2218d 100644
--- a/scripting/source/protocolhandler/scripthandler.hxx
+++ b/scripting/source/protocolhandler/scripthandler.hxx
@@ -76,7 +76,7 @@ private:
public:
explicit ScriptProtocolHandler( const css::uno::Reference < css::uno::XComponentContext >& xContext );
- virtual ~ScriptProtocolHandler();
+ virtual ~ScriptProtocolHandler() override;
/* XServiceInfo */
virtual OUString SAL_CALL getImplementationName()
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index 6590d80ab36c..dffe00f4bb6b 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -58,7 +58,7 @@ public:
explicit ActiveMSPList( const css::uno::Reference<
css::uno::XComponentContext > & xContext );
- virtual ~ActiveMSPList();
+ virtual ~ActiveMSPList() override;
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 0dff83016a07..73011f9adca2 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -66,7 +66,7 @@ public:
m_Nodes[ 0 ] = node;
}
- virtual ~BrowseNodeAggregator()
+ virtual ~BrowseNodeAggregator() override
{
}
@@ -186,7 +186,7 @@ public:
m_origNode.set( node );
}
- virtual ~LocationBrowseNode()
+ virtual ~LocationBrowseNode() override
{
if (m_hBNA)
{
@@ -414,7 +414,7 @@ public:
}
}
- virtual ~DefaultBrowseNode()
+ virtual ~DefaultBrowseNode() override
{
if ( m_xAggProxy.is() )
{
@@ -531,7 +531,7 @@ public:
m_Name = "Root";
}
- virtual ~DefaultRootBrowseNode()
+ virtual ~DefaultRootBrowseNode() override
{
}
@@ -589,7 +589,7 @@ public:
{
}
- virtual ~SelectorBrowseNode()
+ virtual ~SelectorBrowseNode() override
{
}
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
index 1509caaa0866..ef54adbe51a9 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
@@ -44,7 +44,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > m_xComponentContext;
protected:
- virtual ~BrowseNodeFactoryImpl();
+ virtual ~BrowseNodeFactoryImpl() override;
public:
explicit BrowseNodeFactoryImpl(
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index fc0a6b3ad0aa..38f6c1fed02f 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -52,7 +52,7 @@ public:
explicit MasterScriptProvider(
const css::uno::Reference< css::uno::XComponentContext >
& xContext ) throw( css::uno::RuntimeException );
- virtual ~MasterScriptProvider();
+ virtual ~MasterScriptProvider() override;
// XServiceInfo implementation
virtual OUString SAL_CALL getImplementationName( )
diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx
index 2e7a0c8b3f69..7a5245a30268 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.hxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.hxx
@@ -51,7 +51,7 @@ private:
const rtl::Reference< ActiveMSPList > & getActiveMSPList() const;
protected:
- virtual ~MasterScriptProviderFactory();
+ virtual ~MasterScriptProviderFactory() override;
public:
explicit MasterScriptProviderFactory(
diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx
index 10a214cb1a57..e23e840b0847 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 );
- virtual ~ScriptingFrameworkURIHelper();
+ virtual ~ScriptingFrameworkURIHelper() override;
virtual void SAL_CALL
initialize( const css::uno::Sequence < css::uno::Any > & args )
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index e5ccaafdf37a..f3050b0aecd6 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -154,7 +154,7 @@ protected:
public:
explicit StringResourceImpl(
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
- virtual ~StringResourceImpl();
+ virtual ~StringResourceImpl() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
@@ -306,7 +306,7 @@ protected:
public:
explicit StringResourcePersistenceImpl(
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
- virtual ~StringResourcePersistenceImpl();
+ virtual ~StringResourcePersistenceImpl() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
@@ -415,7 +415,7 @@ class StringResourceWithStorageImpl : public StringResourceWithStorageImpl_BASE
public:
explicit StringResourceWithStorageImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
- virtual ~StringResourceWithStorageImpl();
+ virtual ~StringResourceWithStorageImpl() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
@@ -540,7 +540,7 @@ class StringResourceWithLocationImpl : public StringResourceWithLocationImpl_BAS
public:
explicit StringResourceWithLocationImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
- virtual ~StringResourceWithLocationImpl();
+ virtual ~StringResourceWithLocationImpl() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )