From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- winaccessibility/inc/AccComponentEventListener.hxx | 6 +++--- winaccessibility/inc/AccContainerEventListener.hxx | 10 +++++----- winaccessibility/inc/AccDialogEventListener.hxx | 2 +- winaccessibility/inc/AccFrameEventListener.hxx | 2 +- winaccessibility/inc/AccListEventListener.hxx | 2 +- winaccessibility/inc/AccMenuEventListener.hxx | 2 +- winaccessibility/inc/AccObjectContainerEventListener.hxx | 4 ++-- winaccessibility/inc/AccParagraphEventListener.hxx | 2 +- winaccessibility/inc/AccTextComponentEventListener.hxx | 2 +- winaccessibility/inc/AccWindowEventListener.hxx | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) (limited to 'winaccessibility') diff --git a/winaccessibility/inc/AccComponentEventListener.hxx b/winaccessibility/inc/AccComponentEventListener.hxx index d05aa64227fa..27f06e687aee 100644 --- a/winaccessibility/inc/AccComponentEventListener.hxx +++ b/winaccessibility/inc/AccComponentEventListener.hxx @@ -59,9 +59,9 @@ public: virtual void HandleCaretChangedEvent( css::uno::Any oldValue, css::uno::Any newValue); - virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE; - virtual void FireStatePropertyChange(short state, bool set) SAL_OVERRIDE; - virtual void FireStateFocusedChange(bool enable) SAL_OVERRIDE; + virtual void SetComponentState(short state, bool enable) override; + virtual void FireStatePropertyChange(short state, bool set) override; + virtual void FireStateFocusedChange(bool enable) override; void HandleSelectionChangedEventNoArgs(); diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx index 5f556ee3e5bc..1df510361ee9 100644 --- a/winaccessibility/inc/AccContainerEventListener.hxx +++ b/winaccessibility/inc/AccContainerEventListener.hxx @@ -59,16 +59,16 @@ public: virtual void HandleTextChangedEvent( css::uno::Any oldValue, css::uno::Any newValue); virtual void HandleStateChangedEvent( - css::uno::Any oldValue, css::uno::Any newValue) SAL_OVERRIDE; + css::uno::Any oldValue, css::uno::Any newValue) override; //for value changed event virtual void HandleValueChangedEvent( css::uno::Any oldValue, css::uno::Any newValue); //state changed - virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE; - virtual void FireStatePropertyChange(short state, bool set) SAL_OVERRIDE; - virtual void FireStateFocusedChange(bool enable) SAL_OVERRIDE; + virtual void SetComponentState(short state, bool enable) override; + virtual void FireStatePropertyChange(short state, bool set) override; + virtual void FireStateFocusedChange(bool enable) override; virtual bool IsEditable( css::uno::Reference xContext); @@ -94,7 +94,7 @@ public: const css::uno::Any &oldValue, const css::uno::Any &newValue); //for name changed event - virtual void HandleNameChangedEvent(css::uno::Any name) SAL_OVERRIDE; + virtual void HandleNameChangedEvent(css::uno::Any name) override; }; #endif // INCLUDED_WINACCESSIBILITY_INC_ACCCONTAINEREVENTLISTENER_HXX diff --git a/winaccessibility/inc/AccDialogEventListener.hxx b/winaccessibility/inc/AccDialogEventListener.hxx index f392d737adcd..64c745ff0129 100644 --- a/winaccessibility/inc/AccDialogEventListener.hxx +++ b/winaccessibility/inc/AccDialogEventListener.hxx @@ -45,7 +45,7 @@ public: css::uno::Any oldValue, css::uno::Any newValue); //state changed - virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE; + virtual void SetComponentState(short state, bool enable) override; }; diff --git a/winaccessibility/inc/AccFrameEventListener.hxx b/winaccessibility/inc/AccFrameEventListener.hxx index 318b7b6bc550..e4b28610fecf 100644 --- a/winaccessibility/inc/AccFrameEventListener.hxx +++ b/winaccessibility/inc/AccFrameEventListener.hxx @@ -46,7 +46,7 @@ public: css::uno::Any oldValue, css::uno::Any newValue); //state changed - virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE; + virtual void SetComponentState(short state, bool enable) override; }; diff --git a/winaccessibility/inc/AccListEventListener.hxx b/winaccessibility/inc/AccListEventListener.hxx index 6065fdad7ace..2320e77803a8 100644 --- a/winaccessibility/inc/AccListEventListener.hxx +++ b/winaccessibility/inc/AccListEventListener.hxx @@ -48,7 +48,7 @@ public: css::uno::Any oldValue, css::uno::Any newValue); //for value changed event virtual void HandleValueChangedEvent( - css::uno::Any oldValue, css::uno::Any newValue) SAL_OVERRIDE; + css::uno::Any oldValue, css::uno::Any newValue) override; }; #endif // INCLUDED_WINACCESSIBILITY_INC_ACCLISTEVENTLISTENER_HXX diff --git a/winaccessibility/inc/AccMenuEventListener.hxx b/winaccessibility/inc/AccMenuEventListener.hxx index 362ad74bb888..c7b05e3e5cb2 100644 --- a/winaccessibility/inc/AccMenuEventListener.hxx +++ b/winaccessibility/inc/AccMenuEventListener.hxx @@ -49,7 +49,7 @@ public: virtual void HandleSelectionChangedEventNoArgs(); //for state changed event - virtual void FireStatePropertyChange(short state, bool set) SAL_OVERRIDE; + virtual void FireStatePropertyChange(short state, bool set) override; }; #endif // INCLUDED_WINACCESSIBILITY_INC_ACCMENUEVENTLISTENER_HXX diff --git a/winaccessibility/inc/AccObjectContainerEventListener.hxx b/winaccessibility/inc/AccObjectContainerEventListener.hxx index 5faf38e81d39..e52b59577949 100644 --- a/winaccessibility/inc/AccObjectContainerEventListener.hxx +++ b/winaccessibility/inc/AccObjectContainerEventListener.hxx @@ -39,10 +39,10 @@ public: virtual ~AccObjectContainerEventListener(); virtual void HandleStateChangedEvent( - css::uno::Any oldValue, css::uno::Any newValue) SAL_OVERRIDE; + css::uno::Any oldValue, css::uno::Any newValue) override; //for visible data changed event, for shapes, the visiabledatachanged should be mapped to LOCATION_CHANGED - virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE; + virtual void HandleVisibleDataChangedEvent() override; }; #endif diff --git a/winaccessibility/inc/AccParagraphEventListener.hxx b/winaccessibility/inc/AccParagraphEventListener.hxx index c0fb6e4a5ce5..7ecf1c870d11 100644 --- a/winaccessibility/inc/AccParagraphEventListener.hxx +++ b/winaccessibility/inc/AccParagraphEventListener.hxx @@ -45,7 +45,7 @@ public: virtual void HandleCaretChangedEvent( css::uno::Any oldValue, css::uno::Any newValue); - virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE; + virtual void SetComponentState(short state, bool enable) override; //add TEXT_SELECTION_CHANGED event void HandleTextSelectionChangedEvent(); diff --git a/winaccessibility/inc/AccTextComponentEventListener.hxx b/winaccessibility/inc/AccTextComponentEventListener.hxx index 5f1a6f54f8cf..5bb7986eb522 100644 --- a/winaccessibility/inc/AccTextComponentEventListener.hxx +++ b/winaccessibility/inc/AccTextComponentEventListener.hxx @@ -38,7 +38,7 @@ public: AccTextComponentEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); virtual ~AccTextComponentEventListener(); - virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE; + virtual void SetComponentState(short state, bool enable) override; }; diff --git a/winaccessibility/inc/AccWindowEventListener.hxx b/winaccessibility/inc/AccWindowEventListener.hxx index 1bf3dd27f2c9..8db9b0aafa8e 100644 --- a/winaccessibility/inc/AccWindowEventListener.hxx +++ b/winaccessibility/inc/AccWindowEventListener.hxx @@ -46,7 +46,7 @@ public: css::uno::Any oldValue, css::uno::Any newValue); //state changed - virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE; + virtual void SetComponentState(short state, bool enable) override; }; -- cgit