diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /forms | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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 'forms')
42 files changed, 52 insertions, 52 deletions
diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index f0b2cd2d7ebf..c3d088f17939 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -131,7 +131,7 @@ protected: public: explicit OButtonControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); - virtual ~OButtonControl(); + virtual ~OButtonControl() override; // XServiceInfo OUString SAL_CALL getImplementationName() diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index ee769e67eab6..29f35b645c09 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -64,7 +64,7 @@ protected: public: OGridColumn(const css::uno::Reference<css::uno::XComponentContext>& _rContext, const OUString& _sModelName = OUString()); explicit OGridColumn(const OGridColumn* _pOriginal ); - virtual ~OGridColumn(); + virtual ~OGridColumn() override; // UNO binding DECLARE_UNO3_AGG_DEFAULTS(OGridControlModel, OGridColumn_BASE) diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index b7b601495e52..e76fc51352a5 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -214,7 +214,7 @@ class ODatabaseForm :public OFormComponents public: explicit ODatabaseForm(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); ODatabaseForm( const ODatabaseForm& _cloneSource ); - virtual ~ODatabaseForm(); + virtual ~ODatabaseForm() override; // UNO binding DECLARE_UNO3_AGG_DEFAULTS(ODatabaseForm, OFormComponents) diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index 8a44722f7ed8..6fca35367a47 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -132,7 +132,7 @@ class OEditControl : public OBoundControl public: explicit OEditControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext); - virtual ~OEditControl(); + virtual ~OEditControl() override; DECLARE_UNO3_AGG_DEFAULTS(OEditControl, OBoundControl) virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx index 33b157d8cc26..569b42240f77 100644 --- a/forms/source/component/EditBase.hxx +++ b/forms/source/component/EditBase.hxx @@ -66,7 +66,7 @@ public: const bool _bSupportsValidation ); DECLARE_DEFAULT_CLONE_CTOR( OEditBaseModel ) - virtual ~OEditBaseModel(); + virtual ~OEditBaseModel() override; // XPersistObject virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw ( css::io::IOException, css::uno::RuntimeException, std::exception) override; diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx index 7934fb37078b..71edb846e855 100644 --- a/forms/source/component/EventThread.hxx +++ b/forms/source/component/EventThread.hxx @@ -87,7 +87,7 @@ public: virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) throw (css::uno::RuntimeException, std::exception) override; explicit OComponentEventThread(::cppu::OComponentHelper* pCompImpl); - virtual ~OComponentEventThread(); + virtual ~OComponentEventThread() override; void addEvent( const css::lang::EventObject* _pEvt ); void addEvent( const css::lang::EventObject* _pEvt, const css::uno::Reference< css::awt::XControl>& rControl, diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 66cf6f05056f..9c9c7e12d3b3 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -85,7 +85,7 @@ public: using SvNumberFormatsSupplierObj::operator delete; protected: StandardFormatsSupplier(const Reference< XComponentContext >& _rxFactory,LanguageType _eSysLanguage); - virtual ~StandardFormatsSupplier(); + virtual ~StandardFormatsSupplier() override; protected: virtual bool queryTermination() const override; virtual void notifyTermination() override; diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index 38ddf3596831..75399df9be49 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -150,7 +150,7 @@ class OFormattedModel public: explicit OFormattedControl(const css::uno::Reference< css::uno::XComponentContext>& _rxContext); - virtual ~OFormattedControl(); + virtual ~OFormattedControl() override; DECLARE_UNO3_AGG_DEFAULTS(OFormattedControl, OBoundControl) virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx index a017bb389707..e780b0ed6d0a 100644 --- a/forms/source/component/FormattedFieldWrapper.hxx +++ b/forms/source/component/FormattedFieldWrapper.hxx @@ -52,7 +52,7 @@ private: OFormattedFieldWrapper(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); protected: - virtual ~OFormattedFieldWrapper(); + virtual ~OFormattedFieldWrapper() override; public: // if we act as formatted, this is the PersistObject interface of our aggregate, used diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx index df7279f17c86..f0e64b3d4946 100644 --- a/forms/source/component/FormsCollection.hxx +++ b/forms/source/component/FormsCollection.hxx @@ -51,7 +51,7 @@ class OFormsCollection public: explicit OFormsCollection(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); OFormsCollection( const OFormsCollection& _cloneSource ); - virtual ~OFormsCollection(); + virtual ~OFormsCollection() override; public: DECLARE_UNO3_AGG_DEFAULTS(OFormsCollection, FormsCollectionComponentBase) diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx index a8f45f39c7f0..d0b45fd5f424 100644 --- a/forms/source/component/GroupManager.hxx +++ b/forms/source/component/GroupManager.hxx @@ -175,7 +175,7 @@ class OGroupManager : public ::cppu::WeakImplHelper< css::beans::XPropertyChange public: explicit OGroupManager(const css::uno::Reference< css::container::XContainer >& _rxContainer); - virtual ~OGroupManager(); + virtual ~OGroupManager() override; // css::lang::XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override; diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx index b1e32e2550e9..2da96b921108 100644 --- a/forms/source/component/ListBox.hxx +++ b/forms/source/component/ListBox.hxx @@ -270,7 +270,7 @@ protected: public: explicit OListBoxControl(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); - virtual ~OListBoxControl(); + virtual ~OListBoxControl() override; // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OListBoxControl, OBoundControl) diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index b1ea4dcbdfb9..4a9b6880f6ff 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -97,7 +97,7 @@ namespace frm const OUString& _rDefault ); DECLARE_DEFAULT_CLONE_CTOR( OClickableImageBaseModel ) - virtual ~OClickableImageBaseModel(); + virtual ~OClickableImageBaseModel() override; // UNO Binding DECLARE_UNO3_AGG_DEFAULTS(OClickableImageBaseModel, OControlModel) @@ -213,7 +213,7 @@ namespace frm OClickableImageBaseControl( const css::uno::Reference< css::uno::XComponentContext>& _rxFactory, const OUString& _aService); - virtual ~OClickableImageBaseControl(); + virtual ~OClickableImageBaseControl() override; protected: // UNO Binding diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index e90bbfc30cee..b40d892bdcc8 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -42,7 +42,7 @@ public: ImgProdLockBytes( SvStream* pStm, bool bOwner ); explicit ImgProdLockBytes( css::uno::Reference< css::io::XInputStream > & rStreamRef ); - virtual ~ImgProdLockBytes(); + virtual ~ImgProdLockBytes() override; virtual ErrCode ReadAt( sal_uInt64 nPos, void* pBuffer, sal_Size nCount, sal_Size * pRead ) const override; virtual ErrCode WriteAt( sal_uInt64 nPos, const void* pBuffer, sal_Size nCount, sal_Size * pWritten ) override; diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx index 49e1107893d2..ceb9bf35e047 100644 --- a/forms/source/component/imgprod.hxx +++ b/forms/source/component/imgprod.hxx @@ -61,7 +61,7 @@ private: public: ImageProducer(); - virtual ~ImageProducer(); + virtual ~ImageProducer() override; void SetImage( const OUString& rPath ); void SetImage( SvStream& rStm ); diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx index bedfc4f7c8c6..5f727df6370c 100644 --- a/forms/source/component/refvaluecomponent.hxx +++ b/forms/source/component/refvaluecomponent.hxx @@ -54,7 +54,7 @@ namespace frm const OUString& _rDefault ); DECLARE_DEFAULT_CLONE_CTOR( OReferenceValueComponent ) - virtual ~OReferenceValueComponent(); + virtual ~OReferenceValueComponent() override; // OPropertySet and friends virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override; diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx index e051eb31436b..88e9bc6713e6 100644 --- a/forms/source/helper/commandimageprovider.cxx +++ b/forms/source/helper/commandimageprovider.cxx @@ -59,7 +59,7 @@ namespace frm { impl_init_nothrow( _rContext, _rxDocument ); } - virtual ~DocumentCommandImageProvider() + virtual ~DocumentCommandImageProvider() override { } diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 1b7c08d488a1..ac9f100e285a 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -197,7 +197,7 @@ public: ); protected: - virtual ~OControl(); + virtual ~OControl() override; /** sets the control as delegator at the aggregate @@ -276,7 +276,7 @@ public: const bool _bSetDelegator = true ); - virtual ~OBoundControl(); + virtual ~OBoundControl() override; DECLARE_UNO3_AGG_DEFAULTS(OBoundControl, OControl) virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -362,7 +362,7 @@ protected: const bool _bCloneAggregate = true, // should the aggregate of the original be cloned, too? const bool _bSetDelegator = true // set to sal_False if you want to call setDelegator later (after returning from this ctor) ); - virtual ~OControlModel(); + virtual ~OControlModel() override; /** to be called after a OBoundControlModel (a derivee, respectively) has been cloned @@ -522,7 +522,7 @@ public: const classname* _pOriginal, \ const css::uno::Reference< css::uno::XComponentContext>& _rxFactory \ ); \ - virtual ~classname() \ + virtual ~classname() override \ #define IMPLEMENT_DEFAULT_CLONING( classname ) \ @@ -657,7 +657,7 @@ protected: const css::uno::Reference< css::uno::XComponentContext>& _rxContext // factory to create the aggregate with ); - virtual ~OBoundControlModel(); + virtual ~OBoundControlModel() override; /// late ctor after cloning virtual void clonedFrom( const OControlModel* _pOriginal ) override; diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 1bb167620e84..90163803a4e8 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -286,7 +286,7 @@ protected: public: OFormComponents(const css::uno::Reference< css::uno::XComponentContext>& _rxFactory); OFormComponents( const OFormComponents& _cloneSource ); - virtual ~OFormComponents(); + virtual ~OFormComponents() override; DECLARE_UNO3_AGG_DEFAULTS(OFormComponents, FormComponentsBase) diff --git a/forms/source/richtext/attributedispatcher.hxx b/forms/source/richtext/attributedispatcher.hxx index 358a2df57513..a2e89f829be2 100644 --- a/forms/source/richtext/attributedispatcher.hxx +++ b/forms/source/richtext/attributedispatcher.hxx @@ -55,7 +55,7 @@ namespace frm ); protected: - virtual ~OAttributeDispatcher( ); + virtual ~OAttributeDispatcher( ) override; // XDispatch virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/forms/source/richtext/clipboarddispatcher.hxx b/forms/source/richtext/clipboarddispatcher.hxx index d0041b3963d0..b3ecf9006d5b 100644 --- a/forms/source/richtext/clipboarddispatcher.hxx +++ b/forms/source/richtext/clipboarddispatcher.hxx @@ -73,7 +73,7 @@ namespace frm explicit OPasteClipboardDispatcher( EditView& _rView ); protected: - virtual ~OPasteClipboardDispatcher(); + virtual ~OPasteClipboardDispatcher() override; // OClipboardDispatcher virtual bool implIsEnabled( ) const override; diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx index a15558cb5455..425735b582ac 100644 --- a/forms/source/richtext/featuredispatcher.hxx +++ b/forms/source/richtext/featuredispatcher.hxx @@ -55,7 +55,7 @@ namespace frm protected: ORichTextFeatureDispatcher( EditView& _rView, const css::util::URL& _rURL ); - virtual ~ORichTextFeatureDispatcher( ); + virtual ~ORichTextFeatureDispatcher( ) override; public: /// clean up resources associated with this instance diff --git a/forms/source/richtext/parametrizedattributedispatcher.hxx b/forms/source/richtext/parametrizedattributedispatcher.hxx index 0b531f78cf4b..0dbe9d48ca34 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.hxx +++ b/forms/source/richtext/parametrizedattributedispatcher.hxx @@ -38,7 +38,7 @@ namespace frm ); protected: - virtual ~OParametrizedAttributeDispatcher(); + virtual ~OParametrizedAttributeDispatcher() override; // XDispatch virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx index 5bda91b38949..993bd21edff5 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -49,7 +49,7 @@ namespace frm ORichTextControl(); protected: - virtual ~ORichTextControl(); + virtual ~ORichTextControl() override; public: // XServiceInfo - static version @@ -106,7 +106,7 @@ namespace frm protected: ORichTextPeer(); - virtual ~ORichTextPeer(); + virtual ~ORichTextPeer() override; // XView void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx index e2beb7fc35c9..63b08a3765e5 100644 --- a/forms/source/richtext/richtextengine.hxx +++ b/forms/source/richtext/richtextengine.hxx @@ -49,7 +49,7 @@ namespace frm static RichTextEngine* Create(); RichTextEngine* Clone(); - virtual ~RichTextEngine( ); + virtual ~RichTextEngine( ) override; // for multiplexing the StatusChanged events of the edit engine void registerEngineStatusListener( IEngineStatusListener* _pListener ); diff --git a/forms/source/richtext/richtextunowrapper.hxx b/forms/source/richtext/richtextunowrapper.hxx index 4de0d6ffb2d5..7f2fba8cedf9 100644 --- a/forms/source/richtext/richtextunowrapper.hxx +++ b/forms/source/richtext/richtextunowrapper.hxx @@ -42,7 +42,7 @@ namespace frm ORichTextUnoWrapper( EditEngine& _rEngine, IEngineTextChangeListener* _pTextChangeListener ); protected: - virtual ~ORichTextUnoWrapper() throw(); + virtual ~ORichTextUnoWrapper() throw() override; private: @@ -66,7 +66,7 @@ namespace frm virtual void UpdateData() override; protected: - virtual ~RichTextEditSource(); + virtual ~RichTextEditSource() override; private: RichTextEditSource( const RichTextEditSource& _rSource ) = delete; diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index 9d9ce3bdbb05..6725ab78bd5f 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -52,7 +52,7 @@ namespace frm ITextSelectionListener* _pSelectionListener ); - virtual ~RichTextControl( ); + virtual ~RichTextControl( ) override; virtual void dispose() override; /* enables the change notifications for a particular attribute diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx index 70118a8bbca4..c8c2fcb6cf73 100644 --- a/forms/source/richtext/rtattributehandler.hxx +++ b/forms/source/richtext/rtattributehandler.hxx @@ -62,7 +62,7 @@ namespace frm virtual AttributeCheckState implGetCheckState( const SfxPoolItem& _rItem ) const; protected: - virtual ~AttributeHandler(); + virtual ~AttributeHandler() override; }; namespace AttributeHandlerFactory diff --git a/forms/source/richtext/specialdispatchers.hxx b/forms/source/richtext/specialdispatchers.hxx index df56daffa464..f7b2e0f0a169 100644 --- a/forms/source/richtext/specialdispatchers.hxx +++ b/forms/source/richtext/specialdispatchers.hxx @@ -32,7 +32,7 @@ namespace frm OSelectAllDispatcher( EditView& _rView, const css::util::URL& _rURL ); protected: - virtual ~OSelectAllDispatcher(); + virtual ~OSelectAllDispatcher() override; // XDispatch virtual void SAL_CALL dispatch( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index 06aec6a3a1b8..47acd3fe48b6 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -102,7 +102,7 @@ namespace frm } protected: - virtual ~FormOperations(); + virtual ~FormOperations() override; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx index b871e115fdf0..3fa62b30ac7c 100644 --- a/forms/source/solar/component/navbarcontrol.hxx +++ b/forms/source/solar/component/navbarcontrol.hxx @@ -49,7 +49,7 @@ namespace frm ); protected: - virtual ~ONavigationBarControl(); + virtual ~ONavigationBarControl() override; public: // XServiceInfo - static version @@ -98,7 +98,7 @@ namespace frm explicit ONavigationBarPeer( const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); - virtual ~ONavigationBarPeer(); + virtual ~ONavigationBarPeer() override; public: // XInterface diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx index a9b92b68932c..b195f7ba9b55 100644 --- a/forms/source/solar/inc/navtoolbar.hxx +++ b/forms/source/solar/inc/navtoolbar.hxx @@ -69,7 +69,7 @@ namespace frm const std::shared_ptr< const ICommandImageProvider >& _pImageProvider, const OUString & sModuleId ); - virtual ~NavigationToolBar( ); + virtual ~NavigationToolBar( ) override; virtual void dispose() override; /** sets the dispatcher which is to be used for the features diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx index e32797772e36..8e4cd809dbcc 100644 --- a/forms/source/xforms/NameContainer.hxx +++ b/forms/source/xforms/NameContainer.hxx @@ -84,7 +84,7 @@ protected: public: NameContainer() {} - virtual ~NameContainer() {} + virtual ~NameContainer() override {} // methods for XElementAccess diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx index a413e39eda63..42fba2ca7d72 100644 --- a/forms/source/xforms/binding.hxx +++ b/forms/source/xforms/binding.hxx @@ -157,7 +157,7 @@ private: public: Binding(); - virtual ~Binding(); + virtual ~Binding() override; // property methods: get/set value diff --git a/forms/source/xforms/collection.hxx b/forms/source/xforms/collection.hxx index 11ae4de55108..8ea1ae147c6e 100644 --- a/forms/source/xforms/collection.hxx +++ b/forms/source/xforms/collection.hxx @@ -61,7 +61,7 @@ protected: public: Collection() {} - virtual ~Collection() {} + virtual ~Collection() override {} const T& getItem( sal_Int32 n ) const { diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx index 0d3723cdba48..15c7702c19f3 100644 --- a/forms/source/xforms/datatyperepository.hxx +++ b/forms/source/xforms/datatyperepository.hxx @@ -47,7 +47,7 @@ namespace xforms ODataTypeRepository( ); protected: - virtual ~ODataTypeRepository( ); + virtual ~ODataTypeRepository( ) override; // XDataTypeRepository virtual css::uno::Reference< css::xsd::XDataType > SAL_CALL getBasicDataType( sal_Int16 dataTypeClass ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx index a319c56975ac..5f1d40551535 100644 --- a/forms/source/xforms/datatypes.hxx +++ b/forms/source/xforms/datatypes.hxx @@ -75,7 +75,7 @@ namespace xforms protected: // create basic data type OXSDDataType( const OUString& _rName, sal_Int16 _nTypeClass ); - virtual ~OXSDDataType(); + virtual ~OXSDDataType() override; public: DECLARE_XINTERFACE() diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx index 70e067c8834c..87fe6066be3d 100644 --- a/forms/source/xforms/model.hxx +++ b/forms/source/xforms/model.hxx @@ -117,7 +117,7 @@ public: /// create a new model with an empty, default instance Model(); - virtual ~Model() throw(); + virtual ~Model() throw() override; // get Model implementation from API object static Model* getModel( const css::uno::Reference<css::xforms::XModel>& ); diff --git a/forms/source/xforms/model_helper.hxx b/forms/source/xforms/model_helper.hxx index c331861efd8d..23423b4a031f 100644 --- a/forms/source/xforms/model_helper.hxx +++ b/forms/source/xforms/model_helper.hxx @@ -53,7 +53,7 @@ class BindingCollection : public NamedCollection<css::uno::Reference<css::beans: public: explicit BindingCollection( Model* pModel ) : mpModel( pModel ) {} - virtual ~BindingCollection() {} + virtual ~BindingCollection() override {} virtual bool isValid( const T& t ) const override { @@ -80,7 +80,7 @@ class SubmissionCollection : public NamedCollection<css::uno::Reference<css::bea public: explicit SubmissionCollection( Model* pModel ) : mpModel( pModel ) {} - virtual ~SubmissionCollection() {} + virtual ~SubmissionCollection() override {} public: virtual bool isValid( const T& t ) const override diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx index 8563f0b9160c..4408f8a23c94 100644 --- a/forms/source/xforms/propertysetbase.hxx +++ b/forms/source/xforms/propertysetbase.hxx @@ -45,7 +45,7 @@ class PropertyAccessorBase : public salhelper::SimpleReferenceObject { protected: PropertyAccessorBase() { } - virtual ~PropertyAccessorBase(); + virtual ~PropertyAccessorBase() override; public: @@ -188,7 +188,7 @@ private: protected: PropertySetBase(); - virtual ~PropertySetBase(); + virtual ~PropertySetBase() override; /** registers a new property to be supported by this instance @param rProperty diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx index b847477298a5..d4521818839d 100644 --- a/forms/source/xforms/submission.hxx +++ b/forms/source/xforms/submission.hxx @@ -94,7 +94,7 @@ private: public: Submission(); - virtual ~Submission() throw(); + virtual ~Submission() throw() override; // property methods: get/set value diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx index 414458c04128..e3aff320f306 100644 --- a/forms/source/xforms/xformsevent.hxx +++ b/forms/source/xforms/xformsevent.hxx @@ -40,7 +40,7 @@ class XFormsEventConcrete : public cppu::WeakImplHelper< XFormsEvent > { , m_cancelable(false) { } - virtual ~XFormsEventConcrete() {} + virtual ~XFormsEventConcrete() override {} virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override; |