summaryrefslogtreecommitdiff
path: root/extensions/source/abpilot
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
commit567ef6d5782cdb729b49005caf6005610ce03e22 (patch)
tree7e3be1da41382e555d9091914ef7e064852a4fd4 /extensions/source/abpilot
parentc36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff)
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
Diffstat (limited to 'extensions/source/abpilot')
-rw-r--r--extensions/source/abpilot/abpfinalpage.hxx10
-rw-r--r--extensions/source/abpilot/abspage.hxx2
-rw-r--r--extensions/source/abpilot/abspilot.hxx12
-rw-r--r--extensions/source/abpilot/admininvokationpage.hxx6
-rw-r--r--extensions/source/abpilot/fieldmappingpage.hxx6
-rw-r--r--extensions/source/abpilot/tableselectionpage.hxx10
-rw-r--r--extensions/source/abpilot/typeselectionpage.hxx10
-rw-r--r--extensions/source/abpilot/unodialogabp.hxx28
8 files changed, 42 insertions, 42 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index 84ccc9f72184..bb54851e339d 100644
--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -57,15 +57,15 @@ namespace abp
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;
// TabDialog overridables
- virtual void ActivatePage();
- virtual void DeactivatePage();
+ virtual void ActivatePage() SAL_OVERRIDE;
+ virtual void DeactivatePage() SAL_OVERRIDE;
// OImportPage overridables
- virtual bool canAdvance() const;
+ virtual bool canAdvance() const SAL_OVERRIDE;
private:
DECL_LINK( OnNameModified, Edit* );
diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx
index fcbf77948848..0eb7368f92dd 100644
--- a/extensions/source/abpilot/abspage.hxx
+++ b/extensions/source/abpilot/abspage.hxx
@@ -54,7 +54,7 @@ namespace abp
const AddressSettings& getSettings() const;
// TabDialog overridables
- virtual void DeactivatePage();
+ virtual void DeactivatePage() SAL_OVERRIDE;
};
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index beecbf0a8d43..46d7bb0748ab 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -69,15 +69,15 @@ namespace abp
protected:
// OWizardMachine overridables
- virtual ::svt::OWizardPage* createPage( WizardState _nState );
- virtual void enterState( WizardState _nState );
- virtual bool prepareLeaveCurrentState( CommitPageReason _eReason );
- virtual bool onFinish();
+ virtual ::svt::OWizardPage* createPage( WizardState _nState ) SAL_OVERRIDE;
+ virtual void enterState( WizardState _nState ) SAL_OVERRIDE;
+ virtual bool prepareLeaveCurrentState( CommitPageReason _eReason ) SAL_OVERRIDE;
+ virtual bool onFinish() SAL_OVERRIDE;
// RoadmapWizard
- virtual OUString getStateDisplayName( WizardState _nState ) const;
+ virtual OUString getStateDisplayName( WizardState _nState ) const SAL_OVERRIDE;
- virtual bool Close();
+ virtual bool Close() SAL_OVERRIDE;
private:
DECL_LINK( OnCancelClicked, void* );
diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx
index 77d75df34180..192dec51fc67 100644
--- a/extensions/source/abpilot/admininvokationpage.hxx
+++ b/extensions/source/abpilot/admininvokationpage.hxx
@@ -44,11 +44,11 @@ namespace abp
protected:
// TabDialog overridables
- virtual void ActivatePage();
- virtual void initializePage();
+ virtual void ActivatePage() SAL_OVERRIDE;
+ virtual void initializePage() SAL_OVERRIDE;
// OImportPage overridables
- virtual bool canAdvance() const;
+ virtual bool canAdvance() const SAL_OVERRIDE;
private:
DECL_LINK( OnInvokeAdminDialog, void* );
diff --git a/extensions/source/abpilot/fieldmappingpage.hxx b/extensions/source/abpilot/fieldmappingpage.hxx
index 9509831f3fb3..ca6f53ce6b9c 100644
--- a/extensions/source/abpilot/fieldmappingpage.hxx
+++ b/extensions/source/abpilot/fieldmappingpage.hxx
@@ -42,11 +42,11 @@ namespace abp
protected:
// OWizardPage overridables
- virtual void initializePage();
+ virtual void initializePage() SAL_OVERRIDE;
// TabDialog overridables
- virtual void ActivatePage();
- virtual void DeactivatePage();
+ virtual void ActivatePage() SAL_OVERRIDE;
+ virtual void DeactivatePage() SAL_OVERRIDE;
private:
DECL_LINK( OnInvokeDialog, void* );
diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx
index 43ed8896b7e7..361ab5d5c83f 100644
--- a/extensions/source/abpilot/tableselectionpage.hxx
+++ b/extensions/source/abpilot/tableselectionpage.hxx
@@ -42,15 +42,15 @@ namespace abp
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;
// TabDialog overridables
- virtual void ActivatePage();
- virtual void DeactivatePage();
+ virtual void ActivatePage() SAL_OVERRIDE;
+ virtual void DeactivatePage() SAL_OVERRIDE;
// OImportPage overridables
- virtual bool canAdvance() const;
+ virtual bool canAdvance() const SAL_OVERRIDE;
private:
DECL_LINK( OnTableSelected, void* );
diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx
index bc0ef97358ca..cce22fbc8003 100644
--- a/extensions/source/abpilot/typeselectionpage.hxx
+++ b/extensions/source/abpilot/typeselectionpage.hxx
@@ -74,15 +74,15 @@ namespace abp
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;
// TabDialog overridables
- virtual void ActivatePage();
- virtual void DeactivatePage();
+ virtual void ActivatePage() SAL_OVERRIDE;
+ virtual void DeactivatePage() SAL_OVERRIDE;
// OImportPage overridables
- virtual bool canAdvance() const;
+ virtual bool canAdvance() const SAL_OVERRIDE;
private:
DECL_LINK( OnTypeSelected, void* );
diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx
index dac7d5ecb4d1..dc24fad4e860 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -50,17 +50,17 @@ namespace abp
public:
// XInterface (disambiguation)
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL acquire( ) throw ();
- virtual void SAL_CALL release( ) throw ();
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE;
+ virtual void SAL_CALL release( ) throw () SAL_OVERRIDE;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual ::com::sun::star::uno::Sequence<sal_Int8> 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 );
@@ -69,23 +69,23 @@ namespace abp
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;
+ virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
// XJob
- virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XInitialisation
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
using OABSPilotUno_DBase::execute;
protected:
// OGenericUnoDialog overridables
- virtual Dialog* createDialog(Window* _pParent);
- virtual void executedDialog(sal_Int16 _nExecutionResult);
+ virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE;
+ virtual void executedDialog(sal_Int16 _nExecutionResult) SAL_OVERRIDE;
};