diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /shell/source/backends | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'shell/source/backends')
-rw-r--r-- | shell/source/backends/desktopbe/desktopbackend.cxx | 20 | ||||
-rw-r--r-- | shell/source/backends/gconfbe/gconfbackend.cxx | 20 | ||||
-rw-r--r-- | shell/source/backends/kde4be/kde4backend.cxx | 20 | ||||
-rw-r--r-- | shell/source/backends/kdebe/kdebackend.cxx | 20 | ||||
-rw-r--r-- | shell/source/backends/localebe/localebackend.hxx | 20 | ||||
-rw-r--r-- | shell/source/backends/macbe/macbackend.hxx | 20 |
6 files changed, 60 insertions, 60 deletions
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index d0d139159284..bd40fc4826a3 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -75,19 +75,19 @@ private: virtual ~Default() {} virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return getDefaultImplementationName(); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return ServiceName == getSupportedServiceNames()[0]; } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { return getDefaultSupportedServiceNames(); } virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( @@ -96,20 +96,20 @@ private: css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getPropertyValue( OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL removePropertyChangeListener( @@ -117,7 +117,7 @@ private: css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL addVetoableChangeListener( @@ -125,7 +125,7 @@ private: css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL removeVetoableChangeListener( @@ -133,7 +133,7 @@ private: css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} }; diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index 1143f31d35d0..5b14ab383789 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -76,19 +76,19 @@ private: virtual ~Service() {} virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return getServiceImplementationName(); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return ServiceName == getSupportedServiceNames()[0]; } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { return getServiceSupportedServiceNames(); } virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( @@ -97,20 +97,20 @@ private: css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getPropertyValue( OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL removePropertyChangeListener( @@ -118,7 +118,7 @@ private: css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL addVetoableChangeListener( @@ -126,7 +126,7 @@ private: css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL removeVetoableChangeListener( @@ -134,7 +134,7 @@ private: css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} bool enabled_; diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index 25af4d501588..35f57f6af98e 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -76,19 +76,19 @@ private: virtual ~Service() {} virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return getServiceImplementationName(); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return ServiceName == getSupportedServiceNames()[0]; } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { return getServiceSupportedServiceNames(); } virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( @@ -97,20 +97,20 @@ private: css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getPropertyValue( OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL removePropertyChangeListener( @@ -118,7 +118,7 @@ private: css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL addVetoableChangeListener( @@ -126,7 +126,7 @@ private: css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL removeVetoableChangeListener( @@ -134,7 +134,7 @@ private: css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} bool enabled_; diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index dd0dd2bd025f..d13c0d136218 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -76,19 +76,19 @@ private: virtual ~Service() {} virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return getServiceImplementationName(); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return ServiceName == getSupportedServiceNames()[0]; } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override { return getServiceSupportedServiceNames(); } virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( @@ -97,20 +97,20 @@ private: css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getPropertyValue( OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL removePropertyChangeListener( @@ -118,7 +118,7 @@ private: css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL addVetoableChangeListener( @@ -126,7 +126,7 @@ private: css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL removeVetoableChangeListener( @@ -134,7 +134,7 @@ private: css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} bool enabled_; diff --git a/shell/source/backends/localebe/localebackend.hxx b/shell/source/backends/localebe/localebackend.hxx index b90305c96cbd..5d7a2e732c48 100644 --- a/shell/source/backends/localebe/localebackend.hxx +++ b/shell/source/backends/localebe/localebackend.hxx @@ -40,15 +40,15 @@ class LocaleBackend : public ::cppu::WeakImplHelper < // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw (uno::RuntimeException, std::exception) override ; virtual sal_Bool SAL_CALL supportsService( const OUString& aServiceName ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw (uno::RuntimeException, std::exception) override ; virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames( ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw (uno::RuntimeException, std::exception) override ; /** Provides the implementation name. @@ -65,7 +65,7 @@ class LocaleBackend : public ::cppu::WeakImplHelper < // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( @@ -74,20 +74,20 @@ class LocaleBackend : public ::cppu::WeakImplHelper < css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getPropertyValue( OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL removePropertyChangeListener( @@ -95,7 +95,7 @@ class LocaleBackend : public ::cppu::WeakImplHelper < css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL addVetoableChangeListener( @@ -103,7 +103,7 @@ class LocaleBackend : public ::cppu::WeakImplHelper < css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL removeVetoableChangeListener( @@ -111,7 +111,7 @@ class LocaleBackend : public ::cppu::WeakImplHelper < css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} protected: diff --git a/shell/source/backends/macbe/macbackend.hxx b/shell/source/backends/macbe/macbackend.hxx index 6de7fd95ea6b..758efc90b2bc 100644 --- a/shell/source/backends/macbe/macbackend.hxx +++ b/shell/source/backends/macbe/macbackend.hxx @@ -40,13 +40,13 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService(const OUString& aServiceName) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; /** Provides the implementation name. @@ -64,7 +64,7 @@ public: // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( @@ -73,20 +73,20 @@ public: css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getPropertyValue( OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL removePropertyChangeListener( @@ -94,7 +94,7 @@ public: css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL addVetoableChangeListener( @@ -102,7 +102,7 @@ public: css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} virtual void SAL_CALL removeVetoableChangeListener( @@ -110,7 +110,7 @@ public: css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override {} protected: |