mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wina11y: Simplify SELECTION_CHANGED_* handlers a bit

Browse Source 
Drop the unused `oldValue` param from the methods
handling the SELECTION_CHANGED_* events, and make
them non-virtual, as they don't need to be overriden
in any subclass.

Change-Id: Ic4a248a6dedaa0a6b25b22dd5673be2bb27a4fc8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183791
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn 2025-04-07 13:28:29 +01:00
parent 3ebf51d380
commit e7a34dbaec
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winaccessibility/inc/AccDescendantManagerEventListener.hxx
View File

@ -54,12 +54,9 @@ public:
bool NotifyChildEvent(UnoMSAAEvent eWinEvent, const css::uno::Any& Value); bool NotifyChildEvent(UnoMSAAEvent eWinEvent, const css::uno::Any& Value);
virtual void HandleSelectionChangedAddEvent( void HandleSelectionChangedAddEvent(const css::uno::Any& newValue);
const css::uno::Any &oldValue, const css::uno::Any &newValue); void HandleSelectionChangedRemoveEvent(const css::uno::Any& newValue);
virtual void HandleSelectionChangedRemoveEvent( void HandleSelectionChangedWithinEvent(const css::uno::Any& newValue);
const css::uno::Any &oldValue, const css::uno::Any &newValue);
virtual void HandleSelectionChangedWithinEvent(
const css::uno::Any &oldValue, const css::uno::Any &newValue);
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

12
winaccessibility/source/service/AccDescendantManagerEventListener.cxx
View File

@ -57,13 +57,13 @@ void AccDescendantManagerEventListener::notifyEvent( const css::accessibility::
HandleChildChangedNoFocusEvent(aEvent.OldValue, aEvent.NewValue); HandleChildChangedNoFocusEvent(aEvent.OldValue, aEvent.NewValue);
break; break;
case AccessibleEventId::SELECTION_CHANGED_ADD: case AccessibleEventId::SELECTION_CHANGED_ADD:
HandleSelectionChangedAddEvent(aEvent.OldValue, aEvent.NewValue); HandleSelectionChangedAddEvent(aEvent.NewValue);
break; break;
case AccessibleEventId::SELECTION_CHANGED_REMOVE: case AccessibleEventId::SELECTION_CHANGED_REMOVE:
HandleSelectionChangedRemoveEvent(aEvent.OldValue, aEvent.NewValue); HandleSelectionChangedRemoveEvent(aEvent.NewValue);
break; break;
case AccessibleEventId::SELECTION_CHANGED_WITHIN: case AccessibleEventId::SELECTION_CHANGED_WITHIN:
HandleSelectionChangedWithinEvent(aEvent.OldValue, aEvent.NewValue); HandleSelectionChangedWithinEvent(aEvent.NewValue);
break; break;
default: default:
AccComponentEventListener::notifyEvent(aEvent); AccComponentEventListener::notifyEvent(aEvent);
@ -167,7 +167,7 @@ bool AccDescendantManagerEventListener::NotifyChildEvent(UnoMSAAEvent eWinEvent,
} }
return false; return false;
} }
void AccDescendantManagerEventListener::HandleSelectionChangedAddEvent(const Any& /*oldValue*/, const Any &newValue) void AccDescendantManagerEventListener::HandleSelectionChangedAddEvent(const Any& newValue)
{ {
if (NotifyChildEvent(UnoMSAAEvent::SELECTION_CHANGED_ADD, newValue)) if (NotifyChildEvent(UnoMSAAEvent::SELECTION_CHANGED_ADD, newValue))
{ {
@ -176,7 +176,7 @@ void AccDescendantManagerEventListener::HandleSelectionChangedAddEvent(const Any
m_rObjManager.NotifyAccEvent(m_xAccessible.get(), UnoMSAAEvent::SELECTION_CHANGED_ADD); m_rObjManager.NotifyAccEvent(m_xAccessible.get(), UnoMSAAEvent::SELECTION_CHANGED_ADD);
} }
void AccDescendantManagerEventListener::HandleSelectionChangedRemoveEvent(const Any& /*oldValue*/, const Any &newValue) void AccDescendantManagerEventListener::HandleSelectionChangedRemoveEvent(const Any& newValue)
{ {
if (NotifyChildEvent(UnoMSAAEvent::SELECTION_CHANGED_REMOVE, newValue)) if (NotifyChildEvent(UnoMSAAEvent::SELECTION_CHANGED_REMOVE, newValue))
{ {
@ -185,7 +185,7 @@ void AccDescendantManagerEventListener::HandleSelectionChangedRemoveEvent(const
m_rObjManager.NotifyAccEvent(m_xAccessible.get(), UnoMSAAEvent::SELECTION_CHANGED_REMOVE); m_rObjManager.NotifyAccEvent(m_xAccessible.get(), UnoMSAAEvent::SELECTION_CHANGED_REMOVE);
} }
void AccDescendantManagerEventListener::HandleSelectionChangedWithinEvent(const Any& /*oldValue*/, const Any &newValue) void AccDescendantManagerEventListener::HandleSelectionChangedWithinEvent(const Any& newValue)
{ {
if (NotifyChildEvent(UnoMSAAEvent::SELECTION_CHANGED_WITHIN, newValue)) if (NotifyChildEvent(UnoMSAAEvent::SELECTION_CHANGED_WITHIN, newValue))
{ {