summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2022-03-18 12:01:06 +0100
committerMichael Weghorn <m.weghorn@posteo.de>2022-03-18 13:21:12 +0100
commitdadc8a8771645d475b6287dd4c65b88cdad81d93 (patch)
treebebd16ac956cb8023fd6d2bf6b72bd7e3f690b4d
parentfe09f12d83d934287c58f507a99b693212a84c79 (diff)
a11y: Drop vcl::unohelper::NotifyAccessibleStateEventGlobally
As mentioned in Change-Id I4681c28c9d18cf1953be5127765f4aa94563662d ("chart a11y: Drop bSendGlobally param from AccessibleBase::BroadcastAccEvent"), calling it has no effect, the `fireFocusGained` and `fireFocusLost` methods of the `XExtendedToolkit` interface in its only implementation in `VCLXToolkit` do nothing, so just drop it. Change-Id: Ie9352a4e4021d7bf0b35de71f55afc660795b906 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131736 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
-rw-r--r--editeng/source/accessibility/AccessibleEditableTextPara.cxx4
-rw-r--r--include/vcl/unohelp.hxx1
-rw-r--r--sc/source/ui/Accessibility/AccessibleContextBase.cxx4
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx4
-rw-r--r--vcl/source/app/unohelp.cxx19
5 files changed, 0 insertions, 32 deletions
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 22576523f9e6..cf605db6c4eb 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -560,10 +560,6 @@ namespace accessibility
AccessibleEventObject aEvent(xThis, nEventId, rNewValue, rOldValue);
- // #102261# Call global queue for focus events
- if( nEventId == AccessibleEventId::STATE_CHANGED )
- vcl::unohelper::NotifyAccessibleStateEventGlobally( aEvent );
-
// #106234# Delegate to EventNotifier
if( getNotifierClientId() != -1 )
::comphelper::AccessibleEventNotifier::addEvent( getNotifierClientId(),
diff --git a/include/vcl/unohelp.hxx b/include/vcl/unohelp.hxx
index 5ba919edd577..c7b9dcc06956 100644
--- a/include/vcl/unohelp.hxx
+++ b/include/vcl/unohelp.hxx
@@ -37,7 +37,6 @@ namespace vcl::unohelper
{
VCL_DLLPUBLIC css::uno::Reference < css::i18n::XBreakIterator > CreateBreakIterator();
css::uno::Reference < css::i18n::XCharacterClassification> CreateCharacterClassification();
-VCL_DLLPUBLIC void NotifyAccessibleStateEventGlobally( const css::accessibility::AccessibleEventObject& rEventObject );
VCL_DLLPUBLIC float ConvertFontWidth( FontWidth eWidth );
VCL_DLLPUBLIC FontWidth ConvertFontWidth( float f );
VCL_DLLPUBLIC float ConvertFontWeight( FontWeight eWeight );
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 38620240baaf..cdbb5ea71494 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -474,8 +474,6 @@ void ScAccessibleContextBase::CommitFocusGained() const
aEvent.NewValue <<= AccessibleStateType::FOCUSED;
CommitChange(aEvent);
-
- vcl::unohelper::NotifyAccessibleStateEventGlobally(aEvent);
}
void ScAccessibleContextBase::CommitFocusLost() const
@@ -486,8 +484,6 @@ void ScAccessibleContextBase::CommitFocusLost() const
aEvent.OldValue <<= AccessibleStateType::FOCUSED;
CommitChange(aEvent);
-
- vcl::unohelper::NotifyAccessibleStateEventGlobally(aEvent);
}
tools::Rectangle ScAccessibleContextBase::GetBoundingBoxOnScreen() const
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 046fec99224b..3331a88e552c 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -1410,10 +1410,6 @@ namespace accessibility
void AccessibleTextHelper_Impl::FireEvent( const AccessibleEventObject& rEvent ) const
{
- // #102261# Call global queue for focus events
- if( rEvent.EventId == AccessibleStateType::FOCUSED )
- vcl::unohelper::NotifyAccessibleStateEventGlobally( rEvent );
-
// #106234# Delegate to EventNotifier
::comphelper::AccessibleEventNotifier::addEvent( getNotifierClientId(),
rEvent );
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index f08e54131259..89b526c91ffa 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -45,25 +45,6 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte
return i18n::CharacterClassification::create( comphelper::getProcessComponentContext() );
}
-void vcl::unohelper::NotifyAccessibleStateEventGlobally( const css::accessibility::AccessibleEventObject& rEventObject )
-{
- css::uno::Reference< css::awt::XExtendedToolkit > xExtToolkit( Application::GetVCLToolkit(), uno::UNO_QUERY );
- if ( !xExtToolkit.is() )
- return;
-
- // Only for focus events
- sal_Int16 nType = css::accessibility::AccessibleStateType::INVALID;
- rEventObject.NewValue >>= nType;
- if ( nType == css::accessibility::AccessibleStateType::FOCUSED )
- xExtToolkit->fireFocusGained( rEventObject.Source );
- else
- {
- rEventObject.OldValue >>= nType;
- if ( nType == css::accessibility::AccessibleStateType::FOCUSED )
- xExtToolkit->fireFocusLost( rEventObject.Source );
- }
-}
-
float vcl::unohelper::ConvertFontWidth( FontWidth eWidth )
{
if( eWidth == WIDTH_DONTKNOW )