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 /forms/source | |
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 'forms/source')
-rw-r--r-- | forms/source/component/DatabaseForm.hxx | 2 | ||||
-rw-r--r-- | forms/source/component/FormattedField.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/imgprod.hxx | 2 | ||||
-rw-r--r-- | forms/source/helper/commanddescriptionprovider.cxx | 2 | ||||
-rw-r--r-- | forms/source/inc/FormComponent.hxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/attributedispatcher.hxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/clipboarddispatcher.hxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/featuredispatcher.hxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/parametrizedattributedispatcher.hxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/richtextcontrol.hxx | 4 | ||||
-rw-r--r-- | forms/source/richtext/richtextengine.hxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/richtextunowrapper.hxx | 4 | ||||
-rw-r--r-- | forms/source/richtext/richtextvclcontrol.hxx | 2 | ||||
-rw-r--r-- | forms/source/richtext/specialdispatchers.hxx | 2 | ||||
-rw-r--r-- | forms/source/solar/component/navbarcontrol.hxx | 4 | ||||
-rw-r--r-- | forms/source/solar/inc/navtoolbar.hxx | 4 | ||||
-rw-r--r-- | forms/source/xforms/datatyperepository.hxx | 2 | ||||
-rw-r--r-- | forms/source/xforms/datatypes.hxx | 2 |
18 files changed, 22 insertions, 22 deletions
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index 69a1f07df862..b4762bad2c46 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -220,7 +220,7 @@ class ODatabaseForm :public OFormComponents public: ODatabaseForm(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); ODatabaseForm( const ODatabaseForm& _cloneSource ); - ~ODatabaseForm(); + virtual ~ODatabaseForm(); // UNO binding DECLARE_UNO3_AGG_DEFAULTS(ODatabaseForm, OFormComponents); diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index f39db452873e..28229fcb3abe 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -87,7 +87,7 @@ public: using SvNumberFormatsSupplierObj::operator delete; protected: StandardFormatsSupplier(const Reference< XComponentContext >& _rxFactory,LanguageType _eSysLanguage); - ~StandardFormatsSupplier(); + virtual ~StandardFormatsSupplier(); protected: virtual bool queryTermination() const SAL_OVERRIDE; virtual void notifyTermination() SAL_OVERRIDE; diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx index de2418e4562e..57d5e1d55302 100644 --- a/forms/source/component/imgprod.hxx +++ b/forms/source/component/imgprod.hxx @@ -68,7 +68,7 @@ private: public: ImageProducer(); - ~ImageProducer(); + virtual ~ImageProducer(); void SetImage( const OUString& rPath ); void SetImage( SvStream& rStm ); diff --git a/forms/source/helper/commanddescriptionprovider.cxx b/forms/source/helper/commanddescriptionprovider.cxx index f72a293eb3dd..6a6621b8fb5a 100644 --- a/forms/source/helper/commanddescriptionprovider.cxx +++ b/forms/source/helper/commanddescriptionprovider.cxx @@ -63,7 +63,7 @@ namespace frm impl_init_nothrow( _rxContext, _rxDocument ); } - ~DefaultCommandDescriptionProvider() + virtual ~DefaultCommandDescriptionProvider() { } diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 1c78873f115b..27e6f8db0800 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -529,7 +529,7 @@ public: // simple destructor #define DECLARE_DEFAULT_DTOR( classname ) \ - ~classname() \ + ~classname()override/*TODO*/ \ // constructor for cloning a class #define DECLARE_DEFAULT_CLONE_CTOR( classname ) \ diff --git a/forms/source/richtext/attributedispatcher.hxx b/forms/source/richtext/attributedispatcher.hxx index 36bc578cb91b..c212529a97f9 100644 --- a/forms/source/richtext/attributedispatcher.hxx +++ b/forms/source/richtext/attributedispatcher.hxx @@ -62,7 +62,7 @@ namespace frm void notifyAttributeState( const AttributeState& _rState ) SAL_THROW (()); protected: - ~OAttributeDispatcher( ); + virtual ~OAttributeDispatcher( ); protected: // XDispatch diff --git a/forms/source/richtext/clipboarddispatcher.hxx b/forms/source/richtext/clipboarddispatcher.hxx index 42b40dfda60f..c44e005f76cc 100644 --- a/forms/source/richtext/clipboarddispatcher.hxx +++ b/forms/source/richtext/clipboarddispatcher.hxx @@ -79,7 +79,7 @@ namespace frm OPasteClipboardDispatcher( EditView& _rView ); protected: - ~OPasteClipboardDispatcher(); + virtual ~OPasteClipboardDispatcher(); // OClipboardDispatcher virtual sal_Bool implIsEnabled( ) const SAL_OVERRIDE; diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx index fe8cde9caa4f..485b8ae8c120 100644 --- a/forms/source/richtext/featuredispatcher.hxx +++ b/forms/source/richtext/featuredispatcher.hxx @@ -59,7 +59,7 @@ namespace frm protected: ORichTextFeatureDispatcher( EditView& _rView, const ::com::sun::star::util::URL& _rURL ); - ~ORichTextFeatureDispatcher( ); + virtual ~ORichTextFeatureDispatcher( ); public: /// clean up resources associated with this instance diff --git a/forms/source/richtext/parametrizedattributedispatcher.hxx b/forms/source/richtext/parametrizedattributedispatcher.hxx index 41f1335f21cc..7f2827cd0d4b 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.hxx +++ b/forms/source/richtext/parametrizedattributedispatcher.hxx @@ -42,7 +42,7 @@ namespace frm ); protected: - ~OParametrizedAttributeDispatcher(); + virtual ~OParametrizedAttributeDispatcher(); // XDispatch virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx index d048affb1dda..a74e92e5f72f 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -52,7 +52,7 @@ namespace frm ORichTextControl(); protected: - ~ORichTextControl(); + virtual ~ORichTextControl(); public: // XServiceInfo - static version @@ -113,7 +113,7 @@ namespace frm protected: ORichTextPeer(); - ~ORichTextPeer(); + virtual ~ORichTextPeer(); // XView void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx index 9a81210f8387..d05dc54a7446 100644 --- a/forms/source/richtext/richtextengine.hxx +++ b/forms/source/richtext/richtextengine.hxx @@ -56,7 +56,7 @@ namespace frm static RichTextEngine* Create(); RichTextEngine* Clone(); - ~RichTextEngine( ); + virtual ~RichTextEngine( ); // 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 166ae2c25fef..95c2c1ea4cbc 100644 --- a/forms/source/richtext/richtextunowrapper.hxx +++ b/forms/source/richtext/richtextunowrapper.hxx @@ -49,7 +49,7 @@ namespace frm ORichTextUnoWrapper( EditEngine& _rEngine, IEngineTextChangeListener* _pTextChangeListener ); protected: - ~ORichTextUnoWrapper() throw(); + virtual ~ORichTextUnoWrapper() throw(); private: @@ -77,7 +77,7 @@ namespace frm virtual void UpdateData() SAL_OVERRIDE; protected: - ~RichTextEditSource(); + virtual ~RichTextEditSource(); private: RichTextEditSource( ); // never implemented diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index ddae0748ef81..139239772b59 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -54,7 +54,7 @@ namespace frm ITextSelectionListener* _pSelectionListener ); - ~RichTextControl( ); + virtual ~RichTextControl( ); /* enables the change notifications for a particular attribute diff --git a/forms/source/richtext/specialdispatchers.hxx b/forms/source/richtext/specialdispatchers.hxx index 1e06f1372ef3..69bccf64b81f 100644 --- a/forms/source/richtext/specialdispatchers.hxx +++ b/forms/source/richtext/specialdispatchers.hxx @@ -36,7 +36,7 @@ namespace frm OSelectAllDispatcher( EditView& _rView, const ::com::sun::star::util::URL& _rURL ); protected: - ~OSelectAllDispatcher(); + virtual ~OSelectAllDispatcher(); // XDispatch virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx index 3d387d0530b3..36faf579f8fb 100644 --- a/forms/source/solar/component/navbarcontrol.hxx +++ b/forms/source/solar/component/navbarcontrol.hxx @@ -53,7 +53,7 @@ namespace frm ); protected: - ~ONavigationBarControl(); + virtual ~ONavigationBarControl(); public: // XServiceInfo - static version @@ -106,7 +106,7 @@ namespace frm ONavigationBarPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); - ~ONavigationBarPeer(); + virtual ~ONavigationBarPeer(); public: // XInterface diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx index cb39aac010e8..e83667d379db 100644 --- a/forms/source/solar/inc/navtoolbar.hxx +++ b/forms/source/solar/inc/navtoolbar.hxx @@ -73,7 +73,7 @@ namespace frm const ::boost::shared_ptr< const ICommandImageProvider >& _pImageProvider, const ::boost::shared_ptr< const ICommandDescriptionProvider >& _pDescriptionProvider ); - ~NavigationToolBar( ); + virtual ~NavigationToolBar( ); /** sets the dispatcher which is to be used for the features @@ -164,7 +164,7 @@ namespace frm public: RecordPositionInput( Window* _pParent ); - ~RecordPositionInput(); + virtual ~RecordPositionInput(); /** sets the dispatcher which is to be used for the features */ diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx index 74e3d29fa1bf..d91cc0534dd4 100644 --- a/forms/source/xforms/datatyperepository.hxx +++ b/forms/source/xforms/datatyperepository.hxx @@ -50,7 +50,7 @@ namespace xforms ODataTypeRepository( ); protected: - ~ODataTypeRepository( ); + virtual ~ODataTypeRepository( ); // XDataTypeRepository virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL getBasicDataType( sal_Int16 dataTypeClass ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx index 923a26390145..a65ee572dc69 100644 --- a/forms/source/xforms/datatypes.hxx +++ b/forms/source/xforms/datatypes.hxx @@ -81,7 +81,7 @@ namespace xforms protected: // create basic data type OXSDDataType( const OUString& _rName, sal_Int16 _nTypeClass ); - ~OXSDDataType(); + virtual ~OXSDDataType(); public: DECLARE_XINTERFACE() |