From 91dd2db17bd6cb9b357d1d69b187174e31eabef0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 13 Sep 2016 13:09:01 +0200 Subject: 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 --- include/vbahelper/vbaapplicationbase.hxx | 2 +- include/vbahelper/vbadialogbase.hxx | 2 +- include/vbahelper/vbadialogsbase.hxx | 2 +- include/vbahelper/vbadocumentbase.hxx | 2 +- include/vbahelper/vbadocumentsbase.hxx | 2 +- include/vbahelper/vbaeventshelperbase.hxx | 2 +- include/vbahelper/vbafontbase.hxx | 2 +- include/vbahelper/vbaglobalbase.hxx | 2 +- include/vbahelper/vbahelper.hxx | 2 +- include/vbahelper/vbapagesetupbase.hxx | 2 +- include/vbahelper/vbashape.hxx | 2 +- include/vbahelper/vbatextframe.hxx | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'include/vbahelper') diff --git a/include/vbahelper/vbaapplicationbase.hxx b/include/vbahelper/vbaapplicationbase.hxx index 2bc2ba0c0f81..2dd703574876 100644 --- a/include/vbahelper/vbaapplicationbase.hxx +++ b/include/vbahelper/vbaapplicationbase.hxx @@ -54,7 +54,7 @@ class VBAHELPER_DLLPUBLIC VbaApplicationBase : public ApplicationBase_BASE protected: VbaApplicationBase( const css::uno::Reference< css::uno::XComponentContext >& xContext ); - virtual ~VbaApplicationBase(); + virtual ~VbaApplicationBase() override; virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) = 0; public: diff --git a/include/vbahelper/vbadialogbase.hxx b/include/vbahelper/vbadialogbase.hxx index d118122eaa16..81ef6613dc0d 100644 --- a/include/vbahelper/vbadialogbase.hxx +++ b/include/vbahelper/vbadialogbase.hxx @@ -49,7 +49,7 @@ protected: css::uno::Reference< css::frame::XModel > m_xModel; public: VbaDialogBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nIndex ):VbaDialogBase_BASE( xParent, xContext ), mnIndex( nIndex ), m_xModel( xModel ) {} - virtual ~VbaDialogBase() {} + virtual ~VbaDialogBase() override {} // Methods virtual void SAL_CALL Show() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/vbahelper/vbadialogsbase.hxx b/include/vbahelper/vbadialogsbase.hxx index c18801b39696..5fc8255a6156 100644 --- a/include/vbahelper/vbadialogsbase.hxx +++ b/include/vbahelper/vbadialogsbase.hxx @@ -48,7 +48,7 @@ protected: css::uno::Reference< css::frame::XModel > m_xModel; public: VbaDialogsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): VbaDialogsBase_BASE( xParent, xContext ), m_xModel( xModel ) {} - virtual ~VbaDialogsBase() {} + virtual ~VbaDialogsBase() override {} // XCollection virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/vbahelper/vbadocumentbase.hxx b/include/vbahelper/vbadocumentbase.hxx index 1979c6cb6141..ca1f49db415c 100644 --- a/include/vbahelper/vbadocumentbase.hxx +++ b/include/vbahelper/vbadocumentbase.hxx @@ -56,7 +56,7 @@ public: VbaDocumentBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > const & xModel ); VbaDocumentBase( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); - virtual ~VbaDocumentBase() {} + virtual ~VbaDocumentBase() override {} // Attributes virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/vbahelper/vbadocumentsbase.hxx b/include/vbahelper/vbadocumentsbase.hxx index 9a47a92f8be6..4f592c5f455d 100644 --- a/include/vbahelper/vbadocumentsbase.hxx +++ b/include/vbahelper/vbadocumentsbase.hxx @@ -60,7 +60,7 @@ private: public: VbaDocumentsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, DOCUMENT_TYPE eDocType ) throw (css::uno::RuntimeException); - virtual ~VbaDocumentsBase() {} + virtual ~VbaDocumentsBase() override {} // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override = 0; diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx index 5bfd87479a1b..2ffea8e39f8c 100644 --- a/include/vbahelper/vbaeventshelperbase.hxx +++ b/include/vbahelper/vbaeventshelperbase.hxx @@ -63,7 +63,7 @@ public: VbaEventsHelperBase( const css::uno::Sequence< css::uno::Any >& rArgs, const css::uno::Reference< css::uno::XComponentContext >& xContext ); - virtual ~VbaEventsHelperBase(); + virtual ~VbaEventsHelperBase() override; // script::vba::XVBAEventProcessor virtual sal_Bool SAL_CALL hasVbaEventHandler( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; diff --git a/include/vbahelper/vbafontbase.hxx b/include/vbahelper/vbafontbase.hxx index 1835554f9aa8..3366c952e07a 100644 --- a/include/vbahelper/vbafontbase.hxx +++ b/include/vbahelper/vbafontbase.hxx @@ -79,7 +79,7 @@ public: const css::uno::Reference< css::container::XIndexAccess >& xPalette, const css::uno::Reference< css::beans::XPropertySet >& xPropertySet, bool bFormControl = false ) throw ( css::uno::RuntimeException ); - virtual ~VbaFontBase();// {} + virtual ~VbaFontBase() override;// {} // Attributes virtual css::uno::Any SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/vbahelper/vbaglobalbase.hxx b/include/vbahelper/vbaglobalbase.hxx index 5bbf9fac4391..6f0de82796a6 100644 --- a/include/vbahelper/vbaglobalbase.hxx +++ b/include/vbahelper/vbaglobalbase.hxx @@ -55,7 +55,7 @@ protected: public: VbaGlobalsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const OUString& sDocCtxName ); - virtual ~VbaGlobalsBase(); + virtual ~VbaGlobalsBase() override; // XMultiServiceFactory virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx index 2a0776c79c84..ab5a2e1f45c3 100644 --- a/include/vbahelper/vbahelper.hxx +++ b/include/vbahelper/vbahelper.hxx @@ -192,7 +192,7 @@ public: virtual void setHeight( double nHeight ) override; virtual double getWidth() const override; virtual void setWidth( double nWidth) override; - virtual ~ConcreteXShapeGeometryAttributes(); + virtual ~ConcreteXShapeGeometryAttributes() override; }; #define VBA_LEFT "PositionX" diff --git a/include/vbahelper/vbapagesetupbase.hxx b/include/vbahelper/vbapagesetupbase.hxx index c2a8af60a199..a012c730ad18 100644 --- a/include/vbahelper/vbapagesetupbase.hxx +++ b/include/vbahelper/vbapagesetupbase.hxx @@ -52,7 +52,7 @@ protected: VbaPageSetupBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException); public: - virtual ~VbaPageSetupBase(){} + virtual ~VbaPageSetupBase() override {} // Attribute virtual double SAL_CALL getTopMargin() throw (css::uno::RuntimeException, std::exception) override; diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx index 7c53dee96cbe..3ac4045abb8a 100644 --- a/include/vbahelper/vbashape.hxx +++ b/include/vbahelper/vbashape.hxx @@ -75,7 +75,7 @@ protected: public: ScVbaShape( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nType ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual ~ScVbaShape(); + virtual ~ScVbaShape() override; void setRange( css::uno::Any aRange ) { m_aRange = aRange; }; static sal_Int32 getType( const css::uno::Reference< css::drawing::XShape >& rShape ) throw (css::uno::RuntimeException); diff --git a/include/vbahelper/vbatextframe.hxx b/include/vbahelper/vbatextframe.hxx index f34920c9b9b8..675a52839c54 100644 --- a/include/vbahelper/vbatextframe.hxx +++ b/include/vbahelper/vbatextframe.hxx @@ -57,7 +57,7 @@ protected: void setMargin( const OUString& sMarginType, float fMargin ); public: VbaTextFrame( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext , css::uno::Reference< css::drawing::XShape > const & xShape); - virtual ~VbaTextFrame() {} + virtual ~VbaTextFrame() override {} // Attributes virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setAutoSize( sal_Bool _autosize ) throw (css::uno::RuntimeException, std::exception) override; -- cgit