accessibility/inc/extended/AccessibleGridControlBase.hxx | 14 ---- accessibility/inc/extended/AccessibleGridControlTableBase.hxx | 22 ------ accessibility/source/extended/AccessibleGridControlBase.cxx | 8 -- accessibility/source/extended/AccessibleGridControlTableBase.cxx | 35 ---------- 4 files changed, 6 insertions(+), 73 deletions(-)
New commits: commit d751cbefb4e1380cde2ac3d9d372cda8e88e33c9 Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Sat Dec 7 01:41:28 2024 +0500 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Sat Dec 7 14:35:07 2024 +0100 Simplify AccessibleGridControlTableBase Change-Id: If4b8379f676a1a412eed6d79bf6b5382d3c726b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178030 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx index 39de903ec855..a7032553c82d 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx @@ -27,7 +27,7 @@ namespace accessibility { -typedef ::cppu::ImplHelper1 < css::accessibility::XAccessibleTable > +typedef cppu::ImplInheritanceHelper<GridControlAccessibleElement, css::accessibility::XAccessibleTable> AccessibleGridControlTableImplHelper; /** The Grid Control accessible table objects inherit from this base class. It @@ -35,7 +35,6 @@ typedef ::cppu::ImplHelper1 < css::accessibility::XAccessibleTable > Grid COntrol table objects are: the data table, the column header bar and the row header bar. */ class AccessibleGridControlTableBase : - public GridControlAccessibleElement, public AccessibleGridControlTableImplHelper { public: @@ -115,25 +114,6 @@ public: - getAccessibleCellAt, - isAccessibleSelected. */ - // XInterface - - /** Queries for a new interface. */ - css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; - - /** Acquires the object (calls acquire() on base class). */ - virtual void SAL_CALL acquire() noexcept override; - - /** Releases the object (calls release() on base class). */ - virtual void SAL_CALL release() noexcept override; - - // XTypeProvider - - /** @return a sequence of possible types (received from base classes). */ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; - - /** @return a unique implementation ID. */ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; - protected: // internal helper methods diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index 08fae3d0c3f3..cec5382fcf28 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -41,7 +41,7 @@ AccessibleGridControlTableBase::AccessibleGridControlTableBase( const Reference< XAccessible >& rxParent, IAccessibleTable& rTable, AccessibleTableControlObjType eObjType ) : - GridControlAccessibleElement( rxParent, rTable, eObjType ) + AccessibleGridControlTableImplHelper( rxParent, rTable, eObjType ) { } @@ -158,39 +158,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumn( sal_Int6 return implGetColumn( nChildIndex ); } -// XInterface ----------------------------------------------------------------- - -Any SAL_CALL AccessibleGridControlTableBase::queryInterface( const uno::Type& rType ) -{ - Any aAny( GridControlAccessibleElement::queryInterface( rType ) ); - return aAny.hasValue() ? - aAny : AccessibleGridControlTableImplHelper::queryInterface( rType ); -} - -void SAL_CALL AccessibleGridControlTableBase::acquire() noexcept -{ - GridControlAccessibleElement::acquire(); -} - -void SAL_CALL AccessibleGridControlTableBase::release() noexcept -{ - GridControlAccessibleElement::release(); -} - -// XTypeProvider -------------------------------------------------------------- - -Sequence< uno::Type > SAL_CALL AccessibleGridControlTableBase::getTypes() -{ - return ::comphelper::concatSequences( - GridControlAccessibleElement::getTypes(), - AccessibleGridControlTableImplHelper::getTypes() ); -} - -Sequence< sal_Int8 > SAL_CALL AccessibleGridControlTableBase::getImplementationId() -{ - return css::uno::Sequence<sal_Int8>(); -} - // internal helper methods ---------------------------------------------------- sal_Int32 AccessibleGridControlTableBase::implGetRow( sal_Int64 nChildIndex ) commit bbf4c5ca179697f302893d3c193b28cbc241e1c4 Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Sat Dec 7 02:13:05 2024 +0500 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Sat Dec 7 14:35:03 2024 +0100 Simplify GridControlAccessibleElement Change-Id: I1509ca337b5864805132a87dab2627df721091db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178029 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx index 186edc83797c..4e30bddda541 100644 --- a/accessibility/inc/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx @@ -252,12 +252,10 @@ private: // a version of AccessibleGridControlBase which implements not only the XAccessibleContext, // but also the XAccessible -typedef ::cppu::ImplHelper1 < css::accessibility::XAccessible - > GridControlAccessibleElement_Base; +typedef cppu::ImplInheritanceHelper <AccessibleGridControlBase, css::accessibility::XAccessible> + GridControlAccessibleElement_Base; -class GridControlAccessibleElement - :public AccessibleGridControlBase - ,public GridControlAccessibleElement_Base +class GridControlAccessibleElement : public GridControlAccessibleElement_Base { protected: /** Constructor sets specified name and description. @@ -271,12 +269,6 @@ protected: ::vcl::table::IAccessibleTable& rTable, ::vcl::table::AccessibleTableControlObjType eObjType ); -public: - // XInterface - DECLARE_XINTERFACE( ) - // XTypeProvider - DECLARE_XTYPEPROVIDER( ) - protected: virtual ~GridControlAccessibleElement() override; diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index aff3dc66a247..3f8609d020f1 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -430,16 +430,10 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground( ) GridControlAccessibleElement::GridControlAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::table::IAccessibleTable& rTable, ::vcl::table::AccessibleTableControlObjType eObjType ) - :AccessibleGridControlBase( rxParent, rTable, eObjType ) + : GridControlAccessibleElement_Base(rxParent, rTable, eObjType) { } -// XInterface -IMPLEMENT_FORWARD_XINTERFACE2( GridControlAccessibleElement, AccessibleGridControlBase, GridControlAccessibleElement_Base) - -// XTypeProvider -IMPLEMENT_FORWARD_XTYPEPROVIDER2( GridControlAccessibleElement, AccessibleGridControlBase, GridControlAccessibleElement_Base ) - // css::accessibility::XAccessible css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL GridControlAccessibleElement::getAccessibleContext()