diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-09-20 07:27:20 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-09-20 08:37:20 +0200 |
| commit | cc2fe8c763b7050f07968f31bcdb7e45b8c7464d (patch) | |
| tree | 499b8644a21d45f1317cfb9fc891e2f6d683802b /desktop/test | |
| parent | 475ea37809b5bec369d02a5ab500fac46ab40f0a (diff) | |
Replace SAL_OVERRIDE with override in internal code
Change-Id: Ifa446647b11fd1f1b0dc6a991b752480545634db
Reviewed-on: https://gerrit.libreoffice.org/60788
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop/test')
| -rw-r--r-- | desktop/test/deployment/active/active_native.cxx | 22 | ||||
| -rw-r--r-- | desktop/test/deployment/passive/passive_native.cxx | 22 |
2 files changed, 22 insertions, 22 deletions
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index cf8226ab34bd..0f12544b6a6b 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -81,22 +81,22 @@ private: virtual ~Provider() {} - virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getImplementationName() override { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() SAL_OVERRIDE + getSupportedServiceNames() override { return static_getSupportedServiceNames(); } virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( - css::util::URL const &, rtl::OUString const &, sal_Int32) SAL_OVERRIDE; + css::util::URL const &, rtl::OUString const &, sal_Int32) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( - css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests) SAL_OVERRIDE; + css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests) override; css::uno::Reference< css::uno::XComponentContext > context_; }; @@ -169,28 +169,28 @@ private: virtual ~Dispatch() {} - virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getImplementationName() override { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() SAL_OVERRIDE + getSupportedServiceNames() override { return static_getSupportedServiceNames(); } virtual void SAL_CALL dispatch( css::util::URL const &, - css::uno::Sequence< css::beans::PropertyValue > const &) SAL_OVERRIDE; + css::uno::Sequence< css::beans::PropertyValue > const &) override; virtual void SAL_CALL addStatusListener( css::uno::Reference< css::frame::XStatusListener > const &, - css::util::URL const &) SAL_OVERRIDE + css::util::URL const &) override {} virtual void SAL_CALL removeStatusListener( css::uno::Reference< css::frame::XStatusListener > const &, - css::util::URL const &) SAL_OVERRIDE + css::util::URL const &) override {} css::uno::Reference< css::uno::XComponentContext > context_; diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index aadd8793ab90..83b955a00313 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -78,22 +78,22 @@ private: virtual ~Provider() {} - virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getImplementationName() override { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() SAL_OVERRIDE + getSupportedServiceNames() override { return static_getSupportedServiceNames(); } virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( - css::util::URL const &, rtl::OUString const &, sal_Int32) SAL_OVERRIDE; + css::util::URL const &, rtl::OUString const &, sal_Int32) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( - css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests) SAL_OVERRIDE; + css::uno::Sequence< css::frame::DispatchDescriptor > const & Requests) override; css::uno::Reference< css::uno::XComponentContext > context_; }; @@ -166,28 +166,28 @@ private: virtual ~Dispatch() {} - virtual rtl::OUString SAL_CALL getImplementationName() SAL_OVERRIDE + virtual rtl::OUString SAL_CALL getImplementationName() override { return static_getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) SAL_OVERRIDE + virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< rtl::OUString > SAL_CALL - getSupportedServiceNames() SAL_OVERRIDE + getSupportedServiceNames() override { return static_getSupportedServiceNames(); } virtual void SAL_CALL dispatch( css::util::URL const &, - css::uno::Sequence< css::beans::PropertyValue > const &) SAL_OVERRIDE; + css::uno::Sequence< css::beans::PropertyValue > const &) override; virtual void SAL_CALL addStatusListener( css::uno::Reference< css::frame::XStatusListener > const &, - css::util::URL const &) SAL_OVERRIDE + css::util::URL const &) override {} virtual void SAL_CALL removeStatusListener( css::uno::Reference< css::frame::XStatusListener > const &, - css::util::URL const &) SAL_OVERRIDE + css::util::URL const &) override {} css::uno::Reference< css::uno::XComponentContext > context_; |