winaccessibility: make listener methods a bit more obvious

- disambiguate overloading
- only use SAL_CALL for UNO methods, and non-UNO methods start uppercase
- use SAL_OVERRIDE

Change-Id: Ib57adad65b2b8e8246b103ff77ce162b0b540422

15 files changed, 103 insertions, 101 deletions

diff --git a/winaccessibility/inc/AccComponentEventListener.hxx b/winaccessibility/inc/AccComponentEventListener.hxx
index 05ecc12d7952..e52fbac30f8e 100644
--- a/winaccessibility/inc/AccComponentEventListener.hxx
+++ b/winaccessibility/inc/AccComponentEventListener.hxx
@@ -41,39 +41,38 @@ public:
     AccComponentEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccComponentEventListener();
 
-    //AccessibleEventListener
+    // XAccessibleEventListener
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for value changed event
-    virtual void SAL_CALL handleValueChangedEvent(
+    virtual void HandleValueChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 
     //for action changed event
-    virtual void SAL_CALL handleActionChangedEvent();
+    virtual void HandleActionChangedEvent();
 
     //for text changed event
-    virtual void SAL_CALL handleTextChangedEvent(
+    virtual void HandleTextChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 
     //for caret changed event
-    virtual void SAL_CALL handleCaretChangedEvent(
+    virtual void HandleCaretChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 
     //for visible data changed event
-    virtual void SAL_CALL handleVisibleDataChangedEvent();
+    virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
 
     //for bound rect changed event
-    virtual void SAL_CALL handleBoundrectChangedEvent();
+    virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
 
-    virtual void SAL_CALL setComponentState(short state, bool enable);
-    virtual void SAL_CALL fireStatePropertyChange(short state, bool set
-                                                     );
-    virtual void SAL_CALL fireStateFocusdChange(bool enable);
+    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;
 
-    void handleSelectionChangedEvent();
+    void HandleSelectionChangedEventNoArgs();
 
     //add TEXT_SELECTION_CHANGED event
-    void handleTextSelectionChangedEvent();
+    void HandleTextSelectionChangedEvent();
 };
 
 #endif
diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx
index d7019dcd25ca..2f59d6c40274 100644
--- a/winaccessibility/inc/AccContainerEventListener.hxx
+++ b/winaccessibility/inc/AccContainerEventListener.hxx
@@ -45,63 +45,62 @@ public:
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for child changed event
-    virtual void SAL_CALL handleChildChangedEvent(
+    virtual void HandleChildChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 
     //for selection changed event
-    virtual void SAL_CALL handleSelectionChangedEvent(
+    virtual void HandleSelectionChangedEvent(
             const css::uno::Any &oldValue, const css::uno::Any &newValue);
 
     //for all children changed event
-    virtual void SAL_CALL handleAllChildrenChangedEvent();
+    virtual void HandleAllChildrenChangedEvent();
 
     //for text changed event
-    virtual void SAL_CALL handleTextChangedEvent(
-            css::uno::Any oldValue, css::uno::Any newValue);
-    virtual void SAL_CALL handleStateChangedEvent(
+    virtual void HandleTextChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
+    virtual void HandleStateChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue) SAL_OVERRIDE;
 
     //for visible data changed event
-    virtual void SAL_CALL handleVisibleDataChangedEvent();
+    virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
 
     //for bound rect changed event
-    virtual void SAL_CALL handleBoundrectChangedEvent();
+    virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
 
     //for value changed event
-    virtual void SAL_CALL handleValueChangedEvent(
+    virtual void HandleValueChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 
     //state changed
-    virtual void SAL_CALL setComponentState(short state, bool enable);
-    virtual void SAL_CALL fireStatePropertyChange(short state, bool set
-                                                     );
-    virtual void SAL_CALL fireStateFocusdChange(bool enable);
-    virtual bool SAL_CALL IsEditable(
+    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 bool IsEditable(
         css::uno::Reference<css::accessibility::XAccessibleContext> xContext);
 
     // update all children's state
-    void SAL_CALL UpdateAllChildrenState( com::sun::star::accessibility::XAccessible* pXAccessible );
+    void UpdateAllChildrenState(
+            com::sun::star::accessibility::XAccessible* pXAccessible);
 
     bool NotifyChildEvent(short nWinEvent, const css::uno::Any &Value);
 
-    virtual void handleSelectionChangedAddEvent(
+    virtual void HandleSelectionChangedAddEvent(
             const css::uno::Any &oldValue, const css::uno::Any &newValue);
-    virtual void handleSelectionChangedRemoveEvent(
+    virtual void HandleSelectionChangedRemoveEvent(
             const css::uno::Any &oldValue, const css::uno::Any &newValue);
-    virtual void handleSelectionChangedWithinEvent(
+    virtual void HandleSelectionChangedWithinEvent(
             const css::uno::Any &oldValue, const css::uno::Any &newValue);
 
-    virtual void handlePageChangedEvent(
+    virtual void HandlePageChangedEvent(
             const css::uno::Any &oldValue, const css::uno::Any &newValue);
 
-    virtual void handleSectionChangedEvent(
+    virtual void HandleSectionChangedEvent(
             const css::uno::Any &oldValue, const css::uno::Any &newValue);
-    virtual void handleColumnChangedEvent(
+    virtual void HandleColumnChangedEvent(
             const css::uno::Any &oldValue, const css::uno::Any &newValue);
-    //IAccessibility2 Implementation 2009-----
+
     //for name changed event
-    virtual void SAL_CALL handleNameChangedEvent(css::uno::Any name);
-    //-----IAccessibility2 Implementation 2009
+    virtual void HandleNameChangedEvent(css::uno::Any name) SAL_OVERRIDE;
 };
 
 #endif
diff --git a/winaccessibility/inc/AccDescendantManagerEventListener.hxx b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
index 240e4f79047e..bb5add64689f 100644
--- a/winaccessibility/inc/AccDescendantManagerEventListener.hxx
+++ b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
@@ -39,27 +39,27 @@ public:
     AccDescendantManagerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccDescendantManagerEventListener();
 
-    //AccessibleEventListener
+    // XAccessibleEventListener
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for selection changed event
-    virtual void SAL_CALL handleSelectionChangedEvent(
+    virtual void HandleSelectionChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 
     //for child changed event
-    virtual void SAL_CALL handleChildChangedEvent(
+    virtual void HandleChildChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 
-    virtual void SAL_CALL handleChildChangedNoFocusEvent(
+    virtual void HandleChildChangedNoFocusEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 
     bool NotifyChildEvent(short nWinEvent,const css::uno::Any &Value);
 
-    virtual void handleSelectionChangedAddEvent(
+    virtual void HandleSelectionChangedAddEvent(
             const css::uno::Any &oldValue, const css::uno::Any &newValue);
-    virtual void handleSelectionChangedRemoveEvent(
+    virtual void HandleSelectionChangedRemoveEvent(
             const css::uno::Any &oldValue, const css::uno::Any &newValue);
-    virtual void handleSelectionChangedWithinEvent(
+    virtual void HandleSelectionChangedWithinEvent(
             const css::uno::Any &oldValue, const css::uno::Any &newValue);
 };
 
diff --git a/winaccessibility/inc/AccDialogEventListener.hxx b/winaccessibility/inc/AccDialogEventListener.hxx
index 47e3215be4c4..2c7c137b573e 100644
--- a/winaccessibility/inc/AccDialogEventListener.hxx
+++ b/winaccessibility/inc/AccDialogEventListener.hxx
@@ -41,19 +41,17 @@ public:
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for child changed event
-    virtual void SAL_CALL handleChildChangedEvent(
+    virtual void HandleChildChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 
     //for visible data changed event
-    virtual void SAL_CALL handleVisibleDataChangedEvent();
+    virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
 
     //for bound rect changed event
-    virtual void SAL_CALL handleBoundrectChangedEvent();
+    virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
 
     //state changed
-    virtual void SAL_CALL setComponentState(short state, bool enable);
-    //virtual void SAL_CALL fireStatePropertyChange(short state, bool set);
-    //virtual void SAL_CALL fireStateFocusdChange(bool enable);
+    virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
 
 };
 
diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx
index 7447fe89f034..ec90022a63fa 100644
--- a/winaccessibility/inc/AccEventListener.hxx
+++ b/winaccessibility/inc/AccEventListener.hxx
@@ -50,37 +50,37 @@ public:
     AccEventListener( com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccEventListener();
 
-    //AccessibleEventListener
+    // XEventListener
+    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XAccessibleEventListener
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for name changed event
-    virtual void SAL_CALL handleNameChangedEvent(css::uno::Any name);
+    virtual void HandleNameChangedEvent(css::uno::Any name);
 
     //for description changed event
-    virtual void SAL_CALL handleDescriptionChangedEvent(css::uno::Any desc);
+    virtual void HandleDescriptionChangedEvent(css::uno::Any desc);
 
     //for state changed event
-    virtual void SAL_CALL handleStateChangedEvent(
+    virtual void HandleStateChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
-    virtual void SAL_CALL setComponentState(short state, bool enable);
-    virtual void SAL_CALL fireStatePropertyChange(short state, bool set
-                                                     );
-    virtual void SAL_CALL fireStateFocusdChange(bool enable);
+    virtual void SetComponentState(short state, bool enable);
+    virtual void FireStatePropertyChange(short state, bool set);
+    virtual void FireStateFocusedChange(bool enable);
 
     //for bound rect changed event
-    virtual void SAL_CALL handleBoundrectChangedEvent();
+    virtual void HandleBoundrectChangedEvent();
 
     //for visible data changed event
-    virtual void SAL_CALL handleVisibleDataChangedEvent();
+    virtual void HandleVisibleDataChangedEvent();
 
-    //for interface
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
     //get the accessible role of pAccessible
-    virtual short SAL_CALL getRole();
+    virtual short GetRole();
     //get the accessible parent's role
-    virtual short SAL_CALL getParentRole();
-public:
-    void removeMeFromBroadcaster();
+    virtual short GetParentRole();
+
+    void RemoveMeFromBroadcaster();
 };
 
 #endif
diff --git a/winaccessibility/inc/AccFrameEventListener.hxx b/winaccessibility/inc/AccFrameEventListener.hxx
index d606edcc1f77..a47310efedf0 100644
--- a/winaccessibility/inc/AccFrameEventListener.hxx
+++ b/winaccessibility/inc/AccFrameEventListener.hxx
@@ -38,23 +38,21 @@ public:
     AccFrameEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccFrameEventListener();
 
-    //AccessibleEventListener
+    // XAccessibleEventListener
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for child changed event
-    virtual void SAL_CALL handleChildChangedEvent(
+    virtual void HandleChildChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 
     //for visible data changed event
-    virtual void SAL_CALL handleVisibleDataChangedEvent();
+    virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
 
     //for bound rect changed event
-    virtual void SAL_CALL handleBoundrectChangedEvent();
+    virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
 
     //state changed
-    virtual void SAL_CALL setComponentState(short state, bool enable);
-    //virtual void SAL_CALL fireStatePropertyChange(short state, bool set);
-    //virtual void SAL_CALL fireStateFocusdChange(bool enable);
+    virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
 
 };
 
diff --git a/winaccessibility/inc/AccListEventListener.hxx b/winaccessibility/inc/AccListEventListener.hxx
index 0addafd424de..bd70194b9697 100644
--- a/winaccessibility/inc/AccListEventListener.hxx
+++ b/winaccessibility/inc/AccListEventListener.hxx
@@ -40,14 +40,15 @@ public:
     AccListEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccListEventListener();
 
-    //AccessibleEventListener
+    // XAccessibleEventListener
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+
     //for active descendant changed event
-    virtual void SAL_CALL handleActiveDescendantChangedEvent(
+    virtual void HandleActiveDescendantChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
     //for value changed event
-    virtual void SAL_CALL handleValueChangedEvent(
-            css::uno::Any oldValue, css::uno::Any newValue);
+    virtual void HandleValueChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue) SAL_OVERRIDE;
 };
 
 #endif
diff --git a/winaccessibility/inc/AccMenuEventListener.hxx b/winaccessibility/inc/AccMenuEventListener.hxx
index 662469e4d1fe..5a4c6e5b832b 100644
--- a/winaccessibility/inc/AccMenuEventListener.hxx
+++ b/winaccessibility/inc/AccMenuEventListener.hxx
@@ -42,14 +42,14 @@ public:
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for child changed event
-    virtual void SAL_CALL handleChildChangedEvent(
+    virtual void HandleChildChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 
     //for selection changed event
-    virtual void SAL_CALL handleSelectionChangedEvent();
+    virtual void HandleSelectionChangedEventNoArgs();
 
     //for state changed event
-    virtual void SAL_CALL fireStatePropertyChange(short state, bool set );
+    virtual void FireStatePropertyChange(short state, bool set) SAL_OVERRIDE;
 };
 
 #endif
diff --git a/winaccessibility/inc/AccObjectContainerEventListener.hxx b/winaccessibility/inc/AccObjectContainerEventListener.hxx
index 878f7c0b75c0..fd046cd17cb8 100644
--- a/winaccessibility/inc/AccObjectContainerEventListener.hxx
+++ b/winaccessibility/inc/AccObjectContainerEventListener.hxx
@@ -38,11 +38,11 @@ public:
     AccObjectContainerEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccObjectContainerEventListener();
 
-    //overwrite handleStateChangedEvent()
-    virtual void SAL_CALL handleStateChangedEvent(
-            css::uno::Any oldValue, css::uno::Any newValue);
+    virtual void HandleStateChangedEvent(
+            css::uno::Any oldValue, css::uno::Any newValue) SAL_OVERRIDE;
+
     //for visible data changed event, for shapes, the visiabledatachanged should be mapped to LOCATION_CHANGED
-    virtual void SAL_CALL handleVisibleDataChangedEvent();
+    virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
 };
 
 #endif
diff --git a/winaccessibility/inc/AccParagraphEventListener.hxx b/winaccessibility/inc/AccParagraphEventListener.hxx
index a7460c84701a..015f177378f0 100644
--- a/winaccessibility/inc/AccParagraphEventListener.hxx
+++ b/winaccessibility/inc/AccParagraphEventListener.hxx
@@ -42,19 +42,19 @@ public:
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for caret changed event
-    virtual void SAL_CALL handleCaretChangedEvent(
+    virtual void HandleCaretChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 
     //for visible data changed event
-    virtual void SAL_CALL handleVisibleDataChangedEvent();
+    virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
 
     //for bound rect changed event
-    virtual void SAL_CALL handleBoundrectChangedEvent();
+    virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
 
-    virtual void SAL_CALL setComponentState(short state, bool enable);
+    virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
 
     //add TEXT_SELECTION_CHANGED event
-    void handleTextSelectionChangedEvent();
+    void HandleTextSelectionChangedEvent();
 };
 
 #endif
diff --git a/winaccessibility/inc/AccTableEventListener.hxx b/winaccessibility/inc/AccTableEventListener.hxx
index d23086749b0b..78438193e80a 100644
--- a/winaccessibility/inc/AccTableEventListener.hxx
+++ b/winaccessibility/inc/AccTableEventListener.hxx
@@ -38,13 +38,14 @@ public:
     AccTableEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccTableEventListener();
 
-    //AccessibleEventListener
+    // XAccessibleEventListener
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+
     //for active descendant changed event
-    virtual void SAL_CALL handleActiveDescendantChangedEvent(
+    virtual void HandleActiveDescendantChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 
-    void SAL_CALL handleTableModelChangeEvent(css::uno::Any newValue);
+    void HandleTableModelChangeEvent(css::uno::Any newValue);
 
 };
 
diff --git a/winaccessibility/inc/AccTextComponentEventListener.hxx b/winaccessibility/inc/AccTextComponentEventListener.hxx
index 064a73643ce8..1b111db7fa35 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 SAL_CALL setComponentState(short state, bool enable);
+    virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
 
 };
 
diff --git a/winaccessibility/inc/AccTopWindowListener.hxx b/winaccessibility/inc/AccTopWindowListener.hxx
index edf83b3b4148..9babd67d9065 100644
--- a/winaccessibility/inc/AccTopWindowListener.hxx
+++ b/winaccessibility/inc/AccTopWindowListener.hxx
@@ -43,6 +43,8 @@ private:
 public:
     AccTopWindowListener();
     virtual ~AccTopWindowListener();
+
+    // XTopWindowListener
     virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
@@ -50,10 +52,13 @@ public:
     virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException);
+
+    // XEventListener
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+
     virtual void AddAllListeners(com::sun::star::accessibility::XAccessible* pAccessible,com::sun::star::accessibility::XAccessible* pParentXAcc,HWND pWND );
     //for On-Demand load.
-    virtual void handleWindowOpened( com::sun::star::accessibility::XAccessible* pAccessible );
+    virtual void HandleWindowOpened( com::sun::star::accessibility::XAccessible* pAccessible );
 };
 
 #endif
diff --git a/winaccessibility/inc/AccTreeEventListener.hxx b/winaccessibility/inc/AccTreeEventListener.hxx
index d0cc1eb119d6..3b0dcafd4330 100644
--- a/winaccessibility/inc/AccTreeEventListener.hxx
+++ b/winaccessibility/inc/AccTreeEventListener.hxx
@@ -38,10 +38,11 @@ public:
     AccTreeEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccTreeEventListener();
 
-    //AccessibleEventListener
+    // XAccessibleEventListener
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
+
     //for active descendant changed event
-    virtual void SAL_CALL handleActiveDescendantChangedEvent(
+    virtual void HandleActiveDescendantChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 };
 
diff --git a/winaccessibility/inc/AccWindowEventListener.hxx b/winaccessibility/inc/AccWindowEventListener.hxx
index d538c81ba192..9a8803091261 100644
--- a/winaccessibility/inc/AccWindowEventListener.hxx
+++ b/winaccessibility/inc/AccWindowEventListener.hxx
@@ -38,21 +38,21 @@ public:
     AccWindowEventListener(com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
     virtual ~AccWindowEventListener();
 
-    //AccessibleEventListener
+    // XAccessibleEventListener
     virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 
     //for child changed event
-    virtual void SAL_CALL handleChildChangedEvent(
+    virtual void HandleChildChangedEvent(
             css::uno::Any oldValue, css::uno::Any newValue);
 
     //for visible data changed event
-    virtual void SAL_CALL handleVisibleDataChangedEvent();
+    virtual void HandleVisibleDataChangedEvent() SAL_OVERRIDE;
 
     //for bound rect changed event
-    virtual void SAL_CALL handleBoundrectChangedEvent();
+    virtual void HandleBoundrectChangedEvent() SAL_OVERRIDE;
 
     //state changed
-    virtual void SAL_CALL setComponentState(short state, bool enable);
+    virtual void SetComponentState(short state, bool enable) SAL_OVERRIDE;
 
 };