diff options
Diffstat (limited to 'winaccessibility')
11 files changed, 1 insertions, 238 deletions
diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx index cf1cdb2157c4..0ce0c217548a 100644 --- a/winaccessibility/inc/AccContainerEventListener.hxx +++ b/winaccessibility/inc/AccContainerEventListener.hxx @@ -45,10 +45,6 @@ public: //AccessibleEventListener virtual void SAL_CALL notifyEvent( const css::accessibility::AccessibleEventObject& aEvent ) override; - //for child changed event - virtual void HandleChildChangedEvent( - css::uno::Any oldValue, css::uno::Any newValue) override; - //for selection changed event virtual void HandleSelectionChangedEvent( const css::uno::Any &oldValue, const css::uno::Any &newValue); diff --git a/winaccessibility/inc/AccDescendantManagerEventListener.hxx b/winaccessibility/inc/AccDescendantManagerEventListener.hxx index 0f0e30ed3af1..4cae3c808dd0 100644 --- a/winaccessibility/inc/AccDescendantManagerEventListener.hxx +++ b/winaccessibility/inc/AccDescendantManagerEventListener.hxx @@ -49,10 +49,6 @@ public: virtual void HandleSelectionChangedEvent( css::uno::Any oldValue, css::uno::Any newValue); - //for child changed event - virtual void HandleChildChangedEvent( - css::uno::Any oldValue, css::uno::Any newValue) override; - virtual void HandleChildChangedNoFocusEvent( css::uno::Any oldValue, css::uno::Any newValue); diff --git a/winaccessibility/inc/AccDialogEventListener.hxx b/winaccessibility/inc/AccDialogEventListener.hxx index 49482474f811..f2d7ff9a0005 100644 --- a/winaccessibility/inc/AccDialogEventListener.hxx +++ b/winaccessibility/inc/AccDialogEventListener.hxx @@ -40,9 +40,6 @@ public: virtual void SAL_CALL notifyEvent(const css::accessibility::AccessibleEventObject& aEvent) override; - //for child changed event - virtual void HandleChildChangedEvent(css::uno::Any oldValue, css::uno::Any newValue) override; - //state changed virtual void SetComponentState(sal_Int64 state, bool enable) override; }; diff --git a/winaccessibility/inc/AccMenuEventListener.hxx b/winaccessibility/inc/AccMenuEventListener.hxx index 93c9f0f2f867..354d7166029d 100644 --- a/winaccessibility/inc/AccMenuEventListener.hxx +++ b/winaccessibility/inc/AccMenuEventListener.hxx @@ -40,9 +40,6 @@ public: virtual void SAL_CALL notifyEvent(const css::accessibility::AccessibleEventObject& aEvent) override; - //for child changed event - virtual void HandleChildChangedEvent(css::uno::Any oldValue, css::uno::Any newValue) override; - //for selection changed event virtual void HandleSelectionChangedEventNoArgs(); diff --git a/winaccessibility/inc/AccWindowEventListener.hxx b/winaccessibility/inc/AccWindowEventListener.hxx index 6fb20892813b..dfc3e2756b2e 100644 --- a/winaccessibility/inc/AccWindowEventListener.hxx +++ b/winaccessibility/inc/AccWindowEventListener.hxx @@ -40,9 +40,6 @@ public: virtual void SAL_CALL notifyEvent(const css::accessibility::AccessibleEventObject& aEvent) override; - //for child changed event - virtual void HandleChildChangedEvent(css::uno::Any oldValue, css::uno::Any newValue) override; - //state changed virtual void SetComponentState(sal_Int64 state, bool enable) override; }; diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx b/winaccessibility/source/service/AccContainerEventListener.cxx index da150f457bd8..1ca75234a944 100644 --- a/winaccessibility/source/service/AccContainerEventListener.cxx +++ b/winaccessibility/source/service/AccContainerEventListener.cxx @@ -52,9 +52,6 @@ void AccContainerEventListener::notifyEvent( const css::accessibility::Accessib switch (aEvent.EventId) { - case AccessibleEventId::CHILD: - HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue); - break; case AccessibleEventId::SELECTION_CHANGED: HandleSelectionChangedEvent(aEvent.OldValue, aEvent.NewValue); break; @@ -115,47 +112,6 @@ void AccContainerEventListener::HandleStateChangedEvent(Any oldValue, Any newVal } /** - * handle the CHILD event - * @param oldValue the child to be deleted - * @param newValue the child to be added - */ -void AccContainerEventListener::HandleChildChangedEvent(Any oldValue, Any newValue) -{ - Reference< XAccessible > xChild; - if( newValue >>= xChild) - { - //create a new child - if(xChild.is()) - { - XAccessible* pAcc = xChild.get(); - //add this child - - if (pAgent->InsertAccObj(pAcc, m_xAccessible.get())) - { - //add all oldValue's existing children - pAgent->InsertChildrenAccObj(pAcc); - pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_ADDED, pAcc); - } - } - } - else if (oldValue >>= xChild) - { - //delete an existing child - if(xChild.is()) - { - XAccessible* pAcc = xChild.get(); - pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_REMOVED, pAcc); - //delete all oldValue's existing children - pAgent->DeleteChildrenAccObj( pAcc ); - //delete this child - pAgent->DeleteAccObj( pAcc ); - - } - } - -} - -/** * handle the SELECTION_CHANGED event * @param oldValue the old value of the source of event * @param newValue the new value of the source of event diff --git a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx index c38f19e32cd8..daecf6e295f4 100644 --- a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx +++ b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx @@ -54,9 +54,6 @@ void AccDescendantManagerEventListener::notifyEvent( const css::accessibility:: case AccessibleEventId::SELECTION_CHANGED: HandleSelectionChangedEvent(aEvent.OldValue, aEvent.NewValue); break; - case AccessibleEventId::CHILD: - HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue); - break; case AccessibleEventId::ACTIVE_DESCENDANT_CHANGED_NOFOCUS: HandleChildChangedNoFocusEvent(aEvent.OldValue, aEvent.NewValue); break; @@ -76,43 +73,6 @@ void AccDescendantManagerEventListener::notifyEvent( const css::accessibility:: } /** - * handle the CHILD event - * @param oldValue the child to be deleted - * @param newValue the child to be added - */ -void AccDescendantManagerEventListener::HandleChildChangedEvent(Any oldValue, Any newValue) -{ - - Reference< XAccessible > xChild; - if( newValue >>= xChild) - { - //create a new child - if(xChild.is()) - { - XAccessible* pAcc = xChild.get(); - pAgent->InsertAccObj(pAcc, m_xAccessible.get()); - pAgent->InsertChildrenAccObj(pAcc); - - pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_ADDED, pAcc); - - } - } - - if (oldValue >>= xChild) - { - if(xChild.is()) - { - XAccessible* pAcc = xChild.get(); - - pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_REMOVED, pAcc); - pAgent->DeleteChildrenAccObj( pAcc ); - pAgent->DeleteAccObj( pAcc ); - } - } - -} - -/** * handle the SELECTION_CHANGED event */ void AccDescendantManagerEventListener::HandleSelectionChangedEvent(Any oldValue, Any newValue) diff --git a/winaccessibility/source/service/AccDialogEventListener.cxx b/winaccessibility/source/service/AccDialogEventListener.cxx index b5cd86b434cf..86b1815c24da 100644 --- a/winaccessibility/source/service/AccDialogEventListener.cxx +++ b/winaccessibility/source/service/AccDialogEventListener.cxx @@ -49,9 +49,6 @@ void AccDialogEventListener::notifyEvent( const css::accessibility::AccessibleE switch (aEvent.EventId) { - case AccessibleEventId::CHILD: - HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue); - break; case AccessibleEventId::VISIBLE_DATA_CHANGED: HandleVisibleDataChangedEvent(); break; @@ -65,43 +62,6 @@ void AccDialogEventListener::notifyEvent( const css::accessibility::AccessibleE } /** - * handle the CHILD event - * @param oldValue the child to be deleted - * @param newValue the child to be added - */ -void AccDialogEventListener::HandleChildChangedEvent(Any oldValue, Any newValue) -{ - Reference< XAccessible > xChild; - if( newValue >>= xChild) - { - //create a new child - if(xChild.is()) - { - XAccessible* pAcc = xChild.get(); - //add this child - pAgent->InsertAccObj(pAcc, m_xAccessible.get()); - //add all oldValue's existing children - pAgent->InsertChildrenAccObj(pAcc); - pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_ADDED, pAcc); - } - } - else if (oldValue >>= xChild) - { - //delete an existing child - if(xChild.is()) - { - XAccessible* pAcc = xChild.get(); - pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_REMOVED, pAcc); - //delete all oldValue's existing children - pAgent->DeleteChildrenAccObj( pAcc ); - //delete this child - pAgent->DeleteAccObj( pAcc ); - } - } - -} - -/** * set the new state and fire the MSAA event * @param state new state id * @param enable true if state is set, false if state is unset diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx index cd4a64b22bca..ac6795abb476 100644 --- a/winaccessibility/source/service/AccFrameEventListener.cxx +++ b/winaccessibility/source/service/AccFrameEventListener.cxx @@ -55,9 +55,6 @@ void AccFrameEventListener::notifyEvent( const css::accessibility::AccessibleEv switch (aEvent.EventId) { - case AccessibleEventId::CHILD: - HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue); - break; case AccessibleEventId::VISIBLE_DATA_CHANGED: HandleVisibleDataChangedEvent(); break; @@ -80,37 +77,23 @@ void AccFrameEventListener::HandleChildChangedEvent(Any oldValue, Any newValue) Reference< XAccessible > xChild; if( newValue >>= xChild) { - //create a new child if(xChild.is()) { XAccessible* pAcc = xChild.get(); - VCLXWindow* pvclwindow = dynamic_cast<VCLXWindow*>(m_xAccessible.get()); assert(pvclwindow); const SystemEnvData* systemdata = pvclwindow->GetWindow()->GetSystemData(); - //add this child pAgent->InsertAccObj(pAcc, m_xAccessible.get(), systemdata->hWnd); - //add all oldValue's existing children pAgent->InsertChildrenAccObj(pAcc); pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_ADDED, pAcc); } } else if (oldValue >>= xChild) { - //delete an existing child - if(xChild.is()) - { - XAccessible* pAcc = xChild.get(); - pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_REMOVED, pAcc); - //delete all oldValue's existing children - pAgent->DeleteChildrenAccObj( pAcc ); - //delete this child - pAgent->DeleteAccObj( pAcc ); - } + AccEventListener::HandleChildChangedEvent(oldValue, newValue); } - } /** diff --git a/winaccessibility/source/service/AccMenuEventListener.cxx b/winaccessibility/source/service/AccMenuEventListener.cxx index b9c48730d76b..411dd3b82b5f 100644 --- a/winaccessibility/source/service/AccMenuEventListener.cxx +++ b/winaccessibility/source/service/AccMenuEventListener.cxx @@ -49,9 +49,6 @@ void AccMenuEventListener::notifyEvent( const css::accessibility::AccessibleEve switch (aEvent.EventId) { - case AccessibleEventId::CHILD: - HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue); - break; case AccessibleEventId::SELECTION_CHANGED: //don't need to process anything,just same as word behavior //handleSelectionChangedEvent(); @@ -63,44 +60,6 @@ void AccMenuEventListener::notifyEvent( const css::accessibility::AccessibleEve } /** - * handle the CHILD event - * @param oldValue the child to be deleted - * @param newValue the child to be added - */ -void AccMenuEventListener::HandleChildChangedEvent(Any oldValue, Any newValue) -{ - - Reference< XAccessible > xChild; - if( newValue >>= xChild) - { - //create a new child - if(xChild.is()) - { - XAccessible* pAcc = xChild.get(); - //add this child - pAgent->InsertAccObj(pAcc, m_xAccessible.get()); - //add all oldValue's existing children - pAgent->InsertChildrenAccObj(pAcc); - pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_ADDED, pAcc); - } - } - else if (oldValue >>= xChild) - { - //delete an existing child - if(xChild.is()) - { - XAccessible* pAcc = xChild.get(); - pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_REMOVED, pAcc); - //delete all oldValue's existing children - pAgent->DeleteChildrenAccObj( pAcc ); - //delete this child - pAgent->DeleteAccObj( pAcc ); - } - } - -} - -/** * handle the SELECTION_CHANGED event */ void AccMenuEventListener::HandleSelectionChangedEventNoArgs() diff --git a/winaccessibility/source/service/AccWindowEventListener.cxx b/winaccessibility/source/service/AccWindowEventListener.cxx index a6212f4d2496..eda060f86101 100644 --- a/winaccessibility/source/service/AccWindowEventListener.cxx +++ b/winaccessibility/source/service/AccWindowEventListener.cxx @@ -49,9 +49,6 @@ void AccWindowEventListener::notifyEvent( const css::accessibility::AccessibleE switch (aEvent.EventId) { - case AccessibleEventId::CHILD: - HandleChildChangedEvent(aEvent.OldValue, aEvent.NewValue); - break; case AccessibleEventId::VISIBLE_DATA_CHANGED: HandleVisibleDataChangedEvent(); break; @@ -65,41 +62,6 @@ void AccWindowEventListener::notifyEvent( const css::accessibility::AccessibleE } /** - * handle the CHILD event - * @param oldValue the child to be deleted - * @param newValue the child to be added - */ -void AccWindowEventListener::HandleChildChangedEvent(Any oldValue, Any newValue) -{ - Reference< XAccessible > xChild; - if( newValue >>= xChild) - { - //create a new child - if(xChild.is()) - { - XAccessible* pAcc = xChild.get(); - //add this child - pAgent->InsertAccObj(pAcc, m_xAccessible.get()); - //add all oldValue's existing children - pAgent->InsertChildrenAccObj(pAcc); - pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_ADDED, pAcc); - } - } - else if (oldValue >>= xChild) - { - //delete an existing child - if(xChild.is()) - { - XAccessible* pAcc = xChild.get(); - pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_REMOVED, pAcc); - pAgent->DeleteChildrenAccObj( pAcc ); - //delete this child - pAgent->DeleteAccObj( pAcc ); - } - } -} - -/** * set the new state and fire the MSAA event * @param state new state id * @param enable true if state is set, false if state is unset |