diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
tree | a70f4957c454b443520cbf91250c41d9eea80017 /framework/source/inc | |
parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (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 'framework/source/inc')
-rw-r--r-- | framework/source/inc/accelerators/acceleratorconfiguration.hxx | 88 | ||||
-rw-r--r-- | framework/source/inc/dispatch/loaddispatcher.hxx | 10 |
2 files changed, 49 insertions, 49 deletions
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 6d8c27e6e951..bf3ee79c62c8 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -116,81 +116,81 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, // XAcceleratorConfiguration virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents() - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand ) throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) throw(css::lang::IllegalArgumentException , - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XUIConfigurationPersistence virtual void SAL_CALL reload() throw(css::uno::Exception , - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL store() throw(css::uno::Exception , - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::Exception , - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL isModified() - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL isReadOnly() - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUIConfigurationStorage virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL hasStorage() - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUIConfiguration virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XReset // TODO use XPresetHandler instead if available virtual void SAL_CALL reset() - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // IStorageListener - virtual void changesOccurred(const OUString& sPath); + virtual void changesOccurred(const OUString& sPath) SAL_OVERRIDE; // helper for derived classes @@ -324,91 +324,91 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4< // XAcceleratorConfiguration virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents() - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setKeyEvent(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand ) throw(css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeKeyEvent(const css::awt::KeyEvent& aKeyEvent) throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getKeyEventsByCommand(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList) throw(css::lang::IllegalArgumentException , - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeCommandFromAllKeyEvents(const OUString& sCommand) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XUIConfigurationPersistence virtual void SAL_CALL reload() throw(css::uno::Exception , - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL store() throw(css::uno::Exception , - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) throw(css::uno::Exception , - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL isModified() - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL isReadOnly() - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUIConfigurationStorage virtual void SAL_CALL setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL hasStorage() - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUIConfiguration virtual void SAL_CALL addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& xListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XReset // TODO use XPresetHandler instead if available virtual void SAL_CALL reset() - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeResetListener(const css::uno::Reference< css::form::XResetListener >& xListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.util.XChangesListener virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // helper for derived classes diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index 374ac2928bfe..b3aec4cd4070 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -103,25 +103,25 @@ class LoadDispatcher : public ::cppu::WeakImplHelper2< css::frame::XNotifyingDi virtual void SAL_CALL dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDispatch virtual void SAL_CALL dispatch(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSynchronousDispatch virtual css::uno::Any SAL_CALL dispatchWithReturnValue( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: css::uno::Any impl_dispatch( const css::util::URL& rURL, |