winaccessibility/inc/AccObjectManagerAgent.hxx | 2
winaccessibility/inc/AccObjectWinManager.hxx | 2
winaccessibility/source/service/AccComponentEventListener.cxx | 30
+++---
winaccessibility/source/service/AccContainerEventListener.cxx | 44
+++++-----
winaccessibility/source/service/AccDescendantManagerEventListener.cxx | 12 +-
winaccessibility/source/service/AccEventListener.cxx | 16
+--
winaccessibility/source/service/AccFrameEventListener.cxx | 2
winaccessibility/source/service/AccListEventListener.cxx | 4
winaccessibility/source/service/AccMenuEventListener.cxx | 2
winaccessibility/source/service/AccObjectManagerAgent.cxx | 5 -
winaccessibility/source/service/AccObjectWinManager.cxx | 7 -
winaccessibility/source/service/AccParagraphEventListener.cxx | 4
winaccessibility/source/service/AccTableEventListener.cxx | 16
+--
winaccessibility/source/service/AccTopWindowListener.cxx | 6 -
winaccessibility/source/service/AccTreeEventListener.cxx | 2
15 files changed, 77 insertions(+), 77 deletions(-)
New commits:
commit 0724cb04e7f20ad01fa544a0d75ae58ab0e9cd8a
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Aug 7 12:07:54 2023 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Aug 8 08:18:13 2023 +0200
wina11y: Align param order with other methods
Switch the param order in `AccObjectManagerAgent::NotifyAccEvent`
to be consistent with all of its other methods that take the
`XAccessible*` first, and also with
`AccObjectWinManager::NotifyAccEvent` that is called by the
method.
This is also in preparation of dropping
AccObjectManagerAgent altogether.
Change-Id: I83d331176971cc728524266d87939f33acd375f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155438
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx
b/winaccessibility/inc/AccObjectManagerAgent.hxx
index 064de74505a7..8ff8d407dbe8 100644
--- a/winaccessibility/inc/AccObjectManagerAgent.hxx
+++ b/winaccessibility/inc/AccObjectManagerAgent.hxx
@@ -57,7 +57,7 @@ public:
virtual void DeleteAccObj( css::accessibility::XAccessible* pXAcc );
virtual IMAccessible* GetIMAccByXAcc(css::accessibility::XAccessible*
pXAcc);
- bool NotifyAccEvent(UnoMSAAEvent eEvent, css::accessibility::XAccessible*
pXAcc);
+ bool NotifyAccEvent(css::accessibility::XAccessible* pXAcc, UnoMSAAEvent
eEvent);
bool InsertChildrenAccObj(css::accessibility::XAccessible* pXAcc,
HWND hWnd = nullptr);
diff --git a/winaccessibility/source/service/AccComponentEventListener.cxx
b/winaccessibility/source/service/AccComponentEventListener.cxx
index 060fb201136c..a4ab118f54e6 100644
--- a/winaccessibility/source/service/AccComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccComponentEventListener.cxx
@@ -93,7 +93,7 @@ void AccComponentEventListener::notifyEvent( const
css::accessibility::Accessib
void AccComponentEventListener::HandleValueChangedEvent(Any, Any)
{
pAgent->UpdateValue(m_xAccessible.get());
- pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_VALUECHANGE,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::OBJECT_VALUECHANGE);
}
/**
@@ -102,7 +102,7 @@ void
AccComponentEventListener::HandleValueChangedEvent(Any, Any)
void AccComponentEventListener::HandleActionChangedEvent()
{
pAgent->UpdateAction(m_xAccessible.get());
- pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_DEFACTIONCHANGE,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::OBJECT_DEFACTIONCHANGE);
}
/**
@@ -114,7 +114,7 @@ void AccComponentEventListener::HandleActionChangedEvent()
void AccComponentEventListener::HandleTextChangedEvent(Any, Any newValue)
{
pAgent->UpdateValue(m_xAccessible.get(), newValue);
- pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_VALUECHANGE,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::OBJECT_VALUECHANGE);
}
/**
@@ -125,7 +125,7 @@ void AccComponentEventListener::HandleTextChangedEvent(Any,
Any newValue)
*/
void AccComponentEventListener::HandleCaretChangedEvent(Any, Any)
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_CARETCHANGE,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::OBJECT_CARETCHANGE);
}
/**
@@ -219,25 +219,25 @@ void
AccComponentEventListener::FireStatePropertyChange(sal_Int64 state, bool se
if (!pAgent->IsSpecialToolbarItem(m_xAccessible.get()))
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_CHECKED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_CHECKED);
}
break;
case AccessibleStateType::PRESSED:
pAgent->IncreaseState(m_xAccessible.get(), state);
- pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_PRESSED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_PRESSED);
break;
case AccessibleStateType::SELECTED:
pAgent->IncreaseState(m_xAccessible.get(), state);
break;
case AccessibleStateType::ARMED:
pAgent->IncreaseState(m_xAccessible.get(), state);
- pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_ARMED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_ARMED);
break;
case AccessibleStateType::SHOWING:
pAgent->DecreaseState(m_xAccessible.get(),
AccessibleStateType::DEFUNC);
// UNO !SHOWING == MSAA OFFSCREEN
pAgent->IncreaseState(m_xAccessible.get(),
AccessibleStateType::SHOWING );
- pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_SHOWING,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_SHOWING);
break;
case AccessibleStateType::VISIBLE:
// UNO !VISIBLE == MSAA INVISIBLE
@@ -259,23 +259,23 @@ void
AccComponentEventListener::FireStatePropertyChange(sal_Int64 state, bool se
if (!pAgent->IsSpecialToolbarItem(m_xAccessible.get()))
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_CHECKED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_CHECKED);
}
break;
case AccessibleStateType::PRESSED:
pAgent->DecreaseState(m_xAccessible.get(), state);
- pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_PRESSED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_PRESSED);
break;
case AccessibleStateType::SELECTED:
pAgent->DecreaseState(m_xAccessible.get(), state);
//if the state is unset, no need to send MSAA SELECTION event
- //pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_SELECTED,
m_xAccessible.get());
+ //pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_SELECTED);
break;
case AccessibleStateType::ARMED:
{
pAgent->DecreaseState(m_xAccessible.get(), state);
//if the state is unset, no need to send MSAA MENU event
- //pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_ARMED,
m_xAccessible.get());
+ //pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_ARMED);
}
break;
case AccessibleStateType::SHOWING:
@@ -304,7 +304,7 @@ void AccComponentEventListener::FireStateFocusedChange(bool
enable)
if(enable)
{
if (GetParentRole() != AccessibleRole::COMBO_BOX)
- pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_FOCUSED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_FOCUSED);
}
else
{
@@ -315,13 +315,13 @@ void
AccComponentEventListener::FireStateFocusedChange(bool enable)
void AccComponentEventListener::HandleSelectionChangedEventNoArgs()
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::SELECTION_CHANGED);
}
//add TEXT_SELECTION_CHANGED event
void AccComponentEventListener::HandleTextSelectionChangedEvent()
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::TEXT_SELECTION_CHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::TEXT_SELECTION_CHANGED);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx
b/winaccessibility/source/service/AccContainerEventListener.cxx
index 1ca75234a944..f4ec31d335c4 100644
--- a/winaccessibility/source/service/AccContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccContainerEventListener.cxx
@@ -125,7 +125,7 @@ void
AccContainerEventListener::HandleSelectionChangedEvent(const Any& /*oldValu
//menu bar does not process selection change event,just same as word
behavior
if (GetRole()!=AccessibleRole::MENU_BAR)
- pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::SELECTION_CHANGED);
}
/**
@@ -140,7 +140,7 @@ void
AccContainerEventListener::HandleAllChildrenChangedEvent()
pAgent->DeleteChildrenAccObj(m_xAccessible.get());
//add all oldValue's existing children
pAgent->InsertChildrenAccObj(m_xAccessible.get());
- pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_REORDER,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::OBJECT_REORDER);
}
}
@@ -150,7 +150,7 @@ void
AccContainerEventListener::HandleAllChildrenChangedEvent()
void AccContainerEventListener::HandleTextChangedEvent(Any, Any newValue)
{
pAgent->UpdateValue(m_xAccessible.get(), newValue);
- pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_TEXTCHANGE,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::OBJECT_TEXTCHANGE);
}
/**
@@ -217,7 +217,7 @@ void AccContainerEventListener::SetComponentState(sal_Int64
state, bool enable )
case AccessibleStateType::CHECKED:
{
pAgent->UpdateState(m_xAccessible.get());
- pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_BUSY,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_BUSY);
break;
}
@@ -246,7 +246,7 @@ void
AccContainerEventListener::FireStatePropertyChange(sal_Int64 state, bool se
case AccessibleStateType::FOCUSABLE:
case AccessibleStateType::OFFSCREEN:
pAgent->IncreaseState(m_xAccessible.get(), state);
- pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_BUSY,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_BUSY);
break;
case AccessibleStateType::SHOWING:
// UNO !SHOWING == MSAA OFFSCREEN
@@ -273,7 +273,7 @@ void
AccContainerEventListener::FireStatePropertyChange(sal_Int64 state, bool se
case AccessibleStateType::FOCUSABLE:
case AccessibleStateType::OFFSCREEN:
pAgent->DecreaseState(m_xAccessible.get(), state);
- pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_BUSY,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_BUSY);
break;
case AccessibleStateType::SHOWING:
// UNO !SHOWING == MSAA OFFSCREEN
@@ -303,10 +303,10 @@ void
AccContainerEventListener::FireStateFocusedChange(bool enable)
short role = GetRole();
if(role == AccessibleRole::MENU_BAR)
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::MENU_START,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::MENU_START);
}
else if (role == AccessibleRole::POPUP_MENU)
- pAgent->NotifyAccEvent(UnoMSAAEvent::MENUPOPUPSTART,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::MENUPOPUPSTART);
//Disable the focused event on option_pane and Panel.
//only disable option_pane for toolbar has panel to get focus
else if (role == AccessibleRole::PANEL || role ==
AccessibleRole::OPTION_PANE )
@@ -316,7 +316,7 @@ void AccContainerEventListener::FireStateFocusedChange(bool
enable)
if (parentRole == AccessibleRole::TOOL_BAR
|| parentRole == AccessibleRole::SCROLL_PANE // sidebar
|| parentRole == AccessibleRole::PANEL) // sidebar
- pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_FOCUSED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_FOCUSED);
}
else if (role == AccessibleRole::COMBO_BOX )
{
@@ -337,17 +337,17 @@ void
AccContainerEventListener::FireStateFocusedChange(bool enable)
{
pAgent->DecreaseState(m_xAccessible.get(),
AccessibleStateType::FOCUSED);
pAgent->IncreaseState( mxChild.get(),
AccessibleStateType::FOCUSED);
-
pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_FOCUSED, mxChild.get());
+ pAgent->NotifyAccEvent(mxChild.get(),
UnoMSAAEvent::STATE_FOCUSED);
bSendFocusOnCombobox = false;
}
}
}
}
if (bSendFocusOnCombobox)
- pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_FOCUSED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_FOCUSED);
}
else
- pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_FOCUSED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_FOCUSED);
}
else
{
@@ -356,11 +356,11 @@ void
AccContainerEventListener::FireStateFocusedChange(bool enable)
// if the acc role is POPUP_MENU, UnoMSAAEvent::MENUPOPUPEND event
should be sent
if (GetRole() == AccessibleRole::MENU_BAR)
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::MENU_END,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::MENU_END);
}
else if (GetRole() == AccessibleRole::POPUP_MENU)
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::MENUPOPUPEND,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::MENUPOPUPEND);
}
}
}
@@ -374,7 +374,7 @@ void AccContainerEventListener::FireStateFocusedChange(bool
enable)
void AccContainerEventListener::HandleValueChangedEvent(Any, Any)
{
pAgent->UpdateValue(m_xAccessible.get());
- pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_VALUECHANGE,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::OBJECT_VALUECHANGE);
}
bool AccContainerEventListener::IsEditable(Reference<XAccessibleContext> const
& xContext)
@@ -391,7 +391,7 @@ bool
AccContainerEventListener::NotifyChildEvent(UnoMSAAEvent eWinEvent, const A
if(xChild.is())
{
XAccessible* pAcc = xChild.get();
- pAgent->NotifyAccEvent(eWinEvent, pAcc);
+ pAgent->NotifyAccEvent(pAcc, eWinEvent);
return true;
}
}
@@ -404,7 +404,7 @@ void
AccContainerEventListener::HandleSelectionChangedAddEvent(const Any& /*oldV
{
return ;
}
- pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED_ADD,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::SELECTION_CHANGED_ADD);
}
void AccContainerEventListener::HandleSelectionChangedRemoveEvent(const Any&
/*oldValue*/, const Any& newValue)
@@ -413,7 +413,7 @@ void
AccContainerEventListener::HandleSelectionChangedRemoveEvent(const Any& /*o
{
return ;
}
- pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED_REMOVE,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::SELECTION_CHANGED_REMOVE);
}
void AccContainerEventListener::HandleSelectionChangedWithinEvent(const Any&
/*oldValue*/, const Any& newValue)
@@ -422,7 +422,7 @@ void
AccContainerEventListener::HandleSelectionChangedWithinEvent(const Any& /*o
{
return ;
}
- pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED_WITHIN,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::SELECTION_CHANGED_WITHIN);
}
void AccContainerEventListener::UpdateAllChildrenState(XAccessible*
pXAccessible)
@@ -460,17 +460,17 @@ void
AccContainerEventListener::UpdateAllChildrenState(XAccessible* pXAccessible
void AccContainerEventListener::HandlePageChangedEvent(const Any&
/*oldValue*/, const Any& /*newValue*/)
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_PAGECHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::OBJECT_PAGECHANGED);
}
void AccContainerEventListener::HandleSectionChangedEvent(const Any&
/*oldValue*/, const Any& /*newValue*/ )
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::SECTION_CHANGED, m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(), UnoMSAAEvent::SECTION_CHANGED);
}
void AccContainerEventListener::HandleColumnChangedEvent(const Any&
/*oldValue*/, const Any& /*newValue*/)
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::COLUMN_CHANGED, m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(), UnoMSAAEvent::COLUMN_CHANGED);
}
void AccContainerEventListener::HandleNameChangedEvent( Any name )
diff --git
a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
index d132c4022d88..f52ed2933065 100644
--- a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
+++ b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
@@ -91,7 +91,7 @@ void
AccDescendantManagerEventListener::HandleSelectionChangedEvent(Any oldValue
pAgent->IncreaseState( pAcc, AccessibleStateType::SELECTED);
}
- pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED, pAcc);
+ pAgent->NotifyAccEvent(pAcc, UnoMSAAEvent::SELECTION_CHANGED);
bSend=true;
}
}
@@ -105,7 +105,7 @@ void
AccDescendantManagerEventListener::HandleSelectionChangedEvent(Any oldValue
}
if (!bSend)
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::SELECTION_CHANGED);
}
}
@@ -142,7 +142,7 @@ bool
AccDescendantManagerEventListener::NotifyChildEvent(UnoMSAAEvent eWinEvent,
if(xChild.is())
{
XAccessible* pAcc = xChild.get();
- pAgent->NotifyAccEvent(eWinEvent, pAcc);
+ pAgent->NotifyAccEvent(pAcc, eWinEvent);
if (pAgent->IsStateManageDescendant(m_xAccessible.get()))
{
@@ -174,7 +174,7 @@ void
AccDescendantManagerEventListener::HandleSelectionChangedAddEvent(const Any
{
return ;
}
- pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED_ADD,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::SELECTION_CHANGED_ADD);
}
void
AccDescendantManagerEventListener::HandleSelectionChangedRemoveEvent(const Any&
/*oldValue*/, const Any &newValue)
@@ -183,7 +183,7 @@ void
AccDescendantManagerEventListener::HandleSelectionChangedRemoveEvent(const
{
return ;
}
- pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED_REMOVE,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::SELECTION_CHANGED_REMOVE);
}
void
AccDescendantManagerEventListener::HandleSelectionChangedWithinEvent(const Any&
/*oldValue*/, const Any &newValue)
@@ -192,7 +192,7 @@ void
AccDescendantManagerEventListener::HandleSelectionChangedWithinEvent(const
{
return ;
}
- pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED_WITHIN,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::SELECTION_CHANGED_WITHIN);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/AccEventListener.cxx
b/winaccessibility/source/service/AccEventListener.cxx
index d723eaaa434c..8b06d1872bd5 100644
--- a/winaccessibility/source/service/AccEventListener.cxx
+++ b/winaccessibility/source/service/AccEventListener.cxx
@@ -88,12 +88,12 @@ void AccEventListener::HandleNameChangedEvent(Any name)
if (pAccDoc)
{
pAgent->UpdateAccName(pAccDoc);
- pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_NAMECHANGE, pAccDoc);
+ pAgent->NotifyAccEvent(pAccDoc, UnoMSAAEvent::OBJECT_NAMECHANGE);
}
}
pAgent->UpdateAccName(m_xAccessible.get(), name);
- pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_NAMECHANGE,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::OBJECT_NAMECHANGE);
}
/**
@@ -112,7 +112,7 @@ void
AccEventListener::HandleChildChangedEvent(com::sun::star::uno::Any oldValue
XAccessible* pAcc = xChild.get();
pAgent->InsertAccObj(pAcc, m_xAccessible.get());
pAgent->InsertChildrenAccObj(pAcc);
- pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_ADDED, pAcc);
+ pAgent->NotifyAccEvent(pAcc, UnoMSAAEvent::CHILD_ADDED);
}
}
else if (oldValue >>= xChild)
@@ -120,7 +120,7 @@ void
AccEventListener::HandleChildChangedEvent(com::sun::star::uno::Any oldValue
if (xChild.is())
{
XAccessible* pAcc = xChild.get();
- pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_REMOVED, pAcc);
+ pAgent->NotifyAccEvent(pAcc, UnoMSAAEvent::CHILD_REMOVED);
pAgent->DeleteChildrenAccObj(pAcc);
pAgent->DeleteAccObj(pAcc);
}
@@ -132,7 +132,7 @@ void
AccEventListener::HandleChildChangedEvent(com::sun::star::uno::Any oldValue
*/
void AccEventListener::HandleDescriptionChangedEvent()
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_DESCRIPTIONCHANGE,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::OBJECT_DESCRIPTIONCHANGE);
}
/**
@@ -140,7 +140,7 @@ void AccEventListener::HandleDescriptionChangedEvent()
*/
void AccEventListener::HandleBoundrectChangedEvent()
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::BOUNDRECT_CHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::BOUNDRECT_CHANGED);
}
/**
@@ -149,7 +149,7 @@ void AccEventListener::HandleBoundrectChangedEvent()
void AccEventListener::HandleVisibleDataChangedEvent()
{
pAgent->UpdateValue(m_xAccessible.get());
- pAgent->NotifyAccEvent(UnoMSAAEvent::VISIBLE_DATA_CHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::VISIBLE_DATA_CHANGED);
}
/**
@@ -197,7 +197,7 @@ void AccEventListener::FireStateFocusedChange(bool enable)
if (enable)
{
pAgent->IncreaseState(m_xAccessible.get(),
AccessibleStateType::FOCUSED);
- pAgent->NotifyAccEvent(UnoMSAAEvent::STATE_FOCUSED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::STATE_FOCUSED);
}
else
{
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx
b/winaccessibility/source/service/AccFrameEventListener.cxx
index ac6795abb476..d693b2c37c65 100644
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -87,7 +87,7 @@ void AccFrameEventListener::HandleChildChangedEvent(Any
oldValue, Any newValue)
pAgent->InsertAccObj(pAcc, m_xAccessible.get(), systemdata->hWnd);
pAgent->InsertChildrenAccObj(pAcc);
- pAgent->NotifyAccEvent(UnoMSAAEvent::CHILD_ADDED, pAcc);
+ pAgent->NotifyAccEvent(pAcc, UnoMSAAEvent::CHILD_ADDED);
}
}
else if (oldValue >>= xChild)
diff --git a/winaccessibility/source/service/AccListEventListener.cxx
b/winaccessibility/source/service/AccListEventListener.cxx
index b4ecb9f77862..802693016e44 100644
--- a/winaccessibility/source/service/AccListEventListener.cxx
+++ b/winaccessibility/source/service/AccListEventListener.cxx
@@ -92,7 +92,7 @@ void
AccListEventListener::HandleActiveDescendantChangedEvent(Any oldValue, Any
pAgent->IncreaseState( pAcc, AccessibleStateType::FOCUSED);
- pAgent->NotifyAccEvent(UnoMSAAEvent::ACTIVE_DESCENDANT_CHANGED,
pAcc);
+ pAgent->NotifyAccEvent(pAcc,
UnoMSAAEvent::ACTIVE_DESCENDANT_CHANGED);
}
}
if (oldValue >>= xChild)
@@ -119,7 +119,7 @@ void AccListEventListener::HandleValueChangedEvent(Any, Any)
XAccessible* pParentAcc =
pAgent->GetParentXAccessible(m_xAccessible.get());
pAgent->UpdateValue(pParentAcc);
- pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_VALUECHANGE, pParentAcc);
+ pAgent->NotifyAccEvent(pParentAcc, UnoMSAAEvent::OBJECT_VALUECHANGE);
}
}
diff --git a/winaccessibility/source/service/AccMenuEventListener.cxx
b/winaccessibility/source/service/AccMenuEventListener.cxx
index 411dd3b82b5f..a21610109b33 100644
--- a/winaccessibility/source/service/AccMenuEventListener.cxx
+++ b/winaccessibility/source/service/AccMenuEventListener.cxx
@@ -64,7 +64,7 @@ void AccMenuEventListener::notifyEvent( const
css::accessibility::AccessibleEve
*/
void AccMenuEventListener::HandleSelectionChangedEventNoArgs()
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::SELECTION_CHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::SELECTION_CHANGED);
}
/**
diff --git a/winaccessibility/source/service/AccObjectManagerAgent.cxx
b/winaccessibility/source/service/AccObjectManagerAgent.cxx
index 9eb7f773d939..65aa77ab3ed7 100644
--- a/winaccessibility/source/service/AccObjectManagerAgent.cxx
+++ b/winaccessibility/source/service/AccObjectManagerAgent.cxx
@@ -199,7 +199,7 @@ void AccObjectManagerAgent::UpdateState(
css::accessibility::XAccessible* pXAcc
* @param eEvent event type.
* @return If the method is correctly processed.
*/
-bool AccObjectManagerAgent::NotifyAccEvent(UnoMSAAEvent eEvent, XAccessible*
pXAcc)
+bool AccObjectManagerAgent::NotifyAccEvent(XAccessible* pXAcc, UnoMSAAEvent
eEvent)
{
assert(pWinManager);
return pWinManager->NotifyAccEvent(pXAcc, eEvent);
diff --git a/winaccessibility/source/service/AccParagraphEventListener.cxx
b/winaccessibility/source/service/AccParagraphEventListener.cxx
index 7d6b25a8f248..635210e66ee0 100644
--- a/winaccessibility/source/service/AccParagraphEventListener.cxx
+++ b/winaccessibility/source/service/AccParagraphEventListener.cxx
@@ -94,7 +94,7 @@ void AccParagraphEventListener::notifyEvent( const
css::accessibility::Accessib
*/
void AccParagraphEventListener::HandleCaretChangedEvent(Any, Any)
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::OBJECT_CARETCHANGE,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::OBJECT_CARETCHANGE);
}
/**
@@ -124,7 +124,7 @@ void AccParagraphEventListener::SetComponentState(sal_Int64
state, bool enable )
void AccParagraphEventListener::HandleTextSelectionChangedEvent()
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::TEXT_SELECTION_CHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::TEXT_SELECTION_CHANGED);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/AccTableEventListener.cxx
b/winaccessibility/source/service/AccTableEventListener.cxx
index 96345cc86894..db7b1f5b5c61 100644
--- a/winaccessibility/source/service/AccTableEventListener.cxx
+++ b/winaccessibility/source/service/AccTableEventListener.cxx
@@ -56,22 +56,22 @@ void AccTableEventListener::notifyEvent( const
css::accessibility::AccessibleEv
case AccessibleEventId::TABLE_CAPTION_CHANGED:
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::TABLE_CAPTION_CHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::TABLE_CAPTION_CHANGED);
break;
}
case AccessibleEventId::TABLE_COLUMN_DESCRIPTION_CHANGED:
{
-
pAgent->NotifyAccEvent(UnoMSAAEvent::TABLE_COLUMN_DESCRIPTION_CHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::TABLE_COLUMN_DESCRIPTION_CHANGED);
break;
}
case AccessibleEventId::TABLE_COLUMN_HEADER_CHANGED:
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::TABLE_COLUMN_HEADER_CHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::TABLE_COLUMN_HEADER_CHANGED);
break;
}
case AccessibleEventId::TABLE_ROW_HEADER_CHANGED:
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::TABLE_ROW_HEADER_CHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::TABLE_ROW_HEADER_CHANGED);
break;
}
case AccessibleEventId::TABLE_MODEL_CHANGED:
@@ -81,12 +81,12 @@ void AccTableEventListener::notifyEvent( const
css::accessibility::AccessibleEv
}
case AccessibleEventId::TABLE_SUMMARY_CHANGED:
{
- pAgent->NotifyAccEvent(UnoMSAAEvent::TABLE_SUMMARY_CHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::TABLE_SUMMARY_CHANGED);
break;
}
case AccessibleEventId::TABLE_ROW_DESCRIPTION_CHANGED:
{
-
pAgent->NotifyAccEvent(UnoMSAAEvent::TABLE_ROW_DESCRIPTION_CHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::TABLE_ROW_DESCRIPTION_CHANGED);
break;
}
default:
@@ -109,7 +109,7 @@ void
AccTableEventListener::HandleActiveDescendantChangedEvent(Any oldValue, Any
{
XAccessible* pAcc = xChild.get();
pAgent->InsertAccObj(pAcc, m_xAccessible.get());
- pAgent->NotifyAccEvent(UnoMSAAEvent::ACTIVE_DESCENDANT_CHANGED,
pAcc);
+ pAgent->NotifyAccEvent(pAcc,
UnoMSAAEvent::ACTIVE_DESCENDANT_CHANGED);
}
}
else if (oldValue >>= xChild)
@@ -135,7 +135,7 @@ void AccTableEventListener::HandleTableModelChangeEvent(Any
newValue)
//add all oldValue's existing children
pAgent->InsertChildrenAccObj(m_xAccessible.get());
}
- pAgent->NotifyAccEvent(UnoMSAAEvent::TABLE_MODEL_CHANGED,
m_xAccessible.get());
+ pAgent->NotifyAccEvent(m_xAccessible.get(),
UnoMSAAEvent::TABLE_MODEL_CHANGED);
}
}
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx
b/winaccessibility/source/service/AccTopWindowListener.cxx
index a6b935d55798..e775bf77205e 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -77,7 +77,7 @@ void AccTopWindowListener::HandleWindowOpened(
css::accessibility::XAccessible*
if (role == css::accessibility::AccessibleRole::POPUP_MENU ||
role == css::accessibility::AccessibleRole::MENU )
{
- accManagerAgent.NotifyAccEvent(UnoMSAAEvent::MENUPOPUPSTART,
pAccessible);
+ accManagerAgent.NotifyAccEvent(pAccessible,
UnoMSAAEvent::MENUPOPUPSTART);
}
if (role == css::accessibility::AccessibleRole::FRAME ||
@@ -85,7 +85,7 @@ void AccTopWindowListener::HandleWindowOpened(
css::accessibility::XAccessible*
role == css::accessibility::AccessibleRole::WINDOW ||
role == css::accessibility::AccessibleRole::ALERT)
{
- accManagerAgent.NotifyAccEvent(UnoMSAAEvent::SHOW, pAccessible);
+ accManagerAgent.NotifyAccEvent(pAccessible, UnoMSAAEvent::SHOW);
}
}
}
@@ -213,7 +213,7 @@ void AccTopWindowListener::windowClosed( const
css::lang::EventObject& e )
if (role == css::accessibility::AccessibleRole::POPUP_MENU ||
role == css::accessibility::AccessibleRole::MENU)
{
- accManagerAgent.NotifyAccEvent(UnoMSAAEvent::MENUPOPUPEND,
pAccessible);
+ accManagerAgent.NotifyAccEvent(pAccessible,
UnoMSAAEvent::MENUPOPUPEND);
}
}
diff --git a/winaccessibility/source/service/AccTreeEventListener.cxx
b/winaccessibility/source/service/AccTreeEventListener.cxx
index ee3be70ac2ef..cb3759cbdb25 100644
--- a/winaccessibility/source/service/AccTreeEventListener.cxx
+++ b/winaccessibility/source/service/AccTreeEventListener.cxx
@@ -72,7 +72,7 @@ void
AccTreeEventListener::HandleActiveDescendantChangedEvent(Any oldValue, Any
{
XAccessible* pAcc = xChild.get();
pAgent->InsertAccObj(pAcc, m_xAccessible.get());
- pAgent->NotifyAccEvent(UnoMSAAEvent::ACTIVE_DESCENDANT_CHANGED,
pAcc);
+ pAgent->NotifyAccEvent(pAcc,
UnoMSAAEvent::ACTIVE_DESCENDANT_CHANGED);
}
}
if (oldValue >>= xChild)
commit b45481d6895e196177dfd9ef4df6b29dc32a8347
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Aug 7 11:47:40 2023 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Aug 8 08:18:06 2023 +0200
wina11y: Drop unused default nullptr arg
Calling this without passing an actual XAccessible*
wouldn't make any sense anyway.
Change-Id: Ie8d8aecc0c0a3a8a2c1ef62015fba7ad242059b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155437
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx
b/winaccessibility/inc/AccObjectManagerAgent.hxx
index 8cbfdff1ad53..064de74505a7 100644
--- a/winaccessibility/inc/AccObjectManagerAgent.hxx
+++ b/winaccessibility/inc/AccObjectManagerAgent.hxx
@@ -57,7 +57,7 @@ public:
virtual void DeleteAccObj( css::accessibility::XAccessible* pXAcc );
virtual IMAccessible* GetIMAccByXAcc(css::accessibility::XAccessible*
pXAcc);
- bool NotifyAccEvent(UnoMSAAEvent eEvent, css::accessibility::XAccessible*
pXAcc = nullptr);
+ bool NotifyAccEvent(UnoMSAAEvent eEvent, css::accessibility::XAccessible*
pXAcc);
bool InsertChildrenAccObj(css::accessibility::XAccessible* pXAcc,
HWND hWnd = nullptr);
commit b9a981e88f54d24b2a39e7e1801de8ab503daccf
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Aug 7 09:30:39 2023 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Aug 8 08:17:59 2023 +0200
wina11y: Move and simplify casting for Get_ToATInterface
Move the casting from AccObjectManagerAgent::Get_ToATInterface to
AccObjectWinManager::Get_ToATInterface and just do a
`reinterpret_cast<HWND>(...)` right away instead of a
`static_cast<HWND>(reinterpret_cast<void*>(...))`.
This is in preparation of dropping the AccObjectManagerAgent
indirection altogether.
Change-Id: Iad759f856f727418aab0d20b479fc38feac714ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155436
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx
b/winaccessibility/inc/AccObjectWinManager.hxx
index 55640fd8c6cb..b8f6c3bcd0f4 100644
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -105,7 +105,7 @@ public:
bool NotifyAccEvent(css::accessibility::XAccessible* pXAcc, UnoMSAAEvent
eEvent);
- LRESULT Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam);
+ sal_Int64 Get_ToATInterface(sal_Int64 nHWnd, long lParam, WPARAM wParam);
void DecreaseState(css::accessibility::XAccessible* pXAcc, sal_Int64
nState);
void IncreaseState(css::accessibility::XAccessible* pXAcc, sal_Int64
nState);
diff --git a/winaccessibility/source/service/AccObjectManagerAgent.cxx
b/winaccessibility/source/service/AccObjectManagerAgent.cxx
index eb242c243183..9eb7f773d939 100644
--- a/winaccessibility/source/service/AccObjectManagerAgent.cxx
+++ b/winaccessibility/source/service/AccObjectManagerAgent.cxx
@@ -312,8 +312,7 @@ bool
AccObjectManagerAgent::IsStateManageDescendant(XAccessible* pXAcc)
sal_Int64 AccObjectManagerAgent::Get_ToATInterface(
sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam)
{
- return static_cast<sal_Int64>(pWinManager->Get_ToATInterface(
- static_cast<HWND>(reinterpret_cast<void*>(hWnd)), lParam, wParam));
+ return pWinManager->Get_ToATInterface(hWnd, lParam, wParam);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx
b/winaccessibility/source/service/AccObjectWinManager.cxx
index dfc74f7bd4ef..9299c9a61887 100644
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -91,13 +91,14 @@ AccObjectWinManager::~AccObjectWinManager()
* @return Com interface with event.
*/
-LRESULT
-AccObjectWinManager::Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam)
+sal_Int64
+AccObjectWinManager::Get_ToATInterface(sal_Int64 nHWnd, long lParam, WPARAM
wParam)
{
IMAccessible* pRetIMAcc = nullptr;
if(lParam == OBJID_CLIENT )
{
+ HWND hWnd = reinterpret_cast<HWND>(nHWnd);
pRetIMAcc = GetTopWindowIMAccessible(hWnd);
}
@@ -105,7 +106,7 @@ AccObjectWinManager::Get_ToATInterface(HWND hWnd, long
lParam, WPARAM wParam)
{
LRESULT result = LresultFromObject(IID_IAccessible, wParam, pRetIMAcc);
pRetIMAcc->Release();
- return result;
+ return static_cast<sal_Int64>(result);
}
return 0;
}
