summaryrefslogtreecommitdiff
path: root/vbahelper
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 /vbahelper
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 'vbahelper')
-rw-r--r--vbahelper/source/msforms/vbacontrol.cxx2
-rw-r--r--vbahelper/source/msforms/vbacontrol.hxx2
-rw-r--r--vbahelper/source/msforms/vbapages.hxx2
-rw-r--r--vbahelper/source/msforms/vbatogglebutton.hxx2
-rw-r--r--vbahelper/source/msforms/vbauserform.hxx2
-rw-r--r--vbahelper/source/vbahelper/vbacommandbars.hxx2
6 files changed, 6 insertions, 6 deletions
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index da09536207d2..16dead5c76ad 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -102,7 +102,7 @@ private:
ScVbaControl *pControl;
public:
explicit ScVbaControlListener( ScVbaControl *pTmpControl );
- virtual ~ScVbaControlListener();
+ virtual ~ScVbaControlListener() override;
virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException, std::exception ) override;
};
diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx
index 36051a426ace..c2ee4db8f4e9 100644
--- a/vbahelper/source/msforms/vbacontrol.hxx
+++ b/vbahelper/source/msforms/vbacontrol.hxx
@@ -57,7 +57,7 @@ protected:
public:
ScVbaControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pHelper );
- virtual ~ScVbaControl();
+ virtual ~ScVbaControl() override;
// This class will own the helper, so make sure it is allocated from
// the heap
void setGeometryHelper( ov::AbstractGeometryAttributes* pHelper );
diff --git a/vbahelper/source/msforms/vbapages.hxx b/vbahelper/source/msforms/vbapages.hxx
index 90661cbbd2b9..c3906dde4085 100644
--- a/vbahelper/source/msforms/vbapages.hxx
+++ b/vbahelper/source/msforms/vbapages.hxx
@@ -35,7 +35,7 @@ protected:
virtual css::uno::Sequence<OUString> getServiceNames() override;
public:
ScVbaPages( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPages ) throw ( css::lang::IllegalArgumentException );
- virtual ~ScVbaPages() {}
+ virtual ~ScVbaPages() override {}
// XEnumerationAccess
virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) override;
diff --git a/vbahelper/source/msforms/vbatogglebutton.hxx b/vbahelper/source/msforms/vbatogglebutton.hxx
index 1a88b1b3f370..0d73cd3679fa 100644
--- a/vbahelper/source/msforms/vbatogglebutton.hxx
+++ b/vbahelper/source/msforms/vbatogglebutton.hxx
@@ -30,7 +30,7 @@ class ScVbaToggleButton : public ToggleButtonImpl_BASE
{
public:
ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
- virtual ~ScVbaToggleButton();
+ virtual ~ScVbaToggleButton() override;
// Attributes
virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/vbahelper/source/msforms/vbauserform.hxx b/vbahelper/source/msforms/vbauserform.hxx
index b08454c0567d..ce249bc95071 100644
--- a/vbahelper/source/msforms/vbauserform.hxx
+++ b/vbahelper/source/msforms/vbauserform.hxx
@@ -40,7 +40,7 @@ private:
protected:
public:
ScVbaUserForm( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException, css::uno::RuntimeException );
- virtual ~ScVbaUserForm();
+ virtual ~ScVbaUserForm() override;
static css::uno::Reference< css::awt::XControl > nestedSearch( const OUString& aPropertyName, css::uno::Reference< css::awt::XControlContainer >& xContainer );
// XUserForm
virtual void SAL_CALL RePaint( ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/vbahelper/source/vbahelper/vbacommandbars.hxx b/vbahelper/source/vbahelper/vbacommandbars.hxx
index 936424001169..cb5e57fbed95 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.hxx
@@ -35,7 +35,7 @@ private:
public:
ScVbaCommandBars( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
- virtual ~ScVbaCommandBars();
+ virtual ~ScVbaCommandBars() override;
// XCommandBars
virtual css::uno::Reference< ov::XCommandBar > SAL_CALL Add( const css::uno::Any& Name, const css::uno::Any& Position, const css::uno::Any& MenuBar, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) override;