diff options
Diffstat (limited to 'winaccessibility/source/service/AccComponentEventListener.cxx')
-rw-r--r-- | winaccessibility/source/service/AccComponentEventListener.cxx | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/winaccessibility/source/service/AccComponentEventListener.cxx b/winaccessibility/source/service/AccComponentEventListener.cxx index 0374572c452c..1facdd6791e3 100644 --- a/winaccessibility/source/service/AccComponentEventListener.cxx +++ b/winaccessibility/source/service/AccComponentEventListener.cxx @@ -93,8 +93,8 @@ throw (::com::sun::star::uno::RuntimeException) */ void AccComponentEventListener::HandleValueChangedEvent(Any oldValue, Any newValue) { - pAgent->UpdateValue(pAccessible); - pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, pAccessible); + pAgent->UpdateValue(m_xAccessible.get()); + pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, m_xAccessible.get()); } /** @@ -102,8 +102,8 @@ void AccComponentEventListener::HandleValueChangedEvent(Any oldValue, Any newVal */ void AccComponentEventListener::HandleActionChangedEvent() { - pAgent->UpdateAction(pAccessible); - pAgent->NotifyAccEvent(UM_EVENT_OBJECT_DEFACTIONCHANGE, pAccessible); + pAgent->UpdateAction(m_xAccessible.get()); + pAgent->NotifyAccEvent(UM_EVENT_OBJECT_DEFACTIONCHANGE, m_xAccessible.get()); } /** @@ -114,8 +114,8 @@ void AccComponentEventListener::HandleActionChangedEvent() */ void AccComponentEventListener::HandleTextChangedEvent(Any oldValue, Any newValue) { - pAgent->UpdateValue(pAccessible, newValue); - pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, pAccessible); + pAgent->UpdateValue(m_xAccessible.get(), newValue); + pAgent->NotifyAccEvent(UM_EVENT_OBJECT_VALUECHANGE, m_xAccessible.get()); } /** @@ -126,7 +126,7 @@ void AccComponentEventListener::HandleTextChangedEvent(Any oldValue, Any newValu */ void AccComponentEventListener::HandleCaretChangedEvent(Any oldValue, Any newValue) { - pAgent->NotifyAccEvent(UM_EVENT_OBJECT_CARETCHANGE, pAccessible); + pAgent->NotifyAccEvent(UM_EVENT_OBJECT_CARETCHANGE, m_xAccessible.get()); } /** @@ -153,13 +153,13 @@ void AccComponentEventListener::SetComponentState(short state, bool enable) { if(enable) { - pAgent->IncreaseState( pAccessible, AccessibleStateType::VISIBLE); - pAgent->IncreaseState( pAccessible, AccessibleStateType::FOCUSABLE); + pAgent->IncreaseState(m_xAccessible.get(), AccessibleStateType::VISIBLE); + pAgent->IncreaseState(m_xAccessible.get(), AccessibleStateType::FOCUSABLE); } else { - pAgent->DecreaseState( pAccessible, AccessibleStateType::VISIBLE); - pAgent->DecreaseState( pAccessible, AccessibleStateType::FOCUSABLE); + pAgent->DecreaseState(m_xAccessible.get(), AccessibleStateType::VISIBLE); + pAgent->DecreaseState(m_xAccessible.get(), AccessibleStateType::FOCUSABLE); } } else @@ -174,20 +174,20 @@ void AccComponentEventListener::SetComponentState(short state, bool enable) case AccessibleStateType::ENABLED: if(enable) { - pAgent->UpdateState(pAccessible); - pAgent->DecreaseState( pAccessible, AccessibleStateType::DEFUNC); + pAgent->UpdateState(m_xAccessible.get()); + pAgent->DecreaseState(m_xAccessible.get(), 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) { - pAgent->IncreaseState( pAccessible, AccessibleStateType::FOCUSABLE); + pAgent->IncreaseState(m_xAccessible.get(), AccessibleStateType::FOCUSABLE); } } else { - pAgent->UpdateState(pAccessible); - pAgent->IncreaseState( pAccessible, AccessibleStateType::DEFUNC); - pAgent->DecreaseState( pAccessible, AccessibleStateType::FOCUSABLE); + pAgent->UpdateState(m_xAccessible.get()); + pAgent->IncreaseState(m_xAccessible.get(), AccessibleStateType::DEFUNC); + pAgent->DecreaseState(m_xAccessible.get(), AccessibleStateType::FOCUSABLE); } break; case AccessibleStateType::ACTIVE: @@ -214,33 +214,33 @@ void AccComponentEventListener::FireStatePropertyChange(short state, bool set) { case AccessibleStateType::CHECKED: case AccessibleStateType::INDETERMINATE: - pAgent->IncreaseState( pAccessible, state); - pAgent->UpdateAction( pAccessible ); + pAgent->IncreaseState(m_xAccessible.get(), state); + pAgent->UpdateAction(m_xAccessible.get()); - if(!pAgent->IsSpecialToolboItem(pAccessible)) + if(!pAgent->IsSpecialToolboItem(m_xAccessible.get())) { - pAgent->NotifyAccEvent(UM_EVENT_STATE_CHECKED, pAccessible); + pAgent->NotifyAccEvent(UM_EVENT_STATE_CHECKED, m_xAccessible.get()); } break; case AccessibleStateType::PRESSED: - pAgent->IncreaseState( pAccessible, state); - pAgent->NotifyAccEvent(UM_EVENT_STATE_PRESSED, pAccessible); + pAgent->IncreaseState(m_xAccessible.get(), state); + pAgent->NotifyAccEvent(UM_EVENT_STATE_PRESSED, m_xAccessible.get()); break; case AccessibleStateType::SELECTED: - pAgent->IncreaseState( pAccessible, state); + pAgent->IncreaseState(m_xAccessible.get(), state); break; case AccessibleStateType::ARMED: - pAgent->IncreaseState( pAccessible, state); - pAgent->NotifyAccEvent(UM_EVENT_STATE_ARMED, pAccessible); + pAgent->IncreaseState(m_xAccessible.get(), state); + pAgent->NotifyAccEvent(UM_EVENT_STATE_ARMED, m_xAccessible.get()); break; case AccessibleStateType::SHOWING: - pAgent->DecreaseState( pAccessible, AccessibleStateType::DEFUNC); + pAgent->DecreaseState(m_xAccessible.get(), AccessibleStateType::DEFUNC); // UNO !SHOWING == MSAA OFFSCREEN - pAgent->IncreaseState( pAccessible, AccessibleStateType::SHOWING ); + pAgent->IncreaseState(m_xAccessible.get(), AccessibleStateType::SHOWING ); break; case AccessibleStateType::VISIBLE: // UNO !VISIBLE == MSAA INVISIBLE - pAgent->IncreaseState( pAccessible, AccessibleStateType::VISIBLE ); + pAgent->IncreaseState(m_xAccessible.get(), AccessibleStateType::VISIBLE ); break; default: break; @@ -253,38 +253,38 @@ void AccComponentEventListener::FireStatePropertyChange(short state, bool set) { case AccessibleStateType::CHECKED: case AccessibleStateType::INDETERMINATE: - pAgent->DecreaseState( pAccessible, state ); - pAgent->UpdateAction( pAccessible ); + pAgent->DecreaseState(m_xAccessible.get(), state); + pAgent->UpdateAction(m_xAccessible.get()); - if(!pAgent->IsSpecialToolboItem(pAccessible)) + if(!pAgent->IsSpecialToolboItem(m_xAccessible.get())) { - pAgent->NotifyAccEvent(UM_EVENT_STATE_CHECKED, pAccessible); + pAgent->NotifyAccEvent(UM_EVENT_STATE_CHECKED, m_xAccessible.get()); } break; case AccessibleStateType::PRESSED: - pAgent->DecreaseState( pAccessible, state ); - pAgent->NotifyAccEvent(UM_EVENT_STATE_PRESSED, pAccessible); + pAgent->DecreaseState(m_xAccessible.get(), state); + pAgent->NotifyAccEvent(UM_EVENT_STATE_PRESSED, m_xAccessible.get()); break; case AccessibleStateType::SELECTED: - pAgent->DecreaseState( pAccessible, state ); + pAgent->DecreaseState(m_xAccessible.get(), state); //if the state is unset, no need to send MSAA SELECTION event - //pAgent->NotifyAccEvent(UM_EVENT_STATE_SELECTED, pAccessible); + //pAgent->NotifyAccEvent(UM_EVENT_STATE_SELECTED, m_xAccessible.get()); break; case AccessibleStateType::ARMED: { - pAgent->DecreaseState( pAccessible, state); + pAgent->DecreaseState(m_xAccessible.get(), state); //if the state is unset, no need to send MSAA MENU event - //pAgent->NotifyAccEvent(UM_EVENT_STATE_ARMED, pAccessible); + //pAgent->NotifyAccEvent(UM_EVENT_STATE_ARMED, m_xAccessible.get()); } break; case AccessibleStateType::SHOWING: - pAgent->DecreaseState( pAccessible, AccessibleStateType::DEFUNC); + pAgent->DecreaseState(m_xAccessible.get(), AccessibleStateType::DEFUNC); // UNO !SHOWING == MSAA OFFSCREEN - pAgent->DecreaseState( pAccessible, AccessibleStateType::SHOWING ); + pAgent->DecreaseState(m_xAccessible.get(), AccessibleStateType::SHOWING); break; case AccessibleStateType::VISIBLE: // UNO !VISIBLE == MSAA INVISIBLE - pAgent->DecreaseState( pAccessible, AccessibleStateType::VISIBLE ); + pAgent->DecreaseState(m_xAccessible.get(), AccessibleStateType::VISIBLE); break; default: @@ -303,24 +303,24 @@ void AccComponentEventListener::FireStateFocusedChange(bool enable) if(enable) { if (GetParentRole() != AccessibleRole::COMBO_BOX) - pAgent->NotifyAccEvent(UM_EVENT_STATE_FOCUSED, pAccessible); + pAgent->NotifyAccEvent(UM_EVENT_STATE_FOCUSED, m_xAccessible.get()); } else { //if lose focus, no need to send MSAA FOCUS event - pAgent->DecreaseState( pAccessible, AccessibleStateType::FOCUSED); + pAgent->DecreaseState(m_xAccessible.get(), AccessibleStateType::FOCUSED); } } void AccComponentEventListener::HandleSelectionChangedEventNoArgs() { - pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED, pAccessible); + pAgent->NotifyAccEvent(UM_EVENT_SELECTION_CHANGED, m_xAccessible.get()); } //add TEXT_SELECTION_CHANGED event void AccComponentEventListener::HandleTextSelectionChangedEvent() { - pAgent->NotifyAccEvent(UM_EVENT_TEXT_SELECTION_CHANGED, pAccessible); + pAgent->NotifyAccEvent(UM_EVENT_TEXT_SELECTION_CHANGED, m_xAccessible.get()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |