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 /desktop/source/app | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'desktop/source/app')
-rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
-rw-r--r-- | desktop/source/app/check_ext_deps.cxx | 12 | ||||
-rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 4 | ||||
-rw-r--r-- | desktop/source/app/desktopcontext.hxx | 2 | ||||
-rw-r--r-- | desktop/source/app/dispatchwatcher.hxx | 4 | ||||
-rw-r--r-- | desktop/source/app/officeipcthread.cxx | 4 | ||||
-rw-r--r-- | desktop/source/app/officeipcthread.hxx | 14 |
7 files changed, 21 insertions, 21 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index a3b436d92867..60e2605cb000 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1928,7 +1928,7 @@ class ExitTimer : public Timer SetTimeout(500); Start(); } - virtual void Invoke() SAL_OVERRIDE + virtual void Invoke() override { exit(42); } diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 7b1511b8a987..6a448bff1c2e 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -85,21 +85,21 @@ public: // XCommandEnvironment virtual uno::Reference<task::XInteractionHandler > SAL_CALL - getInteractionHandler() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + getInteractionHandler() throw (uno::RuntimeException, std::exception) override; virtual uno::Reference<ucb::XProgressHandler > - SAL_CALL getProgressHandler() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + SAL_CALL getProgressHandler() throw (uno::RuntimeException, std::exception) override; // XInteractionHandler virtual void SAL_CALL handle( uno::Reference<task::XInteractionRequest > const & xRequest ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; // XProgressHandler virtual void SAL_CALL push( uno::Any const & Status ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL update( uno::Any const & Status ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL pop() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL pop() throw (uno::RuntimeException, std::exception) override; }; diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index f6bd390f8c5e..4bbf021af262 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -81,9 +81,9 @@ public: virtual ~ExtCommandLineSupplier() {} - virtual boost::optional< OUString > getCwdUrl() SAL_OVERRIDE { return m_cwdUrl; } + virtual boost::optional< OUString > getCwdUrl() override { return m_cwdUrl; } - virtual bool next(OUString * argument) SAL_OVERRIDE { + virtual bool next(OUString * argument) override { OSL_ASSERT(argument != NULL); if (m_index < m_count) { rtl_getAppCommandArg(m_index++, &argument->pData); diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx index 2a211d1a85ae..fda7774c051a 100644 --- a/desktop/source/app/desktopcontext.hxx +++ b/desktop/source/app/desktopcontext.hxx @@ -32,7 +32,7 @@ namespace desktop // XCurrentContext virtual css::uno::Any SAL_CALL getValueByName( const OUString& Name ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: css::uno::Reference< css::uno::XCurrentContext > m_xNextContext; diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index d3e2e02796c3..338a44e997ff 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -79,10 +79,10 @@ class DispatchWatcher : public ::cppu::WeakImplHelper< css::frame::XDispatchResu // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // XDispachResultListener - virtual void SAL_CALL dispatchFinished( const css::frame::DispatchResultEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispatchFinished( const css::frame::DispatchResultEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; // Access function to get a dispatcher watcher reference. There must be a global reference holder static DispatchWatcher* GetDispatchWatcher(); diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 50ded8f957be..45d30f51cf16 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -145,9 +145,9 @@ public: virtual ~Parser() {} - virtual boost::optional< OUString > getCwdUrl() SAL_OVERRIDE { return m_cwdUrl; } + virtual boost::optional< OUString > getCwdUrl() override { return m_cwdUrl; } - virtual bool next(OUString * argument) SAL_OVERRIDE { return next(argument, true); } + virtual bool next(OUString * argument) override { return next(argument, true); } private: bool next(OUString * argument, bool prefix) { diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index e3902261a54d..10d2c374db12 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -93,7 +93,7 @@ class OfficeIPCThread : public salhelper::Thread virtual ~OfficeIPCThread(); /// Working method which should be overridden - virtual void execute() SAL_OVERRIDE; + virtual void execute() override; public: enum Status @@ -137,21 +137,21 @@ class OfficeIPCThreadController : public ::cppu::WeakImplHelper< // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) override; // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XTerminateListener virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) - throw( css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; }; } |