From 567ef6d5782cdb729b49005caf6005610ce03e22 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 27 Mar 2014 18:12:18 +0100 Subject: Second batch of adding SAL_OVERRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f --- extensions/source/dbpilots/commonpagesdbp.hxx | 14 ++++----- extensions/source/dbpilots/controlwizard.hxx | 6 ++-- extensions/source/dbpilots/gridwizard.hxx | 20 ++++++------ extensions/source/dbpilots/groupboxwiz.hxx | 38 +++++++++++------------ extensions/source/dbpilots/listcombowizard.hxx | 42 +++++++++++++------------- extensions/source/dbpilots/unoautopilot.hxx | 14 ++++----- 6 files changed, 67 insertions(+), 67 deletions(-) (limited to 'extensions/source/dbpilots') diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index 78f119a029de..286b0a60bb0b 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -52,11 +52,11 @@ namespace dbp protected: // TabPage overridables - void ActivatePage(); + void ActivatePage() SAL_OVERRIDE; // OWizardPage overridables - virtual void initializePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void initializePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; protected: DECL_LINK( OnListboxSelection, ListBox* ); @@ -68,7 +68,7 @@ namespace dbp _rxConn = ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >()); // OControlWizardPage overridables - virtual bool canAdvance() const; + virtual bool canAdvance() const SAL_OVERRIDE; }; @@ -88,7 +88,7 @@ namespace dbp DECL_LINK( OnRadioSelected, RadioButton* ); // TabPage overridables - void ActivatePage(); + void ActivatePage() SAL_OVERRIDE; // own helper void announceControls( @@ -122,8 +122,8 @@ namespace dbp void setDescriptionText(const OUString& _rDesc) { m_aDescription.SetText(_rDesc); } // OWizardPage overridables - virtual void initializePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void initializePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; // own overridables virtual OUString& getDBFieldSetting() = 0; diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index cce215def790..9c571185f923 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -94,7 +94,7 @@ namespace dbp protected: // OWizardPage overridables - virtual void initializePage(); + virtual void initializePage() SAL_OVERRIDE; }; struct OAccessRegulator; @@ -151,7 +151,7 @@ namespace dbp virtual sal_Bool approveControl(sal_Int16 _nClassId) = 0; // ModalDialog overridables - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; private: sal_Bool initContext(); @@ -162,7 +162,7 @@ namespace dbp void implDetermineShape(); // made private. Not to be used by derived (or external) classes - virtual void ActivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; }; diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index aacd04c789c2..4d208376bf58 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.hxx @@ -56,13 +56,13 @@ namespace dbp protected: // OWizardMachine overridables - virtual ::svt::OWizardPage* createPage( WizardState _nState ); - virtual WizardState determineNextState( WizardState _nCurrentState ) const; - virtual void enterState( WizardState _nState ); - virtual bool leaveState( WizardState _nState ); - virtual bool onFinish(); + virtual ::svt::OWizardPage* createPage( WizardState _nState ) SAL_OVERRIDE; + virtual WizardState determineNextState( WizardState _nCurrentState ) const SAL_OVERRIDE; + virtual void enterState( WizardState _nState ) SAL_OVERRIDE; + virtual bool leaveState( WizardState _nState ) SAL_OVERRIDE; + virtual bool onFinish() SAL_OVERRIDE; - virtual sal_Bool approveControl(sal_Int16 _nClassId); + virtual sal_Bool approveControl(sal_Int16 _nClassId) SAL_OVERRIDE; protected: void implApplySettings(); @@ -101,12 +101,12 @@ namespace dbp protected: // TabPage overridables - virtual void ActivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; // OWizardPage overridables - virtual void initializePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); - virtual bool canAdvance() const; + virtual void initializePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; + virtual bool canAdvance() const SAL_OVERRIDE; protected: DECL_LINK(OnMoveOneEntry, PushButton*); diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index 1f2355804d47..1c9bdcb5255f 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -62,12 +62,12 @@ namespace dbp protected: // OWizardMachine overridables - virtual ::svt::OWizardPage* createPage( WizardState _nState ); - virtual WizardState determineNextState( WizardState _nCurrentState ) const; - virtual void enterState( WizardState _nState ); - virtual bool onFinish(); + virtual ::svt::OWizardPage* createPage( WizardState _nState ) SAL_OVERRIDE; + virtual WizardState determineNextState( WizardState _nCurrentState ) const SAL_OVERRIDE; + virtual void enterState( WizardState _nState ) SAL_OVERRIDE; + virtual bool onFinish() SAL_OVERRIDE; - virtual sal_Bool approveControl(sal_Int16 _nClassId); + virtual sal_Bool approveControl(sal_Int16 _nClassId) SAL_OVERRIDE; protected: void createRadios(); @@ -104,12 +104,12 @@ namespace dbp protected: // TabPage overridables - void ActivatePage(); + void ActivatePage() SAL_OVERRIDE; // OWizardPage overridables - virtual void initializePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); - virtual bool canAdvance() const; + virtual void initializePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; + virtual bool canAdvance() const SAL_OVERRIDE; DECL_LINK( OnMoveEntry, PushButton* ); DECL_LINK( OnEntrySelected, ListBox* ); @@ -135,8 +135,8 @@ namespace dbp protected: // OWizardPage overridables - virtual void initializePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void initializePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; OOptionGroupSettings& getSettings() { return static_cast(getDialog())->getSettings(); } }; @@ -163,11 +163,11 @@ namespace dbp protected: // TabPage overridables - void ActivatePage(); + void ActivatePage() SAL_OVERRIDE; // OWizardPage overridables - virtual void initializePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); + virtual void initializePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; void implTraveledOptions(); @@ -186,7 +186,7 @@ namespace dbp OOptionGroupSettings& getSettings() { return static_cast(getDialog())->getSettings(); } // ODBFieldPage overridables - virtual OUString& getDBFieldSetting(); + virtual OUString& getDBFieldSetting() SAL_OVERRIDE; }; @@ -205,12 +205,12 @@ namespace dbp protected: // TabPage overridables - void ActivatePage(); + void ActivatePage() SAL_OVERRIDE; // OWizardPage overridables - virtual void initializePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); - virtual bool canAdvance() const; + virtual void initializePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; + virtual bool canAdvance() const SAL_OVERRIDE; }; diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index adb02f5cac2e..fb0899393c94 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -68,13 +68,13 @@ namespace dbp protected: // OWizardMachine overridables - virtual ::svt::OWizardPage* createPage( WizardState _nState ); - virtual WizardState determineNextState( WizardState _nCurrentState ) const; - virtual void enterState( WizardState _nState ); - virtual bool leaveState( WizardState _nState ); - virtual bool onFinish(); + virtual ::svt::OWizardPage* createPage( WizardState _nState ) SAL_OVERRIDE; + virtual WizardState determineNextState( WizardState _nCurrentState ) const SAL_OVERRIDE; + virtual void enterState( WizardState _nState ) SAL_OVERRIDE; + virtual bool leaveState( WizardState _nState ) SAL_OVERRIDE; + virtual bool onFinish() SAL_OVERRIDE; - virtual sal_Bool approveControl(sal_Int16 _nClassId); + virtual sal_Bool approveControl(sal_Int16 _nClassId) SAL_OVERRIDE; WizardState getFinalState() const { return isListBox() ? LCW_STATE_FIELDLINK : LCW_STATE_COMBODBFIELD; } @@ -116,12 +116,12 @@ namespace dbp protected: // TabPage overridables - virtual void ActivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; // OWizardPage overridables - virtual void initializePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); - virtual bool canAdvance() const; + virtual void initializePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; + virtual bool canAdvance() const SAL_OVERRIDE; protected: DECL_LINK( OnTableDoubleClicked, ListBox* ); @@ -150,12 +150,12 @@ namespace dbp DECL_LINK( OnTableDoubleClicked, ListBox* ); // TabPage overridables - virtual void ActivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; // OWizardPage overridables - virtual void initializePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); - virtual bool canAdvance() const; + virtual void initializePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; + virtual bool canAdvance() const SAL_OVERRIDE; }; @@ -177,12 +177,12 @@ namespace dbp protected: // TabPage overridables - virtual void ActivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; // OWizardPage overridables - virtual void initializePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); - virtual bool canAdvance() const; + virtual void initializePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; + virtual bool canAdvance() const SAL_OVERRIDE; private: void implCheckFinish(); @@ -202,13 +202,13 @@ namespace dbp OListComboSettings& getSettings() { return static_cast(getDialog())->getSettings(); } // TabPage overridables - virtual void ActivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; // OWizardPage overridables - virtual bool canAdvance() const; + virtual bool canAdvance() const SAL_OVERRIDE; // ODBFieldPage overridables - virtual OUString& getDBFieldSetting(); + virtual OUString& getDBFieldSetting() SAL_OVERRIDE; }; diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx index 7e3d8fbcbb34..299def94717d 100644 --- a/extensions/source/dbpilots/unoautopilot.hxx +++ b/extensions/source/dbpilots/unoautopilot.hxx @@ -64,11 +64,11 @@ namespace dbp public: // XTypeProvider - virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -77,16 +77,16 @@ namespace dbp SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); - virtual void implInitialize(const com::sun::star::uno::Any& _rValue); + virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE; }; #include "unoautopilot.inl" -- cgit v1.2.3