editeng/source/accessibility/AccessibleEditableTextPara.cxx | 3 - editeng/source/accessibility/AccessibleImageBullet.cxx | 23 +++--------- editeng/source/accessibility/AccessibleImageBullet.hxx | 15 +------ sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 10 ----- sc/source/ui/inc/AccessibleSpreadsheet.hxx | 9 ---- 5 files changed, 10 insertions(+), 50 deletions(-)
New commits: commit 16df8b5bef2c7680956a826f6d0895e9d02768d8 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Apr 7 12:16:21 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Apr 8 17:13:08 2025 +0200 sc a11y: Drop ScAccessibleSpreadsheet::addAccessibleEventListener This override of the base class method ScAccessibleContextBase::addAccessibleEventListener adds nothing relevant not already done in the base class implementation that it calls as the end. Change-Id: I4634e60ed259abb3c7cdb56305cf127dfc5df49e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183830 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index f418ca2d2bb9..239341d36f7c 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -1364,16 +1364,6 @@ uno::Sequence<sal_Int8> SAL_CALL return css::uno::Sequence<sal_Int8>(); } -///===== XAccessibleEventBroadcaster ===================================== - -void SAL_CALL ScAccessibleSpreadsheet::addAccessibleEventListener(const uno::Reference<XAccessibleEventListener>& xListener) -{ - SolarMutexGuard aGuard; - IsObjectValid(); - ScAccessibleTableBase::addAccessibleEventListener(xListener); - -} - //==== internal ========================================================= AbsoluteScreenPixelRectangle ScAccessibleSpreadsheet::GetBoundingBoxOnScreen() const diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index ec5228c5bc84..d1d906dda622 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -198,15 +198,6 @@ private: virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; - ///===== XAccessibleEventBroadcaster ===================================== - - /** Add listener that is informed of future changes of name, - description and so on events. - */ - virtual void SAL_CALL - addAccessibleEventListener( - const css::uno::Reference<css::accessibility::XAccessibleEventListener>& xListener) override; - //===== XAccessibleTableSelection ============================================ virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) override; commit a2baa12f9038be85a2425211fbc960b1c72ff304 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Apr 7 11:55:49 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Apr 8 17:13:02 2025 +0200 editeng a11y: Pass bullet's child index in ctor ... instead of having a separate getter, AccessibleImageBullet::SetIndexInParent. Change-Id: Ie0e59f87e12d04efd72aa5663c4a3eb0df9baf21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183829 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index e30b364acc60..fb9c766e06b9 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -584,11 +584,10 @@ uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessible if( !aChild.is() ) { // there is no hard reference available, create object then - aChild = new AccessibleImageBullet(this); + aChild = new AccessibleImageBullet(this, i); aChild->SetEditSource( &GetEditSource() ); aChild->SetParagraphIndex( GetParagraphIndex() ); - aChild->SetIndexInParent( i ); maImageBullet = aChild.get(); } diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 0c34e5a5c5b1..a44f99909cd3 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -49,9 +49,10 @@ using namespace ::com::sun::star::accessibility; namespace accessibility { -AccessibleImageBullet::AccessibleImageBullet ( uno::Reference< XAccessible > xParent ) : +AccessibleImageBullet::AccessibleImageBullet(uno::Reference<XAccessible> xParent, + sal_Int64 nIndexInParent) : mnParagraphIndex( 0 ), - mnIndexInParent( 0 ), + mnIndexInParent(nIndexInParent), mpEditSource( nullptr ), maEEOffset( 0, 0 ), mxParent(std::move( xParent )) @@ -216,11 +217,6 @@ uno::Sequence< OUString > SAL_CALL AccessibleImageBullet::getSupportedServiceNam return { u"com.sun.star.accessibility.AccessibleContext"_ustr }; } -void AccessibleImageBullet::SetIndexInParent( sal_Int32 nIndex ) -{ - mnIndexInParent = nIndex; -} - void AccessibleImageBullet::SetEEOffset( const Point& rOffset ) { maEEOffset = rOffset; diff --git a/editeng/source/accessibility/AccessibleImageBullet.hxx b/editeng/source/accessibility/AccessibleImageBullet.hxx index 9f58b7ba6c8d..c5c6d3b33cd8 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.hxx +++ b/editeng/source/accessibility/AccessibleImageBullet.hxx @@ -44,7 +44,8 @@ class AccessibleImageBullet final public: /// Create accessible object for given parent - AccessibleImageBullet ( css::uno::Reference< css::accessibility::XAccessible > xParent ); + AccessibleImageBullet(css::uno::Reference<css::accessibility::XAccessible> xParent, + sal_Int64 nIndexInParent); // XAccessible virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; @@ -72,15 +73,6 @@ public: virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) override; virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override; - /** Set the current index in the accessibility parent - - @attention This method does not lock the SolarMutex, - leaving that to the calling code. This is because only - there potential deadlock situations can be resolved. Thus, - make sure SolarMutex is locked when calling this. - */ - void SetIndexInParent( sal_Int32 nIndex ); - /** Set the edit engine offset @attention This method does not lock the SolarMutex, commit bafaf554a07766d99bb264f7bcc3198a57c2166e Author: Michael Weghorn <[email protected]> AuthorDate: Mon Apr 7 11:49:59 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Apr 8 17:12:55 2025 +0200 editeng a11y: Drop AccessibleImageBullet::FireEvent Use base class method OAccessibleComponentHelper::NotifyAccessibleEvent directly instead. That one has the reverse order for the old/new value params, and no default for the old value, so adjust callers accordingly. Change-Id: Ib591495c5698832a99cd60854d4ee8aa4a206442 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183828 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 00db3b338d0c..0c34e5a5c5b1 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -248,17 +248,12 @@ void AccessibleImageBullet::SetEditSource( SvxEditSource* pEditSource ) } } -void AccessibleImageBullet::FireEvent(const sal_Int16 nEventId, const uno::Any& rNewValue, const uno::Any& rOldValue) -{ - NotifyAccessibleEvent(nEventId, rOldValue, rNewValue); -} - void AccessibleImageBullet::SetState( const sal_Int64 nStateId ) { if( !(mnStateSet & nStateId) ) { mnStateSet |= nStateId; - FireEvent( AccessibleEventId::STATE_CHANGED, uno::Any( nStateId ) ); + NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED, uno::Any(), uno::Any(nStateId)); } } @@ -267,7 +262,7 @@ void AccessibleImageBullet::UnSetState( const sal_Int64 nStateId ) if( mnStateSet & nStateId ) { mnStateSet &= ~nStateId; - FireEvent( AccessibleEventId::STATE_CHANGED, uno::Any(), uno::Any( nStateId ) ); + NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED, uno::Any(nStateId), uno::Any()); } } @@ -293,8 +288,8 @@ void AccessibleImageBullet::SetParagraphIndex( sal_Int32 nIndex ) if( nOldIndex != nIndex ) { // index and therefore description changed - FireEvent( AccessibleEventId::DESCRIPTION_CHANGED, uno::Any( getAccessibleDescription() ), aOldDesc ); - FireEvent( AccessibleEventId::NAME_CHANGED, uno::Any( getAccessibleName() ), aOldName ); + NotifyAccessibleEvent(AccessibleEventId::DESCRIPTION_CHANGED, aOldDesc, uno::Any(getAccessibleDescription())); + NotifyAccessibleEvent(AccessibleEventId::NAME_CHANGED, aOldName, uno::Any(getAccessibleName())); } } catch( const uno::Exception& ) {} // optional behaviour diff --git a/editeng/source/accessibility/AccessibleImageBullet.hxx b/editeng/source/accessibility/AccessibleImageBullet.hxx index cca3ea5ebf00..9f58b7ba6c8d 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.hxx +++ b/editeng/source/accessibility/AccessibleImageBullet.hxx @@ -119,9 +119,6 @@ public: */ sal_Int32 GetParagraphIndex() const { return mnParagraphIndex; } - /// Calls all Listener objects to tell them the change. Don't hold locks when calling this! - void FireEvent(const sal_Int16 nEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue = css::uno::Any()); - private: AccessibleImageBullet( const AccessibleImageBullet& ) = delete; AccessibleImageBullet& operator= ( const AccessibleImageBullet& ) = delete;
