accessibility/inc/extended/accessibleiconchoicectrl.hxx | 1 accessibility/inc/extended/accessiblelistbox.hxx | 1 accessibility/inc/standard/vclxaccessiblebox.hxx | 3 - accessibility/inc/standard/vclxaccessibleedit.hxx | 1 accessibility/source/extended/accessibleiconchoicectrl.cxx | 6 --- accessibility/source/extended/accessiblelistbox.cxx | 6 --- accessibility/source/standard/vclxaccessibleedit.cxx | 22 +++++++------ 7 files changed, 15 insertions(+), 25 deletions(-)
New commits: commit 4622e28f8308e5bd3b4d29f91da7b25760362373 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Nov 26 08:32:16 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Nov 26 12:04:07 2024 +0100 a11y: Drop misleading comment The "The role is always AccessibleRole::COMBO_BOX." comment for VCLXAccessibleBox::getAccessibleRole is misleading, as the actual implementation can also return AccessibleRole::PANEL. Change-Id: I15b089e168aa7ec0701eacc8630023123f3a10dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177313 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx index 2d0f0b46e8f7..c2db4a0cdd63 100644 --- a/accessibility/inc/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/standard/vclxaccessiblebox.hxx @@ -67,8 +67,7 @@ public: */ css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int64 i) override; - /** The role is always AccessibleRole::COMBO_BOX. - */ + sal_Int16 SAL_CALL getAccessibleRole() override; // XAccessibleAction commit c7e210919ac940ca7734ec6dd9b2ecb76ab3d4d4 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Nov 26 08:27:06 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Nov 26 12:04:01 2024 +0100 a11y: Create VCLXAccessibleEdit::isComboBoxChild helper It will be reused in another method in an upcoming commit. Change-Id: Ie6b4559e268d9340b5b13844c906232c6ff38a6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177312 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx index 187a03264718..107ff01f54de 100644 --- a/accessibility/inc/standard/vclxaccessibleedit.hxx +++ b/accessibility/inc/standard/vclxaccessibleedit.hxx @@ -101,6 +101,7 @@ public: virtual sal_Bool SAL_CALL setText( const OUString& sText ) override; private: + bool isComboBoxChild(); bool isEditable(); }; diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index f7ce36f3187e..bc528a5c2690 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -168,15 +168,7 @@ bool VCLXAccessibleEdit::PreferFullTextInTextChangedEvent() // for a combobox subedit, the Orca screen reader announces the new/added text // so always send the whole old and new text and not just // the changed characters, so the whole entry text gets announced - Reference<XAccessible> xParent = getAccessibleParent(); - if (xParent.is()) - { - Reference<XAccessibleContext> xParentContext = xParent->getAccessibleContext(); - if (xParentContext.is() && xParentContext->getAccessibleRole() == AccessibleRole::COMBO_BOX) - return true; - } - - return false; + return isComboBoxChild(); } // XServiceInfo @@ -616,6 +608,18 @@ sal_Bool VCLXAccessibleEdit::setText( const OUString& sText ) return bReturn; } +bool VCLXAccessibleEdit::isComboBoxChild() +{ + Reference<XAccessible> xParent = getAccessibleParent(); + if (xParent.is()) + { + Reference<XAccessibleContext> xParentContext = xParent->getAccessibleContext(); + if (xParentContext.is() && xParentContext->getAccessibleRole() == AccessibleRole::COMBO_BOX) + return true; + } + return false; +} + bool VCLXAccessibleEdit::isEditable() { VclPtr<Edit> pEdit = GetAs<Edit>(); commit c9cae91d0a37051e1009730ceadf3a1ca3f239ee Author: Michael Weghorn <[email protected]> AuthorDate: Tue Nov 26 08:19:00 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Nov 26 12:03:54 2024 +0100 a11y: Drop VCLXAccessibleComponent::supportsService overrides Like the base class implementation, they call cppu::supportsService, so there's no need to override the former. Change-Id: I6550edce0567502a411cac402923c2c02e02f58d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177311 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/extended/accessibleiconchoicectrl.hxx index 5ead84ee3466..99adb175f8e8 100644 --- a/accessibility/inc/extended/accessibleiconchoicectrl.hxx +++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx @@ -62,7 +62,6 @@ namespace accessibility // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx index 55112facacbc..7570bdbb5afe 100644 --- a/accessibility/inc/extended/accessiblelistbox.hxx +++ b/accessibility/inc/extended/accessiblelistbox.hxx @@ -77,7 +77,6 @@ namespace accessibility // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 84283e20ee2c..612ef43a105a 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <comphelper/accessiblecontexthelper.hxx> #include <vcl/toolkit/ivctrl.hxx> -#include <cppuhelper/supportsservice.hxx> namespace accessibility @@ -130,11 +129,6 @@ namespace accessibility u"com.sun.star.awt.AccessibleIconChoiceControl"_ustr}; } - sal_Bool SAL_CALL AccessibleIconChoiceCtrl::supportsService( const OUString& _rServiceName ) - { - return cppu::supportsService(this, _rServiceName); - } - // XAccessible Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleContext( ) diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index bcb1c9f4b87c..8bdf8e84364a 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <comphelper/accessiblecontexthelper.hxx> -#include <cppuhelper/supportsservice.hxx> namespace accessibility @@ -261,11 +260,6 @@ namespace accessibility u"com.sun.star.awt.AccessibleTreeListBox"_ustr}; } - sal_Bool SAL_CALL AccessibleListBox::supportsService( const OUString& _rServiceName ) - { - return cppu::supportsService(this, _rServiceName); - } - // XAccessible Reference< XAccessibleContext > SAL_CALL AccessibleListBox::getAccessibleContext( )
