summaryrefslogtreecommitdiff
path: root/desktop/source/migration
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 16:37:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 16:39:26 +0100
commit70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch)
treea70f4957c454b443520cbf91250c41d9eea80017 /desktop/source/migration
parent8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff)
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'desktop/source/migration')
-rw-r--r--desktop/source/migration/services/basicmigration.hxx10
-rw-r--r--desktop/source/migration/services/jvmfwk.cxx36
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.hxx22
-rw-r--r--desktop/source/migration/services/wordbookmigration.hxx10
4 files changed, 39 insertions, 39 deletions
diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx
index 59acfc2c2ca0..3903e1c19eb5 100644
--- a/desktop/source/migration/services/basicmigration.hxx
+++ b/desktop/source/migration/services/basicmigration.hxx
@@ -70,21 +70,21 @@ namespace migration
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XInitialization
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);
+ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XJob
virtual ::com::sun::star::uno::Any SAL_CALL execute(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index f6d5b0004ddd..2ffdc531dc89 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -92,30 +92,30 @@ class JavaMigration : public ::cppu::WeakImplHelper4<
public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception);
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName )
- throw (css::uno::RuntimeException, std::exception);
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception);
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
- throw(css::uno::Exception, css::uno::RuntimeException, std::exception);
+ throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XJob
virtual css::uno::Any SAL_CALL execute(
const css::uno::Sequence<css::beans::NamedValue >& Arguments )
throw (css::lang::IllegalArgumentException, css::uno::Exception,
- css::uno::RuntimeException, std::exception);
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XLayerHandler
virtual void SAL_CALL startLayer()
- throw(::com::sun::star::lang::WrappedTargetException, std::exception);
+ throw(::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL endLayer()
throw(
::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException, std::exception );
+ ::com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL overrideNode(
const OUString& aName,
@@ -123,14 +123,14 @@ public:
sal_Bool bClear)
throw(
::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException, std::exception );
+ ::com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL addOrReplaceNode(
const OUString& aName,
sal_Int16 aAttributes)
throw(
::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException, std::exception );
+ ::com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL addOrReplaceNodeFromTemplate(
const OUString& aName,
@@ -138,18 +138,18 @@ public:
sal_Int16 aAttributes )
throw(
::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException, std::exception );
+ ::com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL endNode()
throw(
::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException, std::exception );
+ ::com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL dropNode(
const OUString& aName )
throw(
::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException, std::exception );
+ ::com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL overrideProperty(
const OUString& aName,
@@ -158,25 +158,25 @@ public:
sal_Bool bClear )
throw(
::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException, std::exception );
+ ::com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValue(
const css::uno::Any& aValue )
throw(
::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException, std::exception );
+ ::com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL setPropertyValueForLocale(
const css::uno::Any& aValue,
const OUString& aLocale )
throw(
::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException, std::exception );
+ ::com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL endProperty()
throw(
::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException, std::exception );
+ ::com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL addProperty(
const OUString& aName,
@@ -184,7 +184,7 @@ public:
const css::uno::Type& aType )
throw(
::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException, std::exception );
+ ::com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL addPropertyWithValue(
const OUString& aName,
@@ -192,7 +192,7 @@ public:
const css::uno::Any& aValue )
throw(
::com::sun::star::configuration::backend::MalformedDataException,
- ::com::sun::star::lang::WrappedTargetException, std::exception );
+ ::com::sun::star::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE;
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index 2ba42696d693..924995e259f9 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -94,21 +94,21 @@ namespace migration
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XInitialization
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);
+ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XJob
virtual ::com::sun::star::uno::Any SAL_CALL execute(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
class TmpRepositoryCommandEnv
@@ -124,21 +124,21 @@ namespace migration
// XCommandEnvironment
virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > SAL_CALL
- getInteractionHandler() throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ getInteractionHandler() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler >
- SAL_CALL getProgressHandler() throw ( ::com::sun::star::uno::RuntimeException, std::exception );
+ SAL_CALL getProgressHandler() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XInteractionHandler
virtual void SAL_CALL handle(
::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest > const & xRequest )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XProgressHandler
virtual void SAL_CALL push( ::com::sun::star::uno::Any const & Status )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL update( ::com::sun::star::uno::Any const & Status )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
- virtual void SAL_CALL pop() throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL pop() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx
index a25e245ff998..6ed7b8968881 100644
--- a/desktop/source/migration/services/wordbookmigration.hxx
+++ b/desktop/source/migration/services/wordbookmigration.hxx
@@ -70,21 +70,21 @@ namespace migration
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception);
+ throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XInitialization
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);
+ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XJob
virtual ::com::sun::star::uno::Any SAL_CALL execute(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};