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 /extensions/source/propctrlr | |
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 'extensions/source/propctrlr')
31 files changed, 33 insertions, 33 deletions
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 9ce67fa357c9..8332a341b4a5 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -172,7 +172,7 @@ namespace pcr virtual void SAL_CALL release() throw() SAL_OVERRIDE; protected: - ~PropertyControlContext_Impl(); + virtual ~PropertyControlContext_Impl(); // XPropertyControlObserver virtual void SAL_CALL focusGained( const Reference< XPropertyControl >& Control ) throw (RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 728aef6657f4..a7a050b6db85 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -124,7 +124,7 @@ namespace pcr public: OBrowserListBox( Window* pParent, WinBits nWinStyle = WB_DIALOGCONTROL ); - ~OBrowserListBox(); + virtual ~OBrowserListBox(); void UpdateAll(); diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx index 49b4d47c5e79..bc013c3eb3b3 100644 --- a/extensions/source/propctrlr/browserpage.hxx +++ b/extensions/source/propctrlr/browserpage.hxx @@ -42,7 +42,7 @@ namespace pcr public: OBrowserPage(Window* pParent, WinBits nWinStyle = 0); - ~OBrowserPage(); + virtual ~OBrowserPage(); sal_Int32 getMinimumWidth(); sal_Int32 getMinimumHeight(); diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx index 94a6b9e18e4b..5a1db39609b8 100644 --- a/extensions/source/propctrlr/buttonnavigationhandler.hxx +++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx @@ -48,7 +48,7 @@ namespace pcr static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: - ~ButtonNavigationHandler(); + virtual ~ButtonNavigationHandler(); static bool isNavigationCapableButton( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxComponent ); diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx index 454bf01ad4c0..68342a643efc 100644 --- a/extensions/source/propctrlr/cellbindinghandler.hxx +++ b/extensions/source/propctrlr/cellbindinghandler.hxx @@ -54,7 +54,7 @@ namespace pcr static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: - ~CellBindingPropertyHandler(); + virtual ~CellBindingPropertyHandler(); protected: // XPropertyHandler overriables diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index 9b523a1cb08b..bbf2fab66fe7 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -154,7 +154,7 @@ namespace pcr virtual void SAL_CALL release() throw() SAL_OVERRIDE; protected: - ~CachedInspectorUI(); + virtual ~CachedInspectorUI(); /// determines whether the instance is already disposed inline bool isDisposed() const { return m_bDisposed; } diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index 100935ba509c..2aada9d5ec52 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.hxx @@ -55,7 +55,7 @@ namespace pcr public: OControlFontDialog(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& _rxContext); - ~OControlFontDialog(); + virtual ~OControlFontDialog(); // XTypeProvider virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx index 6ca637bd4f50..da81086414e7 100644 --- a/extensions/source/propctrlr/defaultforminspection.hxx +++ b/extensions/source/propctrlr/defaultforminspection.hxx @@ -44,7 +44,7 @@ namespace pcr SAL_WNODEPRECATED_DECLARATIONS_POP protected: - ~DefaultFormComponentInspectorModel(); + virtual ~DefaultFormComponentInspectorModel(); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx index a2141353aa7c..a308f06bf7ab 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.hxx +++ b/extensions/source/propctrlr/defaulthelpprovider.hxx @@ -57,7 +57,7 @@ namespace pcr Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); protected: - ~DefaultHelpProvider(); + virtual ~DefaultHelpProvider(); // XPropertyControlObserver virtual void SAL_CALL focusGained( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& Control ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx index 4e04cbe81e38..8cbc02499db8 100644 --- a/extensions/source/propctrlr/editpropertyhandler.hxx +++ b/extensions/source/propctrlr/editpropertyhandler.hxx @@ -45,7 +45,7 @@ namespace pcr static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: - ~EditPropertyHandler(); + virtual ~EditPropertyHandler(); protected: // XPropertyHandler overriables diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx index 63ed5afbb938..1f0e03c1cad6 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.hxx +++ b/extensions/source/propctrlr/eformspropertyhandler.hxx @@ -55,7 +55,7 @@ namespace pcr static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: - ~EFormsPropertyHandler(); + virtual ~EFormsPropertyHandler(); protected: // XPropertyHandler overriables diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 6cf014207cd4..f451325e5639 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -349,7 +349,7 @@ namespace pcr virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; protected: - ~EventHolder( ); + virtual ~EventHolder( ); private: ScriptEventDescriptor impl_getDescriptor_throw( const OUString& _rEventName ) const; diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index 6027d45b54d6..2054c3d3de5f 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -106,7 +106,7 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - ~EventHandler(); + virtual ~EventHandler(); protected: // XPropertyHandler overridables diff --git a/extensions/source/propctrlr/fontdialog.hxx b/extensions/source/propctrlr/fontdialog.hxx index f346b71148b1..7fff48b0d5d9 100644 --- a/extensions/source/propctrlr/fontdialog.hxx +++ b/extensions/source/propctrlr/fontdialog.hxx @@ -36,7 +36,7 @@ namespace pcr { public: ControlCharacterDialog(Window* _pParent, const SfxItemSet& _rCoreSet); - ~ControlCharacterDialog(); + virtual ~ControlCharacterDialog(); /// creates an item set to be used with this dialog static SfxItemSet* createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults); diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index fac0d429dad8..0753d826508e 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -108,7 +108,7 @@ namespace pcr static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: - ~FormComponentPropertyHandler(); + virtual ~FormComponentPropertyHandler(); protected: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index 918fb197a328..194bd8fa7ace 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.hxx @@ -75,7 +75,7 @@ namespace pcr Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); protected: - ~FormController(); + virtual ~FormController(); DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index 0035646f5836..91ad0f2c47c7 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -218,7 +218,7 @@ namespace pcr static Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (RuntimeException); protected: - ~FormGeometryHandler(); + virtual ~FormGeometryHandler(); protected: // XPropertyHandler overriables diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index beabf9e31137..920d4059fe9f 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -83,7 +83,7 @@ namespace pcr const OUString& _sDetailLabel = OUString(), const OUString& _sMasterLabel = OUString() ); - ~FormLinkDialog( ); + virtual ~FormLinkDialog( ); // Dialog overridables virtual short Execute() SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index c64cceff8a41..5bb9ad001422 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -87,7 +87,7 @@ namespace pcr DefaultEnumRepresentation( const IPropertyInfoService& _rInfo, const ::com::sun::star::uno::Type& _rType, sal_Int32 _nPropertyId ); protected: - ~DefaultEnumRepresentation(); + virtual ~DefaultEnumRepresentation(); protected: // IPropertyEnumRepresentation implementqation diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx index 979c56b9e46b..235ea36f9727 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.cxx +++ b/extensions/source/propctrlr/genericpropertyhandler.cxx @@ -206,7 +206,7 @@ namespace pcr UrlClickHandler( const Reference<XComponentContext>& _rContext, const Reference< XHyperlinkControl >& _rxControl ); protected: - ~UrlClickHandler(); + virtual ~UrlClickHandler(); // XActionListener virtual void SAL_CALL actionPerformed( const ActionEvent& rEvent ) throw (RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx index 571c8597857f..7723a7a4e8d5 100644 --- a/extensions/source/propctrlr/genericpropertyhandler.hxx +++ b/extensions/source/propctrlr/genericpropertyhandler.hxx @@ -90,7 +90,7 @@ namespace pcr const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - ~GenericPropertyHandler(); + virtual ~GenericPropertyHandler(); protected: // XPropertyHandler overridables diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx index f5e0d1655cbb..db002132e401 100644 --- a/extensions/source/propctrlr/inspectormodelbase.hxx +++ b/extensions/source/propctrlr/inspectormodelbase.hxx @@ -57,7 +57,7 @@ namespace pcr ::std::auto_ptr< InspectorModelProperties > m_pProperties; protected: - ~ImplInspectorModel(); + virtual ~ImplInspectorModel(); public: ImplInspectorModel(); diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index 30f72b694953..545af7988fb0 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -51,7 +51,7 @@ namespace pcr public: OTabOrderDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& _rxContext ); - ~OTabOrderDialog(); + virtual ~OTabOrderDialog(); // XTypeProvider virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index a69ae642045a..d324cf8e76b6 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -73,7 +73,7 @@ namespace pcr public: OPropertyEditor (Window* pParent, WinBits nWinStyle = WB_DIALOGCONTROL); - ~OPropertyEditor(); + virtual ~OPropertyEditor(); void EnableUpdate(); void DisableUpdate(); diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index 5c3ddfb8879d..2480ab90e199 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -100,7 +100,7 @@ namespace pcr PropertyHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - ~PropertyHandler(); + virtual ~PropertyHandler(); // default implementations for XPropertyHandler virtual void SAL_CALL inspect( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIntrospectee ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::NullPointerException, std::exception) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index ccf52286b1d5..0a732f0e8f2d 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -60,7 +60,7 @@ namespace pcr public: OSelectLabelDialog(Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xControlModel); - ~OSelectLabelDialog(); + virtual ~OSelectLabelDialog(); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetSelected() const { return m_aNoAssignment.IsChecked() ? ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > () : m_xSelectedControl; } diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx index e581a9c8098f..ad86dbd19393 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.hxx +++ b/extensions/source/propctrlr/sqlcommanddesign.hxx @@ -115,7 +115,7 @@ namespace pcr virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - ~SQLCommandDesigner(); + virtual ~SQLCommandDesigner(); /** opens a new frame for interactively designing an SQL command @precond diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 8e6fefd65004..b365cdd59963 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -382,7 +382,7 @@ namespace pcr public: DropDownEditControl( Window* _pParent, WinBits _nStyle ); - ~DropDownEditControl(); + virtual ~DropDownEditControl(); void setOperationMode( MultiLineOperationMode _eMode ) { m_nOperationMode = _eMode; } MultiLineOperationMode getOperationMode() const { return m_nOperationMode; } diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx index 488ebd4adfdb..8ba663007a95 100644 --- a/extensions/source/propctrlr/submissionhandler.hxx +++ b/extensions/source/propctrlr/submissionhandler.hxx @@ -81,7 +81,7 @@ namespace pcr static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); - ~SubmissionPropertyHandler(); + virtual ~SubmissionPropertyHandler(); protected: // XPropertyHandler overriables diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index 98abdaaa83f1..5fcf95b99ff0 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -118,7 +118,7 @@ namespace pcr void SetThousandsSep(sal_Bool bEnable) { getTypedControlWindow()->SetThousandsSep(bEnable); } protected: - ~OFormattedNumericControl(); + virtual ~OFormattedNumericControl(); }; @@ -136,7 +136,7 @@ namespace pcr virtual ::com::sun::star::uno::Type SAL_CALL getValueType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - ~OFileUrlControl(); + virtual ~OFileUrlControl(); }; @@ -146,7 +146,7 @@ namespace pcr { public: OTimeDurationControl( ::Window* pParent, WinBits nWinStyle ); - ~OTimeDurationControl(); + virtual ~OTimeDurationControl(); // XPropertyControl ::sal_Int16 SAL_CALL getControlType() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx index eb0274adb96e..37cbe6fd2b3b 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx @@ -49,7 +49,7 @@ namespace pcr static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ) throw (::com::sun::star::uno::RuntimeException); protected: - ~XSDValidationPropertyHandler(); + virtual ~XSDValidationPropertyHandler(); protected: // XPropertyHandler overriables |