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 /unoxml/source/events | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'unoxml/source/events')
-rw-r--r-- | unoxml/source/events/event.hxx | 20 | ||||
-rw-r--r-- | unoxml/source/events/mouseevent.hxx | 48 | ||||
-rw-r--r-- | unoxml/source/events/mutationevent.hxx | 32 | ||||
-rw-r--r-- | unoxml/source/events/uievent.hxx | 26 |
4 files changed, 63 insertions, 63 deletions
diff --git a/unoxml/source/events/event.hxx b/unoxml/source/events/event.hxx index d6df8a739d4a..472caa46dc3d 100644 --- a/unoxml/source/events/event.hxx +++ b/unoxml/source/events/event.hxx @@ -53,19 +53,19 @@ public: explicit CEvent(); virtual ~CEvent(); - virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override; + virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override; + virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL initEvent( const OUString& eventTypeArg, sal_Bool canBubbleArg, - sal_Bool cancelableArg) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool cancelableArg) throw (css::uno::RuntimeException, std::exception) override; }; }} #endif diff --git a/unoxml/source/events/mouseevent.hxx b/unoxml/source/events/mouseevent.hxx index 6a53ed3e7949..4c1964a71c1e 100644 --- a/unoxml/source/events/mouseevent.hxx +++ b/unoxml/source/events/mouseevent.hxx @@ -50,16 +50,16 @@ protected: public: explicit CMouseEvent(); - virtual sal_Int32 SAL_CALL getScreenX() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getScreenY() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getClientX() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getClientY() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getCtrlKey() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getShiftKey() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getAltKey() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getMetaKey() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getButton() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getRelatedTarget() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getScreenX() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getScreenY() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getClientX() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getClientY() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getCtrlKey() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getShiftKey() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getAltKey() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getMetaKey() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getButton() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getRelatedTarget() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL initMouseEvent( const OUString& typeArg, @@ -77,30 +77,30 @@ public: sal_Bool metaKeyArg, sal_Int16 buttonArg, const css::uno::Reference< css::xml::dom::events::XEventTarget >& relatedTargetArg) - throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(css::uno::RuntimeException, std::exception) override; // delegate to CUIevent - virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getDetail() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDetail() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL initUIEvent(const OUString& typeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg, const css::uno::Reference< css::xml::dom::views::XAbstractView >& viewArg, - sal_Int32 detailArg) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 detailArg) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override; + virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override; + virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL initEvent( const OUString& eventTypeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; }} #endif diff --git a/unoxml/source/events/mutationevent.hxx b/unoxml/source/events/mutationevent.hxx index d95a05f3ded5..5dc6472d9dff 100644 --- a/unoxml/source/events/mutationevent.hxx +++ b/unoxml/source/events/mutationevent.hxx @@ -52,11 +52,11 @@ public: virtual ~CMutationEvent(); - virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getRelatedNode() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getPrevValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getNewValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAttrName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::xml::dom::events::AttrChangeType SAL_CALL getAttrChange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::xml::dom::XNode > SAL_CALL getRelatedNode() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getPrevValue() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getNewValue() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAttrName() throw (css::uno::RuntimeException, std::exception) override; + virtual css::xml::dom::events::AttrChangeType SAL_CALL getAttrChange() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL initMutationEvent( const OUString& typeArg, sal_Bool canBubbleArg, @@ -65,23 +65,23 @@ public: const OUString& prevValueArg, const OUString& newValueArg, const OUString& attrNameArg, - css::xml::dom::events::AttrChangeType attrChangeArg) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::xml::dom::events::AttrChangeType attrChangeArg) throw (css::uno::RuntimeException, std::exception) override; // delegate to CEvent, since we are inheriting from CEvent and XEvent - virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override; + virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override; + virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL initEvent( const OUString& eventTypeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; }} #endif diff --git a/unoxml/source/events/uievent.hxx b/unoxml/source/events/uievent.hxx index 4d197b2876ef..7a6b57030dfa 100644 --- a/unoxml/source/events/uievent.hxx +++ b/unoxml/source/events/uievent.hxx @@ -44,29 +44,29 @@ protected: public: explicit CUIEvent(); - virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getDetail() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::xml::dom::views::XAbstractView > SAL_CALL getView() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getDetail() throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL initUIEvent(const OUString& typeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg, const css::uno::Reference< css::xml::dom::views::XAbstractView >& viewArg, - sal_Int32 detailArg) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Int32 detailArg) throw(css::uno::RuntimeException, std::exception) override; // delegate to CEvent, since we are inheriting from CEvent and XEvent - virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getTarget() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::dom::events::XEventTarget > SAL_CALL getCurrentTarget() throw (css::uno::RuntimeException, std::exception) override; + virtual css::xml::dom::events::PhaseType SAL_CALL getEventPhase() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getBubbles() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getCancelable() throw (css::uno::RuntimeException, std::exception) override; + virtual css::util::Time SAL_CALL getTimeStamp() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL stopPropagation() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL preventDefault() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL initEvent( const OUString& eventTypeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; }; }} #endif |