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

31 files changed, 281 insertions, 279 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;
 
 };
 
diff --git a/winaccessibility/source/service/AccComponentEventListener.cxx b/winaccessibility/source/service/AccComponentEventListener.cxx
index cca17eba79b3..2939bf44d378 100644
--- a/winaccessibility/source/service/AccComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccComponentEventListener.cxx
@@ -50,29 +50,29 @@ throw (::com::sun::star::uno::RuntimeException)
     switch (aEvent.EventId)
     {
     case AccessibleEventId::VALUE_CHANGED:
-        handleValueChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleValueChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::ACTION_CHANGED:
-        handleActionChangedEvent();
+        HandleActionChangedEvent();
         break;
     case AccessibleEventId::TEXT_CHANGED:
-        handleTextChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleTextChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::CARET_CHANGED:
-        handleCaretChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleCaretChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::VISIBLE_DATA_CHANGED:
-        handleVisibleDataChangedEvent();
+        HandleVisibleDataChangedEvent();
         break;
     case AccessibleEventId::BOUNDRECT_CHANGED:
-        handleBoundrectChangedEvent();
+        HandleBoundrectChangedEvent();
         break;
     case AccessibleEventId::SELECTION_CHANGED:
-        handleSelectionChangedEvent();
+        HandleSelectionChangedEventNoArgs();
         break;
         //to add TEXT_SELECTION_CHANGED event
     case AccessibleEventId::TEXT_SELECTION_CHANGED:
-        handleTextSelectionChangedEvent();
+        HandleTextSelectionChangedEvent();
         break;
         //End
     default:
@@ -87,7 +87,7 @@ throw (::com::sun::star::uno::RuntimeException)
  * @param   oldValue    the old value of the source of event
  * @param   newValue    the new value of the source of event
  */
-void AccComponentEventListener::handleValueChangedEvent(Any oldValue, Any newValue)
+void AccComponentEventListener::HandleValueChangedEvent(Any oldValue, Any newValue)
 {
     pAgent->UpdateValue(pAccessible);
     pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, pAccessible);
@@ -96,7 +96,7 @@ void AccComponentEventListener::handleValueChangedEvent(Any oldValue, Any newVal
 /**
  * handle the NAME_CHANGED event
  */
-void AccComponentEventListener::handleActionChangedEvent()
+void AccComponentEventListener::HandleActionChangedEvent()
 {
     pAgent->UpdateAction(pAccessible);
     pAgent->NotifyAccEvent(UM_EVENT_OBJECT_DEFACTIONCHANGE, pAccessible);
@@ -108,7 +108,7 @@ void AccComponentEventListener::handleActionChangedEvent()
  * @param   oldValue    the old value of the source of event
  * @param   newValue    the new value of the source of event
  */
-void AccComponentEventListener::handleTextChangedEvent(Any oldValue, Any newValue)
+void AccComponentEventListener::HandleTextChangedEvent(Any oldValue, Any newValue)
 {
     pAgent->UpdateValue(pAccessible, newValue);
     pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, pAccessible);
@@ -120,7 +120,7 @@ void AccComponentEventListener::handleTextChangedEvent(Any oldValue, Any newValu
  * @param   oldValue    the old value of the source of event
  * @param   newValue    the new value of the source of event
  */
-void AccComponentEventListener::handleCaretChangedEvent(Any oldValue, Any newValue)
+void AccComponentEventListener::HandleCaretChangedEvent(Any oldValue, Any newValue)
 {
     pAgent->NotifyAccEvent(UM_EVENT_OBJECT_CARETCHANGE, pAccessible);
 }
@@ -128,17 +128,17 @@ void AccComponentEventListener::handleCaretChangedEvent(Any oldValue, Any newVal
 /**
  *  handle the VISIBLE_DATA_CHANGED event
  */
-void AccComponentEventListener::handleVisibleDataChangedEvent()
+void AccComponentEventListener::HandleVisibleDataChangedEvent()
 {
-    AccEventListener::handleVisibleDataChangedEvent();
+    AccEventListener::HandleVisibleDataChangedEvent();
 }
 
 /**
  *  handle the BOUNDRECT_CHANGED event
  */
-void AccComponentEventListener::handleBoundrectChangedEvent()
+void AccComponentEventListener::HandleBoundrectChangedEvent()
 {
-    AccEventListener::handleBoundrectChangedEvent();
+    AccEventListener::HandleBoundrectChangedEvent();
 }
 
 /**
@@ -147,7 +147,7 @@ void AccComponentEventListener::handleBoundrectChangedEvent()
  * @param   state   new state id
  * @param   enable  true if state is set, false if state is unset
  */
-void AccComponentEventListener::setComponentState(short state, bool enable )
+void AccComponentEventListener::SetComponentState(short state, bool enable)
 {
     // only the following state can be fired state event.
     switch (state)
@@ -158,10 +158,10 @@ void AccComponentEventListener::setComponentState(short state, bool enable )
     case AccessibleStateType::ARMED:
     case AccessibleStateType::INDETERMINATE:
     case AccessibleStateType::SHOWING:
-        fireStatePropertyChange(state, enable);
+        FireStatePropertyChange(state, enable);
         break;
     case AccessibleStateType::VISIBLE:
-        if (getRole() == AccessibleRole::MENU_ITEM)
+        if (GetRole() == AccessibleRole::MENU_ITEM)
         {
             if(enable)
             {
@@ -176,12 +176,12 @@ void AccComponentEventListener::setComponentState(short state, bool enable )
         }
         else
         {
-            fireStatePropertyChange(state, enable);
+            FireStatePropertyChange(state, enable);
         }
         break;
         break;
     case AccessibleStateType::FOCUSED:
-        fireStateFocusdChange(enable);
+        FireStateFocusedChange(enable);
         break;
     case AccessibleStateType::ENABLED:
         if(enable)
@@ -189,9 +189,11 @@ void AccComponentEventListener::setComponentState(short state, bool enable )
             pAgent->UpdateState(pAccessible);
             pAgent->DecreaseState( pAccessible, AccessibleStateType::DEFUNC);
             // 8. label should have no FOCUSABLE state state, Firefox has READONLY state, we can also have.
-            if( getRole() != AccessibleRole::LABEL
-                && getRole() != AccessibleRole::SCROLL_BAR) //IAccessibility2 Implementation 2009
+            if (    GetRole() != AccessibleRole::LABEL
+                &&  GetRole() != AccessibleRole::SCROLL_BAR)
+            {
                 pAgent->IncreaseState( pAccessible, AccessibleStateType::FOCUSABLE);
+            }
         }
         else
         {
@@ -215,7 +217,7 @@ void AccComponentEventListener::setComponentState(short state, bool enable )
  * @param   state   the state id
  * @param   set     true if state is set, false if state is unset
  */
-void AccComponentEventListener::fireStatePropertyChange(short state, bool set)
+void AccComponentEventListener::FireStatePropertyChange(short state, bool set)
 {
     if( set)
         {
@@ -308,11 +310,11 @@ void AccComponentEventListener::fireStatePropertyChange(short state, bool set)
  *
  * @param   enable  true if get focus, false if lose focus
  */
-void AccComponentEventListener::fireStateFocusdChange(bool enable)
+void AccComponentEventListener::FireStateFocusedChange(bool enable)
 {
     if(enable)
     {
-        if(getParentRole() != AccessibleRole::COMBO_BOX )
+        if (GetParentRole() != AccessibleRole::COMBO_BOX)
             pAgent->NotifyAccEvent(UM_EVENT_STATE_FOCUSED, pAccessible);
     }
     else
@@ -322,13 +324,13 @@ void AccComponentEventListener::fireStateFocusdChange(bool enable)
     }
 }
 
-void AccComponentEventListener::handleSelectionChangedEvent()
+void AccComponentEventListener::HandleSelectionChangedEventNoArgs()
 {
     pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED, pAccessible);
 }
 
 //add TEXT_SELECTION_CHANGED event
-void AccComponentEventListener::handleTextSelectionChangedEvent()
+void AccComponentEventListener::HandleTextSelectionChangedEvent()
 {
     pAgent->NotifyAccEvent(UM_EVENT_TEXT_SELECTION_CHANGED, pAccessible);
 }
diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx b/winaccessibility/source/service/AccContainerEventListener.cxx
index bcf357fb6113..5f28b8115681 100644
--- a/winaccessibility/source/service/AccContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccContainerEventListener.cxx
@@ -47,49 +47,49 @@ AccContainerEventListener::~AccContainerEventListener()
 void  AccContainerEventListener::notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
 throw (::com::sun::star::uno::RuntimeException)
 {
-    short role = getRole();
+    short role = GetRole();
     switch (aEvent.EventId)
     {
     case AccessibleEventId::CHILD:
-        handleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::SELECTION_CHANGED:
-        handleSelectionChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleSelectionChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::INVALIDATE_ALL_CHILDREN:
-        handleAllChildrenChangedEvent();
+        HandleAllChildrenChangedEvent();
         break;
     case AccessibleEventId::TEXT_CHANGED:
-        handleTextChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleTextChangedEvent(aEvent.OldValue, aEvent.NewValue);
     case AccessibleEventId::VISIBLE_DATA_CHANGED:
-        handleVisibleDataChangedEvent();
+        HandleVisibleDataChangedEvent();
         break;
     case AccessibleEventId::BOUNDRECT_CHANGED:
-        handleBoundrectChangedEvent();
+        HandleBoundrectChangedEvent();
         break;
     case AccessibleEventId::STATE_CHANGED:
-        handleStateChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleStateChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::VALUE_CHANGED:
-        handleValueChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleValueChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::SELECTION_CHANGED_ADD:
-        handleSelectionChangedAddEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleSelectionChangedAddEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::SELECTION_CHANGED_REMOVE:
-        handleSelectionChangedRemoveEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleSelectionChangedRemoveEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::SELECTION_CHANGED_WITHIN:
-        handleSelectionChangedWithinEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleSelectionChangedWithinEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::PAGE_CHANGED:
-        handlePageChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandlePageChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::SECTION_CHANGED:
-        handleSectionChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleSectionChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::COLUMN_CHANGED:
-        handleColumnChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleColumnChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     default:
         AccEventListener::notifyEvent(aEvent);
@@ -100,29 +100,29 @@ throw (::com::sun::star::uno::RuntimeException)
 /**
  *  handle the VISIBLE_DATA_CHANGED event
  */
-void AccContainerEventListener::handleVisibleDataChangedEvent()
+void AccContainerEventListener::HandleVisibleDataChangedEvent()
 {
-    AccEventListener::handleVisibleDataChangedEvent();
+    AccEventListener::HandleVisibleDataChangedEvent();
 }
 
 /**
  *  handle the BOUNDRECT_CHANGED event
  */
-void AccContainerEventListener::handleBoundrectChangedEvent()
+void AccContainerEventListener::HandleBoundrectChangedEvent()
 {
-    AccEventListener::handleBoundrectChangedEvent();
+    AccEventListener::HandleBoundrectChangedEvent();
 }
 
-void AccContainerEventListener::handleStateChangedEvent(Any oldValue, Any newValue)
+void AccContainerEventListener::HandleStateChangedEvent(Any oldValue, Any newValue)
 {
     short State;
     if( newValue >>= State)
     {
-        setComponentState( State,true);
+        SetComponentState(State, true);
     }
     else if (oldValue >>= State)
     {
-        setComponentState( State,false);
+        SetComponentState(State, false);
     }
 
 }
@@ -132,7 +132,7 @@ void AccContainerEventListener::handleStateChangedEvent(Any oldValue, Any newVal
  * @param   oldValue    the child to be deleted
  * @param   newValue    the child to be added
  */
-void AccContainerEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
+void AccContainerEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
 {
     Reference< XAccessible > xChild;
     if( newValue >>= xChild)
@@ -177,7 +177,7 @@ void AccContainerEventListener::handleChildChangedEvent(Any oldValue, Any newVal
  * @param   oldValue    the old value of the source of event
  * @param   newValue    the new value of the source of event
  */
-void AccContainerEventListener::handleSelectionChangedEvent(const Any& /*oldValue*/, const Any& newValue)
+void AccContainerEventListener::HandleSelectionChangedEvent(const Any& /*oldValue*/, const Any& newValue)
 {
     if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED,newValue))
     {
@@ -185,14 +185,14 @@ void AccContainerEventListener::handleSelectionChangedEvent(const Any& /*oldValu
     }
 
     //menu bar does not process selection change event,just same as word behavior
-    if(getRole()!=AccessibleRole::MENU_BAR)
+    if (GetRole()!=AccessibleRole::MENU_BAR)
         pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED, pAccessible);
 }
 
 /**
  *  handle the INVALIDATE_ALL_CHILDREN event
  */
-void AccContainerEventListener::handleAllChildrenChangedEvent()
+void AccContainerEventListener::HandleAllChildrenChangedEvent()
 {
     //TODO: update all the children
     if( pAccessible )
@@ -208,7 +208,7 @@ void AccContainerEventListener::handleAllChildrenChangedEvent()
 /**
  *  handle the TEXT_CHANGED event
  */
-void AccContainerEventListener::handleTextChangedEvent(Any oldValue, Any newValue)
+void AccContainerEventListener::HandleTextChangedEvent(Any oldValue, Any newValue)
 {
     pAgent->UpdateValue(pAccessible, newValue);
     pAgent->NotifyAccEvent(UM_EVENT_OBJECT_TEXTCHANGE, pAccessible);
@@ -219,7 +219,7 @@ void AccContainerEventListener::handleTextChangedEvent(Any oldValue, Any newValu
  * @param   state   new state id
  * @param   enable  true if state is set, false if state is unset
  */
-void AccContainerEventListener::setComponentState(short state, bool enable )
+void AccContainerEventListener::SetComponentState(short state, bool enable )
 {
     // only the following state can be fired state event.
 
@@ -232,10 +232,10 @@ void AccContainerEventListener::setComponentState(short state, bool enable )
     case AccessibleStateType::FOCUSABLE:
     case AccessibleStateType::SHOWING:
     case AccessibleStateType::VISIBLE:
-        fireStatePropertyChange(state, enable);
+        FireStatePropertyChange(state, enable);
         break;
     case AccessibleStateType::FOCUSED:
-        fireStateFocusdChange(enable);
+        FireStateFocusedChange(enable);
         break;
     case AccessibleStateType::ENABLED:
         if(enable)
@@ -259,7 +259,7 @@ void AccContainerEventListener::setComponentState(short state, bool enable )
         // Only frames should be active
         // no msaa state mapping
         //for PAGE_TAB_LIST, there will be ACTIVE state, then it should be converted to FOCUSED event.
-        if(getRole() == AccessibleRole::PAGE_TAB_LIST)
+        if (GetRole() == AccessibleRole::PAGE_TAB_LIST)
         {
             if (!enable) /* get the active state */
             {
@@ -292,7 +292,7 @@ void AccContainerEventListener::setComponentState(short state, bool enable )
  * @param   state   the state id
  * @param   set     true if state is set, false if state is unset
  */
-void AccContainerEventListener::fireStatePropertyChange(short state, bool set)
+void AccContainerEventListener::FireStatePropertyChange(short state, bool set)
 {
     if( set )
     {
@@ -354,14 +354,14 @@ void AccContainerEventListener::fireStatePropertyChange(short state, bool set)
  * handle the focused event
  * @param   enable  true if get focus, false if lose focus
  */
-void AccContainerEventListener::fireStateFocusdChange(bool enable)
+void AccContainerEventListener::FireStateFocusedChange(bool enable)
 {
     if(enable)
     {
         pAgent->IncreaseState( pAccessible, AccessibleStateType::FOCUSED);
         //if the acc role is MENU_BAR, MSAA UM_EVENT_MENU_START event should be sent
         //if the acc role is POPUP_MENU, MSAA UM_EVENT_MENUPOPUPSTART event should be sent
-        short role = getRole();
+        short role = GetRole();
         if(role == AccessibleRole::MENU_BAR)
         {
             pAgent->NotifyAccEvent(UM_EVENT_MENU_START, pAccessible);
@@ -373,7 +373,7 @@ void AccContainerEventListener::fireStateFocusdChange(bool enable)
         else if (role == AccessibleRole::PANEL || role == AccessibleRole::OPTION_PANE )
         {
             //don't send focused event on PANEL & OPTION_PANE if the parent is not toolbar
-            short parentRole = getParentRole();
+            short parentRole = GetParentRole();
             if (parentRole == AccessibleRole::TOOL_BAR
                 || parentRole == AccessibleRole::SCROLL_PANE // sidebar
                 || parentRole == AccessibleRole::PANEL) // sidebar
@@ -417,11 +417,11 @@ void AccContainerEventListener::fireStateFocusdChange(bool enable)
         pAgent->DecreaseState( pAccessible, AccessibleStateType::FOCUSED);
         //if the acc role is MENU_BAR, MSAA UM_EVENT_MENU_END event should be sent
         //if the acc role is POPUP_MENU, MSAA UM_EVENT_MENUPOPUPEND event should be sent
-        if(getRole() == AccessibleRole::MENU_BAR)
+        if (GetRole() == AccessibleRole::MENU_BAR)
         {
             pAgent->NotifyAccEvent(UM_EVENT_MENU_END, pAccessible);
         }
-        else if (getRole() == AccessibleRole::POPUP_MENU)
+        else if (GetRole() == AccessibleRole::POPUP_MENU)
         {
             pAgent->NotifyAccEvent(UM_EVENT_MENUPOPUPEND, pAccessible);
         }
@@ -434,7 +434,7 @@ void AccContainerEventListener::fireStateFocusdChange(bool enable)
  * @param   oldValue    the old value of the source of event
  * @param   newValue    the new value of the source of event
  */
-void AccContainerEventListener::handleValueChangedEvent(Any oldValue, Any newValue)
+void AccContainerEventListener::HandleValueChangedEvent(Any oldValue, Any newValue)
 {
     pAgent->UpdateValue(pAccessible);
     pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, pAccessible);
@@ -472,7 +472,7 @@ bool AccContainerEventListener::NotifyChildEvent(short nWinEvent,const Any &Valu
     return false;
 }
 
-void AccContainerEventListener::handleSelectionChangedAddEvent(const Any& /*oldValue*/, const Any& newValue)
+void AccContainerEventListener::HandleSelectionChangedAddEvent(const Any& /*oldValue*/, const Any& newValue)
 {
     if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_ADD,newValue))
     {
@@ -480,7 +480,8 @@ void AccContainerEventListener::handleSelectionChangedAddEvent(const Any& /*oldV
     }
     pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_ADD,pAccessible);
 }
-void AccContainerEventListener::handleSelectionChangedRemoveEvent(const Any& /*oldValue*/, const Any& newValue)
+
+void AccContainerEventListener::HandleSelectionChangedRemoveEvent(const Any& /*oldValue*/, const Any& newValue)
 {
     if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_REMOVE,newValue))
     {
@@ -488,7 +489,8 @@ void AccContainerEventListener::handleSelectionChangedRemoveEvent(const Any& /*o
     }
     pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_REMOVE,pAccessible);
 }
-void AccContainerEventListener::handleSelectionChangedWithinEvent(const Any& /*oldValue*/, const Any& newValue)
+
+void AccContainerEventListener::HandleSelectionChangedWithinEvent(const Any& /*oldValue*/, const Any& newValue)
 {
     if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_WITHIN,newValue))
     {
@@ -497,7 +499,7 @@ void AccContainerEventListener::handleSelectionChangedWithinEvent(const Any& /*o
     pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_WITHIN,pAccessible);
 }
 
-void SAL_CALL AccContainerEventListener::UpdateAllChildrenState( com::sun::star::accessibility::XAccessible* pXAccessible )
+void AccContainerEventListener::UpdateAllChildrenState(XAccessible* pXAccessible)
 {
     Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pXAccessible->getAccessibleContext(),UNO_QUERY);
     if(!xContext.is())
@@ -530,26 +532,24 @@ void SAL_CALL AccContainerEventListener::UpdateAllChildrenState( com::sun::star:
     }
 }
 
-
-void AccContainerEventListener::handlePageChangedEvent(const Any& /*oldValue*/, const Any& /*newValue*/)
+void AccContainerEventListener::HandlePageChangedEvent(const Any& /*oldValue*/, const Any& /*newValue*/)
 {
     pAgent->NotifyAccEvent(UM_EVENT_OBJECT_PAGECHANGED, pAccessible);
 }
 
-void AccContainerEventListener::handleSectionChangedEvent(const Any& /*oldValue*/, const Any& /*newValue*/ )
+void AccContainerEventListener::HandleSectionChangedEvent(const Any& /*oldValue*/, const Any& /*newValue*/ )
 {
     pAgent->NotifyAccEvent(UM_EVENT_SECTION_CHANGED, pAccessible);
 }
 
-void AccContainerEventListener::handleColumnChangedEvent(const Any& /*oldValue*/, const Any& /*newValue*/)
+void AccContainerEventListener::HandleColumnChangedEvent(const Any& /*oldValue*/, const Any& /*newValue*/)
 {
     pAgent->NotifyAccEvent(UM_EVENT_COLUMN_CHANGED, pAccessible);
 }
 
-//IAccessibility2 Implementation 2009-----
-void  AccContainerEventListener::handleNameChangedEvent( Any name )
+void  AccContainerEventListener::HandleNameChangedEvent( Any name )
 {
-    if (getRole() == AccessibleRole::COMBO_BOX)
+    if (GetRole() == AccessibleRole::COMBO_BOX)
     {
         Reference<XAccessibleContext> mxContext(pAccessible->getAccessibleContext(),UNO_QUERY);
         if(mxContext.is())
@@ -566,8 +566,7 @@ void  AccContainerEventListener::handleNameChangedEvent( Any name )
             }
         }
     }
-    AccEventListener::handleNameChangedEvent(name);
+    AccEventListener::HandleNameChangedEvent(name);
 }
-//-----IAccessibility2 Implementation 2009
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
index 53b03f3e40d2..f04dc3bbbacd 100644
--- a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
+++ b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
@@ -50,22 +50,22 @@ throw (::com::sun::star::uno::RuntimeException)
     switch (aEvent.EventId)
     {
     case AccessibleEventId::SELECTION_CHANGED:
-        handleSelectionChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleSelectionChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::CHILD:
-        handleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::ACTIVE_DESCENDANT_CHANGED_NOFOCUS:
-        handleChildChangedNoFocusEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleChildChangedNoFocusEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::SELECTION_CHANGED_ADD:
-        handleSelectionChangedAddEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleSelectionChangedAddEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::SELECTION_CHANGED_REMOVE:
-        handleSelectionChangedRemoveEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleSelectionChangedRemoveEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::SELECTION_CHANGED_WITHIN:
-        handleSelectionChangedWithinEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleSelectionChangedWithinEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     default:
         AccComponentEventListener::notifyEvent(aEvent);
@@ -78,7 +78,7 @@ throw (::com::sun::star::uno::RuntimeException)
  *  @param  oldValue    the child to be deleted
  *  @param  newValue    the child to be added
  */
-void AccDescendantManagerEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
+void AccDescendantManagerEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
 {
 
     Reference< XAccessible > xChild;
@@ -117,7 +117,7 @@ void AccDescendantManagerEventListener::handleChildChangedEvent(Any oldValue, An
 /**
  *  handle the SELECTION_CHANGED event
  */
-void AccDescendantManagerEventListener::handleSelectionChangedEvent(Any oldValue, Any newValue)
+void AccDescendantManagerEventListener::HandleSelectionChangedEvent(Any oldValue, Any newValue)
 {
     bool bSend =false;
     Reference< XAccessible > xChild;
@@ -151,7 +151,7 @@ void AccDescendantManagerEventListener::handleSelectionChangedEvent(Any oldValue
 }
 
 
-void AccDescendantManagerEventListener::handleChildChangedNoFocusEvent(Any oldValue, Any newValue)
+void AccDescendantManagerEventListener::HandleChildChangedNoFocusEvent(Any oldValue, Any newValue)
 {
     Reference< XAccessible > xChild;
     if(newValue >>= xChild )
@@ -196,7 +196,7 @@ bool AccDescendantManagerEventListener::NotifyChildEvent(short nWinEvent,const A
     }
     return false;
 }
-void AccDescendantManagerEventListener::handleSelectionChangedAddEvent(const Any& /*oldValue*/, const Any &newValue)
+void AccDescendantManagerEventListener::HandleSelectionChangedAddEvent(const Any& /*oldValue*/, const Any &newValue)
 {
     if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_ADD,newValue))
     {
@@ -204,7 +204,8 @@ void AccDescendantManagerEventListener::handleSelectionChangedAddEvent(const Any
     }
     pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_ADD,pAccessible);
 }
-void AccDescendantManagerEventListener::handleSelectionChangedRemoveEvent(const Any& /*oldValue*/, const Any &newValue)
+
+void AccDescendantManagerEventListener::HandleSelectionChangedRemoveEvent(const Any& /*oldValue*/, const Any &newValue)
 {
     if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_REMOVE,newValue))
     {
@@ -213,7 +214,7 @@ void AccDescendantManagerEventListener::handleSelectionChangedRemoveEvent(const
     pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED_REMOVE,pAccessible);
 }
 
-void AccDescendantManagerEventListener::handleSelectionChangedWithinEvent(const Any& /*oldValue*/, const Any &newValue)
+void AccDescendantManagerEventListener::HandleSelectionChangedWithinEvent(const Any& /*oldValue*/, const Any &newValue)
 {
     if(NotifyChildEvent(UM_EVENT_SELECTION_CHANGED_WITHIN,newValue))
     {
diff --git a/winaccessibility/source/service/AccDialogEventListener.cxx b/winaccessibility/source/service/AccDialogEventListener.cxx
index dfcb08aafccb..849f5bd88d16 100644
--- a/winaccessibility/source/service/AccDialogEventListener.cxx
+++ b/winaccessibility/source/service/AccDialogEventListener.cxx
@@ -47,13 +47,13 @@ throw (::com::sun::star::uno::RuntimeException)
     switch (aEvent.EventId)
     {
     case AccessibleEventId::CHILD:
-        handleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::VISIBLE_DATA_CHANGED:
-        handleVisibleDataChangedEvent();
+        HandleVisibleDataChangedEvent();
         break;
     case AccessibleEventId::BOUNDRECT_CHANGED:
-        handleBoundrectChangedEvent();
+        HandleBoundrectChangedEvent();
         break;
     default:
         AccEventListener::notifyEvent(aEvent);
@@ -64,17 +64,17 @@ throw (::com::sun::star::uno::RuntimeException)
 /**
  *  handle the VISIBLE_DATA_CHANGED event
  */
-void AccDialogEventListener::handleVisibleDataChangedEvent()
+void AccDialogEventListener::HandleVisibleDataChangedEvent()
 {
-    AccEventListener::handleVisibleDataChangedEvent();
+    AccEventListener::HandleVisibleDataChangedEvent();
 }
 
 /**
  *  handle the BOUNDRECT_CHANGED event
  */
-void AccDialogEventListener::handleBoundrectChangedEvent()
+void AccDialogEventListener::HandleBoundrectChangedEvent()
 {
-    AccEventListener::handleBoundrectChangedEvent();
+    AccEventListener::HandleBoundrectChangedEvent();
 }
 
 /**
@@ -82,7 +82,7 @@ void AccDialogEventListener::handleBoundrectChangedEvent()
  * @param   oldValue    the child to be deleted
  * @param   newValue    the child to be added
  */
-void AccDialogEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
+void AccDialogEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
 {
     Reference< XAccessible > xChild;
     if( newValue >>= xChild)
@@ -123,7 +123,7 @@ void AccDialogEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
  *  @param state    new state id
  *  @param enable   true if state is set, false if state is unset
  */
-void AccDialogEventListener::setComponentState(short state, bool enable )
+void AccDialogEventListener::SetComponentState(short state, bool enable)
 {
     // only the following state can be fired state event.
     switch (state)
diff --git a/winaccessibility/source/service/AccEventListener.cxx b/winaccessibility/source/service/AccEventListener.cxx
index de4d7b4da951..54c4f8727bbf 100644
--- a/winaccessibility/source/service/AccEventListener.cxx
+++ b/winaccessibility/source/service/AccEventListener.cxx
@@ -67,13 +67,13 @@ throw (::com::sun::star::uno::RuntimeException)
     switch (aEvent.EventId)
     {
     case AccessibleEventId::NAME_CHANGED:
-        handleNameChangedEvent(aEvent.NewValue);
+        HandleNameChangedEvent(aEvent.NewValue);
         break;
     case AccessibleEventId::DESCRIPTION_CHANGED:
-        handleDescriptionChangedEvent(aEvent.NewValue);
+        HandleDescriptionChangedEvent(aEvent.NewValue);
         break;
     case AccessibleEventId::STATE_CHANGED:
-        handleStateChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleStateChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     default:
         break;
@@ -84,7 +84,7 @@ throw (::com::sun::star::uno::RuntimeException)
  *  handle the NAME_CHANGED event
  *  @param  name        the new name with changed.
  */
-void AccEventListener::handleNameChangedEvent(Any name)
+void AccEventListener::HandleNameChangedEvent(Any name)
 {
     if ( pAgent->IsTopWinAcc( pAccessible ) )
     {
@@ -104,7 +104,7 @@ void AccEventListener::handleNameChangedEvent(Any name)
  *  handle the DESCRIPTION_CHANGED event
  *  @param  desc        the new description
  */
-void AccEventListener::handleDescriptionChangedEvent(Any desc)
+void AccEventListener::HandleDescriptionChangedEvent(Any desc)
 {
     pAgent->UpdateDescription(pAccessible, desc);
     pAgent->NotifyAccEvent(UM_EVENT_OBJECT_DESCRIPTIONCHANGE, pAccessible);
@@ -113,7 +113,7 @@ void AccEventListener::handleDescriptionChangedEvent(Any desc)
 /**
  *  handle the BOUNDRECT_CHANGED event
  */
-void AccEventListener::handleBoundrectChangedEvent()
+void AccEventListener::HandleBoundrectChangedEvent()
 {
     pAgent->UpdateLocation(pAccessible);
     pAgent->NotifyAccEvent(UM_EVENT_BOUNDRECT_CHANGED, pAccessible);
@@ -122,7 +122,7 @@ void AccEventListener::handleBoundrectChangedEvent()
 /**
  *  handle the VISIBLE_DATA_CHANGED event
  */
-void AccEventListener::handleVisibleDataChangedEvent()
+void AccEventListener::HandleVisibleDataChangedEvent()
 {
     pAgent->UpdateValue(pAccessible);
     pAgent->NotifyAccEvent(UM_EVENT_VISIBLE_DATA_CHANGED, pAccessible);
@@ -133,16 +133,16 @@ void AccEventListener::handleVisibleDataChangedEvent()
  *  @param  oldValue    the old state of the source of event
  *  @param  newValue    the new state of the source of event
  */
-void AccEventListener::handleStateChangedEvent(Any oldValue, Any newValue)
+void AccEventListener::HandleStateChangedEvent(Any oldValue, Any newValue)
 {
     short newV, oldV;
     if( newValue >>= newV)
     {
-        setComponentState(newV, true);
+        SetComponentState(newV, true);
     }
     else if (oldValue >>= oldV)
     {
-        setComponentState(oldV, false);
+        SetComponentState(oldV, false);
     }
 }
 
@@ -151,15 +151,15 @@ void AccEventListener::handleStateChangedEvent(Any oldValue, Any newValue)
  *  @param  state       new state id
  *  @param  enable      true if state is set, false if state is unset
  */
-void AccEventListener::setComponentState(short state, bool enable )
+void AccEventListener::SetComponentState(short state, bool enable )
 {
     switch (state)
     {
     case AccessibleStateType::FOCUSED:
-        fireStateFocusdChange(enable);
+        FireStateFocusedChange(enable);
         break;
     default:
-        fireStatePropertyChange(state, enable);
+        FireStatePropertyChange(state, enable);
         break;
     }
 }
@@ -168,7 +168,7 @@ void AccEventListener::setComponentState(short state, bool enable )
  *  handle the focused event
  *  @param enable   true if get focus, false if lose focus
  */
-void AccEventListener::fireStateFocusdChange(bool enable)
+void AccEventListener::FireStateFocusedChange(bool enable)
 {
     if(enable)
     {
@@ -187,7 +187,7 @@ void AccEventListener::fireStateFocusdChange(bool enable)
  *  @param state    the state id
  *  @param set      true if state is set, false if state is unset
  */
-void AccEventListener::fireStatePropertyChange(short /*state*/, bool set )
+void AccEventListener::FireStatePropertyChange(short /*state*/, bool set )
 {
     if( set )
     {
@@ -202,7 +202,7 @@ void AccEventListener::fireStatePropertyChange(short /*state*/, bool set )
 /**
  *  get the role of accessible object which is observed
  */
-short AccEventListener::getRole()
+short AccEventListener::GetRole()
 {
     Reference<com::sun::star::accessibility::XAccessibleContext> xContext(pAccessible->getAccessibleContext(),UNO_QUERY);
     if(xContext.is())
@@ -215,7 +215,7 @@ short AccEventListener::getRole()
 /**
  *  get the role of accessible parent object which is observed
  */
-short AccEventListener::getParentRole()
+short AccEventListener::GetParentRole()
 {
     if(pAccessible)
     {
@@ -226,7 +226,7 @@ short AccEventListener::getParentRole()
 /**
  *  remove the listener from accessible object
  */
-void AccEventListener::removeMeFromBroadcaster()
+void AccEventListener::RemoveMeFromBroadcaster()
 {
     try
     {
@@ -276,7 +276,7 @@ void AccEventListener::removeMeFromBroadcaster()
 void AccEventListener::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ )
 throw (::com::sun::star::uno::RuntimeException)
 {
-    removeMeFromBroadcaster();
+    RemoveMeFromBroadcaster();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx
index 81b81fff8291..32974b7b2f9c 100644
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -53,13 +53,13 @@ throw (::com::sun::star::uno::RuntimeException)
     switch (aEvent.EventId)
     {
     case AccessibleEventId::CHILD:
-        handleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::VISIBLE_DATA_CHANGED:
-        handleVisibleDataChangedEvent();
+        HandleVisibleDataChangedEvent();
         break;
     case AccessibleEventId::BOUNDRECT_CHANGED:
-        handleBoundrectChangedEvent();
+        HandleBoundrectChangedEvent();
         break;
     default:
         AccEventListener::notifyEvent(aEvent);
@@ -70,17 +70,17 @@ throw (::com::sun::star::uno::RuntimeException)
 /**
  *  handle the VISIBLE_DATA_CHANGED event
  */
-void AccFrameEventListener::handleVisibleDataChangedEvent()
+void AccFrameEventListener::HandleVisibleDataChangedEvent()
 {
-    AccEventListener::handleVisibleDataChangedEvent();
+    AccEventListener::HandleVisibleDataChangedEvent();
 }
 
 /**
  *  handle the BOUNDRECT_CHANGED event
  */
-void AccFrameEventListener::handleBoundrectChangedEvent()
+void AccFrameEventListener::HandleBoundrectChangedEvent()
 {
-    AccEventListener::handleBoundrectChangedEvent();
+    AccEventListener::HandleBoundrectChangedEvent();
 }
 
 /**
@@ -88,7 +88,7 @@ void AccFrameEventListener::handleBoundrectChangedEvent()
  *  @param  oldValue    the child to be deleted
  *  @param  newValue    the child to be added
  */
-void AccFrameEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
+void AccFrameEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
 {
     Reference< XAccessible > xChild;
     if( newValue >>= xChild)
@@ -135,7 +135,7 @@ void AccFrameEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
  *  @param state    new state id
  *  @param enable   true if state is set, false if state is unset
  */
-void AccFrameEventListener::setComponentState(short state, bool enable )
+void AccFrameEventListener::SetComponentState(short state, bool enable )
 {
     // only the following state can be fired state event.
     switch (state)
diff --git a/winaccessibility/source/service/AccListEventListener.cxx b/winaccessibility/source/service/AccListEventListener.cxx
index 83129ad46dc6..ac8c5408c56f 100644
--- a/winaccessibility/source/service/AccListEventListener.cxx
+++ b/winaccessibility/source/service/AccListEventListener.cxx
@@ -49,7 +49,7 @@ void  AccListEventListener::notifyEvent( const ::com::sun::star::accessibility::
     switch (aEvent.EventId)
     {
     case AccessibleEventId::ACTIVE_DESCENDANT_CHANGED:
-        handleActiveDescendantChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleActiveDescendantChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::INVALIDATE_ALL_CHILDREN:
         // Since List items a transient a child events are mostly used
@@ -57,7 +57,7 @@ void  AccListEventListener::notifyEvent( const ::com::sun::star::accessibility::
         //TODO: investigate again
         break;
     case AccessibleEventId::VALUE_CHANGED:
-        handleValueChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleValueChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     default:
         AccDescendantManagerEventListener::notifyEvent(aEvent);
@@ -70,7 +70,7 @@ void  AccListEventListener::notifyEvent( const ::com::sun::star::accessibility::
  *  @param  oldValue    the child to lose active
  *  @param  newValue    the child to get active
  */
-void AccListEventListener::handleActiveDescendantChangedEvent(Any oldValue, Any newValue)
+void AccListEventListener::HandleActiveDescendantChangedEvent(Any oldValue, Any newValue)
 {
     Reference< XAccessible > xChild;
 
@@ -109,10 +109,10 @@ void AccListEventListener::handleActiveDescendantChangedEvent(Any oldValue, Any
  * @param   oldValue    the old value of the source of event
  * @param   newValue    the new value of the source of event
  */
-void AccListEventListener::handleValueChangedEvent(Any oldValue, Any newValue)
+void AccListEventListener::HandleValueChangedEvent(Any oldValue, Any newValue)
 {
     //to enable value changed event
-    if(getParentRole() == AccessibleRole::COMBO_BOX)
+    if (GetParentRole() == AccessibleRole::COMBO_BOX)
     {
         XAccessible* pParentAcc = pAgent->GetParentXAccessible(pAccessible);
         pAgent->UpdateValue(pParentAcc);
diff --git a/winaccessibility/source/service/AccMenuEventListener.cxx b/winaccessibility/source/service/AccMenuEventListener.cxx
index ff4b9388e66c..2cf99eab9c0a 100644
--- a/winaccessibility/source/service/AccMenuEventListener.cxx
+++ b/winaccessibility/source/service/AccMenuEventListener.cxx
@@ -47,7 +47,7 @@ throw (::com::sun::star::uno::RuntimeException)
     switch (aEvent.EventId)
     {
     case AccessibleEventId::CHILD:
-        handleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::SELECTION_CHANGED:
         //don't need to process anything,just same as word behavior
@@ -64,7 +64,7 @@ throw (::com::sun::star::uno::RuntimeException)
  *  @param  oldValue    the child to be deleted
  *  @param  newValue    the child to be added
  */
-void AccMenuEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
+void AccMenuEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
 {
 
     Reference< XAccessible > xChild;
@@ -104,7 +104,7 @@ void AccMenuEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
 /**
  *  handle the SELECTION_CHANGED event
  */
-void AccMenuEventListener::handleSelectionChangedEvent()
+void AccMenuEventListener::HandleSelectionChangedEventNoArgs()
 {
     pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED, pAccessible);
 }
@@ -112,7 +112,7 @@ void AccMenuEventListener::handleSelectionChangedEvent()
 /**
  *  handle the Menu_popup event
  */
-void AccMenuEventListener::fireStatePropertyChange(short state, bool set)
+void AccMenuEventListener::FireStatePropertyChange(short state, bool set)
 {
     if( set )
     {
@@ -126,8 +126,7 @@ void AccMenuEventListener::fireStatePropertyChange(short state, bool set)
             pAgent->UpdateChildState(pAccessible);
             break;
         default:
-            AccComponentEventListener::fireStatePropertyChange(state, set
-                                                                  );
+            AccComponentEventListener::FireStatePropertyChange(state, set);
             break;
         }
     }
@@ -141,8 +140,7 @@ void AccMenuEventListener::fireStatePropertyChange(short state, bool set)
 
             break;
         default:
-            AccComponentEventListener::fireStatePropertyChange(state, set
-                                                                  );
+            AccComponentEventListener::FireStatePropertyChange(state, set);
             break;
         }
     }
diff --git a/winaccessibility/source/service/AccObjectContainerEventListener.cxx b/winaccessibility/source/service/AccObjectContainerEventListener.cxx
index d71a8f98ad55..40f772752a49 100644
--- a/winaccessibility/source/service/AccObjectContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccObjectContainerEventListener.cxx
@@ -44,7 +44,7 @@ AccObjectContainerEventListener::~AccObjectContainerEventListener()
 /**
  *  handle the STATE_CHANGED event
  */
-void AccObjectContainerEventListener::handleStateChangedEvent(Any oldValue, Any newValue)
+void AccObjectContainerEventListener::HandleStateChangedEvent(Any oldValue, Any newValue)
 {
     //set the accessible name before process for there is no NAME_CHANGED event when change
     //the text in drawing objects.
@@ -58,15 +58,15 @@ void AccObjectContainerEventListener::handleStateChangedEvent(Any oldValue, Any
             pAgent->UpdateDescription(pAccessible);
         }
     }
-    AccContainerEventListener::handleStateChangedEvent(oldValue, newValue);
+    AccContainerEventListener::HandleStateChangedEvent(oldValue, newValue);
 }
 /**
  *  handle the VISIBLE_DATA_CHANGED event
  *  For SHAPES, the visiable_data_changed event should be mapped to LOCATION_CHANGED event
   */
-void AccObjectContainerEventListener::handleVisibleDataChangedEvent()
+void AccObjectContainerEventListener::HandleVisibleDataChangedEvent()
 {
-    AccContainerEventListener::handleBoundrectChangedEvent();
+    AccContainerEventListener::HandleBoundrectChangedEvent();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx
index 9fdb24d74073..8b5e1ec6c1ad 100644
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -628,7 +628,7 @@ void AccObjectWinManager::DeleteAccListener( AccObject*  pAccObj )
     AccEventListener* listener = pAccObj->getListener();
     if( listener==NULL )
         return;
-    listener->removeMeFromBroadcaster();
+    listener->RemoveMeFromBroadcaster();
     pAccObj->SetListener(NULL);
 }
 
diff --git a/winaccessibility/source/service/AccParagraphEventListener.cxx b/winaccessibility/source/service/AccParagraphEventListener.cxx
index ee73d4d1dad2..a42355746084 100644
--- a/winaccessibility/source/service/AccParagraphEventListener.cxx
+++ b/winaccessibility/source/service/AccParagraphEventListener.cxx
@@ -47,13 +47,13 @@ throw (::com::sun::star::uno::RuntimeException)
     switch (aEvent.EventId)
     {
     case AccessibleEventId::CARET_CHANGED:
-        handleCaretChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleCaretChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::VISIBLE_DATA_CHANGED:
-        handleVisibleDataChangedEvent();
+        HandleVisibleDataChangedEvent();
         break;
     case AccessibleEventId::BOUNDRECT_CHANGED:
-        handleBoundrectChangedEvent();
+        HandleBoundrectChangedEvent();
         break;
         //Added for paragraph selected state.
     case AccessibleEventId::STATE_CHANGED:
@@ -75,7 +75,7 @@ throw (::com::sun::star::uno::RuntimeException)
         }
 
     case AccessibleEventId::TEXT_SELECTION_CHANGED:
-        handleTextSelectionChangedEvent();
+        HandleTextSelectionChangedEvent();
         break;
 
     default:
@@ -89,7 +89,7 @@ throw (::com::sun::star::uno::RuntimeException)
  *  @param oldValue     in UNO, this parameter is always NULL
  *  @param newValue     in UNO, this parameter is always NULL
  */
-void AccParagraphEventListener::handleCaretChangedEvent(Any oldValue, Any newValue)
+void AccParagraphEventListener::HandleCaretChangedEvent(Any oldValue, Any newValue)
 {
     pAgent->UpdateLocation(pAccessible);
     pAgent->NotifyAccEvent(UM_EVENT_OBJECT_CARETCHANGE, pAccessible);
@@ -98,17 +98,17 @@ void AccParagraphEventListener::handleCaretChangedEvent(Any oldValue, Any newVal
 /**
  *  handle the VISIBLE_DATA_CHANGED event
  */
-void AccParagraphEventListener::handleVisibleDataChangedEvent()
+void AccParagraphEventListener::HandleVisibleDataChangedEvent()
 {
-    AccEventListener::handleVisibleDataChangedEvent();
+    AccEventListener::HandleVisibleDataChangedEvent();
 }
 
 /**
  *  handle the BOUNDRECT_CHANGED event
  */
-void AccParagraphEventListener::handleBoundrectChangedEvent()
+void AccParagraphEventListener::HandleBoundrectChangedEvent()
 {
-    AccEventListener::handleBoundrectChangedEvent();
+    AccEventListener::HandleBoundrectChangedEvent();
 }
 
 /**
@@ -116,7 +116,7 @@ void AccParagraphEventListener::handleBoundrectChangedEvent()
  *  @param state    new state id
  *  @param enable   true if state is set, false if state is unset
  */
-void AccParagraphEventListener::setComponentState(short state, bool enable )
+void AccParagraphEventListener::SetComponentState(short state, bool enable )
 {
     // only the following state can be fired state event.
     switch (state)
@@ -131,12 +131,12 @@ void AccParagraphEventListener::setComponentState(short state, bool enable )
         // no msaa state mapping
         break;
     default:
-        AccContainerEventListener::setComponentState(state, enable);
+        AccContainerEventListener::SetComponentState(state, enable);
         break;
     }
 }
 
-void AccParagraphEventListener::handleTextSelectionChangedEvent()
+void AccParagraphEventListener::HandleTextSelectionChangedEvent()
 {
     pAgent->NotifyAccEvent(UM_EVENT_TEXT_SELECTION_CHANGED, pAccessible);
 }
diff --git a/winaccessibility/source/service/AccTableEventListener.cxx b/winaccessibility/source/service/AccTableEventListener.cxx
index 4820d097d557..19857720c16c 100644
--- a/winaccessibility/source/service/AccTableEventListener.cxx
+++ b/winaccessibility/source/service/AccTableEventListener.cxx
@@ -48,7 +48,7 @@ throw (::com::sun::star::uno::RuntimeException)
     switch (aEvent.EventId)
     {
     case AccessibleEventId::ACTIVE_DESCENDANT_CHANGED:
-        handleActiveDescendantChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleActiveDescendantChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
 
     case AccessibleEventId::TABLE_CAPTION_CHANGED:
@@ -78,7 +78,7 @@ throw (::com::sun::star::uno::RuntimeException)
     case AccessibleEventId::TABLE_MODEL_CHANGED:
         {
 
-            handleTableModelChangeEvent(aEvent.NewValue);
+            HandleTableModelChangeEvent(aEvent.NewValue);
             break;
         }
     case AccessibleEventId::TABLE_SUMMARY_CHANGED:
@@ -104,7 +104,7 @@ throw (::com::sun::star::uno::RuntimeException)
  *  @param  oldValue    the child to lose active
  *  @param  newValue    the child to get active
  */
-void AccTableEventListener::handleActiveDescendantChangedEvent(Any oldValue, Any newValue)
+void AccTableEventListener::HandleActiveDescendantChangedEvent(Any oldValue, Any newValue)
 {
     Reference< XAccessible > xChild;
     if(newValue >>= xChild )
@@ -127,7 +127,7 @@ void AccTableEventListener::handleActiveDescendantChangedEvent(Any oldValue, Any
     }
 
 }
-void AccTableEventListener::handleTableModelChangeEvent(Any newValue)
+void AccTableEventListener::HandleTableModelChangeEvent(Any newValue)
 {
     AccessibleTableModelChange aModelChange;
     if (newValue >>= aModelChange)
diff --git a/winaccessibility/source/service/AccTextComponentEventListener.cxx b/winaccessibility/source/service/AccTextComponentEventListener.cxx
index a352adafe0c7..92503556e195 100644
--- a/winaccessibility/source/service/AccTextComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccTextComponentEventListener.cxx
@@ -42,7 +42,7 @@ AccTextComponentEventListener::~AccTextComponentEventListener()
  *  @param state    new state id
  *  @param enable   true if state is set, false if state is unset
  */
-void AccTextComponentEventListener::setComponentState(short state, bool enable )
+void AccTextComponentEventListener::SetComponentState(short state, bool enable )
 {
     // only the following state can be fired state event.
     switch (state)
@@ -57,7 +57,7 @@ void AccTextComponentEventListener::setComponentState(short state, bool enable )
         // no msaa state mapping
         break;
     default:
-        AccComponentEventListener::setComponentState(state, enable);
+        AccComponentEventListener::SetComponentState(state, enable);
         break;
     }
 }
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx
index fac53d60362f..c812ea965ce9 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -61,7 +61,7 @@ void FreeTopWindowListener()
 void handleWindowOpened_impl(long pAcc)
 {
     if( g_pTop && pAcc != 0 )
-        g_pTop->handleWindowOpened( (com::sun::star::accessibility::XAccessible*)((void*)pAcc) );
+        g_pTop->HandleWindowOpened( (com::sun::star::accessibility::XAccessible*)((void*)pAcc) );
 }
 
 /**
@@ -69,7 +69,7 @@ void handleWindowOpened_impl(long pAcc)
  *  accessible listener to monitor all these objects.
  *  @param pAccessible      the accessible of the new opened window
  */
-void AccTopWindowListener::handleWindowOpened( com::sun::star::accessibility::XAccessible* pAccessible )
+void AccTopWindowListener::HandleWindowOpened( com::sun::star::accessibility::XAccessible* pAccessible )
 {
     //get SystemData from window
     VCLXWindow* pvclwindow = (VCLXWindow*)pAccessible;
@@ -141,7 +141,7 @@ void AccTopWindowListener::windowOpened( const ::com::sun::star::lang::EventObje
     if ( !pAccessible )
         return;
 
-    handleWindowOpened( pAccessible );
+    HandleWindowOpened( pAccessible );
 }
 
 /**
diff --git a/winaccessibility/source/service/AccTreeEventListener.cxx b/winaccessibility/source/service/AccTreeEventListener.cxx
index e4289305d7aa..2339f21d41de 100644
--- a/winaccessibility/source/service/AccTreeEventListener.cxx
+++ b/winaccessibility/source/service/AccTreeEventListener.cxx
@@ -46,7 +46,7 @@ void  AccTreeEventListener::notifyEvent( const ::com::sun::star::accessibility::
     switch (aEvent.EventId)
     {
     case AccessibleEventId::ACTIVE_DESCENDANT_CHANGED:
-        handleActiveDescendantChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleActiveDescendantChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     default:
         AccDescendantManagerEventListener::notifyEvent(aEvent);
@@ -59,7 +59,7 @@ void  AccTreeEventListener::notifyEvent( const ::com::sun::star::accessibility::
  *  @param  oldValue    the child to lose active
  *  @param  newValue    the child to get active
  */
-void AccTreeEventListener::handleActiveDescendantChangedEvent(Any oldValue, Any newValue)
+void AccTreeEventListener::HandleActiveDescendantChangedEvent(Any oldValue, Any newValue)
 {
     Reference< XAccessible > xChild;
     if(newValue >>= xChild )
diff --git a/winaccessibility/source/service/AccWindowEventListener.cxx b/winaccessibility/source/service/AccWindowEventListener.cxx
index b99e5a92422a..1385f70998e6 100644
--- a/winaccessibility/source/service/AccWindowEventListener.cxx
+++ b/winaccessibility/source/service/AccWindowEventListener.cxx
@@ -46,13 +46,13 @@ void  AccWindowEventListener::notifyEvent( const ::com::sun::star::accessibility
     switch (aEvent.EventId)
     {
     case AccessibleEventId::CHILD:
-        handleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
+        HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue);
         break;
     case AccessibleEventId::VISIBLE_DATA_CHANGED:
-        handleVisibleDataChangedEvent();
+        HandleVisibleDataChangedEvent();
         break;
     case AccessibleEventId::BOUNDRECT_CHANGED:
-        handleBoundrectChangedEvent();
+        HandleBoundrectChangedEvent();
         break;
     default:
         AccEventListener::notifyEvent(aEvent);
@@ -63,17 +63,17 @@ void  AccWindowEventListener::notifyEvent( const ::com::sun::star::accessibility
 /**
  *  handle the VISIBLE_DATA_CHANGED event
  */
-void AccWindowEventListener::handleVisibleDataChangedEvent()
+void AccWindowEventListener::HandleVisibleDataChangedEvent()
 {
-    AccEventListener::handleVisibleDataChangedEvent();
+    AccEventListener::HandleVisibleDataChangedEvent();
 }
 
 /**
  *  handle the BOUNDRECT_CHANGED event
  */
-void AccWindowEventListener::handleBoundrectChangedEvent()
+void AccWindowEventListener::HandleBoundrectChangedEvent()
 {
-    AccEventListener::handleBoundrectChangedEvent();
+    AccEventListener::HandleBoundrectChangedEvent();
 }
 
 /**
@@ -81,7 +81,7 @@ void AccWindowEventListener::handleBoundrectChangedEvent()
  *  @param  oldValue    the child to be deleted
  *  @param  newValue    the child to be added
  */
-void AccWindowEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
+void AccWindowEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
 {
     Reference< XAccessible > xChild;
     if( newValue >>= xChild)
@@ -120,7 +120,7 @@ void AccWindowEventListener::handleChildChangedEvent(Any oldValue, Any newValue)
  *  @param state    new state id
  *  @param enable   true if state is set, false if state is unset
  */
-void AccWindowEventListener::setComponentState(short state, bool enable )
+void AccWindowEventListener::SetComponentState(short state, bool enable )
 {
     // only the following state can be fired state event.
     switch (state)