basctl/source/accessibility/accessibledialogcontrolshape.cxx | 4 basctl/source/accessibility/accessibledialogwindow.cxx | 4 basctl/source/inc/accessibledialogcontrolshape.hxx | 4 basctl/source/inc/accessibledialogwindow.hxx | 4 bin/find-can-be-private-symbols.functions.results | 7 bin/find-mergedlib-can-be-private-symbols.functions.results | 11 chart2/source/controller/accessibility/AccessibleBase.cxx | 2 chart2/source/controller/accessibility/AccessibleChartShape.hxx | 2 chart2/source/controller/inc/AccessibleBase.hxx | 4 chart2/source/controller/inc/AccessibleChartView.hxx | 2 comphelper/source/misc/accessiblecomponenthelper.cxx | 115 ++-------- compilerplugins/clang/mergeclasses.results | 1 dbaccess/source/ui/inc/ConnectionLineAccess.hxx | 2 editeng/source/accessibility/AccessibleContextBase.cxx | 2 include/comphelper/accessiblecomponenthelper.hxx | 107 ++------- include/comphelper/accessiblecontexthelper.hxx | 16 - include/comphelper/accessibletexthelper.hxx | 2 include/editeng/AccessibleContextBase.hxx | 2 include/svx/AccessibleShape.hxx | 2 include/vcl/accessibility/vclxaccessiblecomponent.hxx | 2 sd/source/console/AccessibleObject.hxx | 2 sd/source/ui/accessibility/AccessiblePageShape.cxx | 2 sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 2 sd/source/ui/inc/AccessiblePageShape.hxx | 2 sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 2 sd/source/ui/inc/AccessibleSlideSorterView.hxx | 2 sfx2/source/control/thumbnailviewacc.hxx | 2 sfx2/source/control/thumbnailviewitemacc.hxx | 2 svtools/source/control/accessibletabbar.cxx | 2 svtools/source/control/accessibletabbar.hxx | 2 svtools/source/control/accessibletabbarbase.cxx | 2 svtools/source/control/accessibletabbarbase.hxx | 2 svtools/source/control/accessibletabbarpage.cxx | 2 svtools/source/control/accessibletabbarpage.hxx | 2 svtools/source/control/accessibletabbarpagelist.cxx | 2 svtools/source/control/accessibletabbarpagelist.hxx | 2 svtools/source/control/valueimp.hxx | 4 svx/source/inc/AccessibleFrameSelector.hxx | 4 svx/source/inc/charmapacc.hxx | 8 svx/source/inc/svxpixelctlaccessiblecontext.hxx | 4 svx/source/inc/svxrectctaccessiblecontext.hxx | 4 svx/source/table/accessiblecell.hxx | 2 toolkit/inc/controls/accessiblecontrolcontext.hxx | 4 vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx | 2 vcl/inc/accessibility/accessiblemenubasecomponent.hxx | 2 vcl/inc/accessibility/accessiblemenucomponent.hxx | 2 vcl/inc/accessibility/accessiblemenuitemcomponent.hxx | 2 vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx | 4 vcl/inc/accessibility/vclxaccessiblelistitem.hxx | 2 vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx | 2 vcl/inc/accessibility/vclxaccessibletabpage.hxx | 2 vcl/inc/accessibility/vclxaccessibletabpagewindow.hxx | 2 vcl/source/accessibility/accessiblemenubasecomponent.cxx | 2 vcl/source/accessibility/accessiblemenucomponent.cxx | 2 vcl/source/accessibility/accessiblemenuitemcomponent.cxx | 2 vcl/source/accessibility/vclxaccessiblecomponent.cxx | 2 vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx | 2 vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx | 2 vcl/source/accessibility/vclxaccessibletabpage.cxx | 2 vcl/source/accessibility/vclxaccessibletabpagewindow.cxx | 2 60 files changed, 131 insertions(+), 262 deletions(-)
New commits: commit 0cb6632eceef31846a5c4af2d599e97da523bdd6 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Mar 31 14:21:46 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Apr 1 11:20:23 2025 +0200 a11y: Merge OAccessibleComponentHelper and OCommonAccessibleComponent Merge the two classes, now that OAccessibleComponentHelper is the only OCommonAccessibleComponent subclass after Change-Id: I05547b12806a6a90b166edbe196b4bc5a27344be Author: Michael Weghorn <[email protected]> Date: Mon Mar 31 13:49:20 2025 +0200 a11y: Merge OAccessible{,Extended}ComponentHelper, add default impl Change-Id: Ic7a36c40066f307f8df29dc4dd45ed3ee966bcb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183552 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 4d740b53e18d..576e83201988 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -222,7 +222,7 @@ void AccessibleDialogControlShape::FillAccessibleStateSet( sal_Int64& rStateSet rStateSet |= AccessibleStateType::RESIZABLE; } -// OCommonAccessibleComponent +// OAccessibleComponentHelper awt::Rectangle AccessibleDialogControlShape::implGetBounds() { return GetBounds(); diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 4fe04c85f38a..cac079c139e5 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -401,7 +401,7 @@ void AccessibleDialogWindow::FillAccessibleStateSet( sal_Int64& rStateSet ) } -// OCommonAccessibleComponent +// OAccessibleComponentHelper awt::Rectangle AccessibleDialogWindow::implGetBounds() diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index de097240bc32..085b8c013ec6 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -67,7 +67,7 @@ private: void FillAccessibleStateSet( sal_Int64& rStateSet ); - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; // XComponent diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index 1c5fcd8c0807..ae68ffdf043a 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -84,7 +84,7 @@ private: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); void FillAccessibleStateSet( sal_Int64& rStateSet ); - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds( ) override; // XComponent diff --git a/bin/find-can-be-private-symbols.functions.results b/bin/find-can-be-private-symbols.functions.results index 239abaa37b5d..9102813cc553 100644 --- a/bin/find-can-be-private-symbols.functions.results +++ b/bin/find-can-be-private-symbols.functions.results @@ -11211,13 +11211,6 @@ comphelper::OAccessibleWrapper::getContextNoCreate() const comphelper::OAnyEnumeration::hasMoreElements() comphelper::OAnyEnumeration::nextElement() comphelper::OAnyEnumeration::~OAnyEnumeration() -comphelper::OCommonAccessibleComponent::OCommonAccessibleComponent() -comphelper::OCommonAccessibleComponent::containsPoint(com::sun::star::awt::Point const&) -comphelper::OCommonAccessibleComponent::getBounds() -comphelper::OCommonAccessibleComponent::getLocation() -comphelper::OCommonAccessibleComponent::getLocationOnScreen() -comphelper::OCommonAccessibleComponent::getSize() -comphelper::OCommonAccessibleComponent::implGetParentContext() comphelper::OCommonAccessibleText::implGetBreakIterator() comphelper::OCommonAccessibleText::implGetCharacterClassification() comphelper::OCommonAccessibleText::implGetGlyphBoundary(rtl::OUString const&, com::sun::star::i18n::Boundary&, int) diff --git a/bin/find-mergedlib-can-be-private-symbols.functions.results b/bin/find-mergedlib-can-be-private-symbols.functions.results index b6eda7e4d321..3e4e10e20882 100644 --- a/bin/find-mergedlib-can-be-private-symbols.functions.results +++ b/bin/find-mergedlib-can-be-private-symbols.functions.results @@ -11536,15 +11536,6 @@ comphelper::OAccessibleKeyBindingHelper::OAccessibleKeyBindingHelper(comphelper: comphelper::OAccessibleKeyBindingHelper::getAccessibleKeyBinding(int) comphelper::OAccessibleKeyBindingHelper::getAccessibleKeyBindingCount() comphelper::OAccessibleKeyBindingHelper::~OAccessibleKeyBindingHelper() -comphelper::OCommonAccessibleComponent::OCommonAccessibleComponent() -comphelper::OCommonAccessibleComponent::containsPoint(com::sun::star::awt::Point const&) -comphelper::OCommonAccessibleComponent::getAccessibleCreator() const -comphelper::OCommonAccessibleComponent::getBounds() -comphelper::OCommonAccessibleComponent::getLocation() -comphelper::OCommonAccessibleComponent::getLocationOnScreen() -comphelper::OCommonAccessibleComponent::getSize() -comphelper::OCommonAccessibleComponent::implGetParentContext() -comphelper::OCommonAccessibleComponent::lateInit(com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible> const&) comphelper::OCommonAccessibleText::implGetBreakIterator() comphelper::OCommonAccessibleText::implGetCharacterClassification() comphelper::OCommonAccessibleText::implGetGlyphBoundary(rtl::OUString const&, com::sun::star::i18n::Boundary&, int) diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx index ae0e3ebe276a..feb1777e7407 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx @@ -48,7 +48,7 @@ public: virtual OUString SAL_CALL getAccessibleDescription() override; virtual OUString SAL_CALL getAccessibleName() override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; // ________ XAccessibleComponent ________ diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index d6d28dcfbe08..fe3b0cbda708 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -214,7 +214,7 @@ protected: // virtual OUString SAL_CALL getAccessibleDescription() // throw (css::uno::RuntimeException); - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; // ________ XAccessibleComponent ________ diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index d4c966205021..1de67d0654e3 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -85,7 +85,7 @@ public: virtual sal_Int16 SAL_CALL getAccessibleRole() override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; protected: diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx index 836d3fa12f25..91959d8eab74 100644 --- a/comphelper/source/misc/accessiblecomponenthelper.cxx +++ b/comphelper/source/misc/accessiblecomponenthelper.cxx @@ -34,14 +34,14 @@ namespace comphelper using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; - OCommonAccessibleComponent::OCommonAccessibleComponent( ) - :OCommonAccessibleComponent_Base( GetMutex() ) + OAccessibleComponentHelper::OAccessibleComponentHelper() + :WeakComponentImplHelper( GetMutex() ) ,m_nClientId( 0 ) { } - OCommonAccessibleComponent::~OCommonAccessibleComponent( ) + OAccessibleComponentHelper::~OAccessibleComponentHelper() { // this ensures that the lock, which may be already destroyed as part of the derivee, // is not used anymore @@ -50,7 +50,7 @@ namespace comphelper } - void SAL_CALL OCommonAccessibleComponent::disposing() + void SAL_CALL OAccessibleComponentHelper::disposing() { // rhbz#1001768: de facto this class is locked by SolarMutex; // do not lock m_Mutex because it may cause deadlock @@ -64,7 +64,7 @@ namespace comphelper } - void SAL_CALL OCommonAccessibleComponent::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) + void SAL_CALL OAccessibleComponentHelper::addAccessibleEventListener(const Reference< XAccessibleEventListener >& _rxListener) { osl::Guard<SolarMutex> aGuard(SolarMutex::get()); // don't use the OContextEntryGuard - it will throw an exception if we're not alive @@ -87,7 +87,7 @@ namespace comphelper } - void SAL_CALL OCommonAccessibleComponent::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) + void SAL_CALL OAccessibleComponentHelper::removeAccessibleEventListener(const Reference< XAccessibleEventListener >& _rxListener) { osl::Guard<SolarMutex> aGuard(SolarMutex::get()); // don't use the OContextEntryGuard - it will throw an exception if we're not alive @@ -112,7 +112,7 @@ namespace comphelper } - void OCommonAccessibleComponent::NotifyAccessibleEvent( const sal_Int16 _nEventId, + void OAccessibleComponentHelper::NotifyAccessibleEvent( const sal_Int16 _nEventId, const Any& _rOldValue, const Any& _rNewValue, sal_Int32 nIndexHint ) { if ( !m_nClientId ) @@ -127,41 +127,41 @@ namespace comphelper AccessibleEventNotifier::addEvent( m_nClientId, aEvent ); } - bool OCommonAccessibleComponent::hasAccessibleListeners() const + bool OAccessibleComponentHelper::hasAccessibleListeners() const { return m_nClientId != 0; } - bool OCommonAccessibleComponent::isAlive() const + bool OAccessibleComponentHelper::isAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } - void OCommonAccessibleComponent::ensureAlive() const + void OAccessibleComponentHelper::ensureAlive() const { if( !isAlive() ) throw DisposedException(); } - void OCommonAccessibleComponent::ensureDisposed( ) + void OAccessibleComponentHelper::ensureDisposed( ) { if ( !rBHelper.bDisposed ) { - OSL_ENSURE( 0 == m_refCount, "OCommonAccessibleComponent::ensureDisposed: this method _has_ to be called from without your dtor only!" ); + OSL_ENSURE( 0 == m_refCount, "OAccessibleComponentHelper::ensureDisposed: this method _has_ to be called from without your dtor only!" ); acquire(); dispose(); } } - OUString SAL_CALL OCommonAccessibleComponent::getAccessibleId( ) + OUString SAL_CALL OAccessibleComponentHelper::getAccessibleId() { return OUString(); } - sal_Int64 SAL_CALL OCommonAccessibleComponent::getAccessibleIndexInParent( ) + sal_Int64 SAL_CALL OAccessibleComponentHelper::getAccessibleIndexInParent() { OExternalLockGuard aGuard( this ); @@ -182,14 +182,14 @@ namespace comphelper } catch( const Exception& ) { - OSL_FAIL( "OCommonAccessibleComponent::getAccessibleIndexInParent: caught an exception!" ); + OSL_FAIL("OAccessibleComponentHelper::getAccessibleIndexInParent: caught an exception!"); } return -1; } - Locale SAL_CALL OCommonAccessibleComponent::getLocale( ) + Locale SAL_CALL OAccessibleComponentHelper::getLocale() { // simply ask the parent Reference< XAccessible > xParent = getAccessibleParent(); @@ -204,7 +204,7 @@ namespace comphelper } - Reference< XAccessibleContext > OCommonAccessibleComponent::implGetParentContext() + Reference< XAccessibleContext > OAccessibleComponentHelper::implGetParentContext() { Reference< XAccessible > xParent = getAccessibleParent(); Reference< XAccessibleContext > xParentContext; @@ -214,7 +214,7 @@ namespace comphelper } - bool OCommonAccessibleComponent::containsPoint( const awt::Point& _rPoint ) + sal_Bool SAL_CALL OAccessibleComponentHelper::containsPoint(const awt::Point& _rPoint) { OExternalLockGuard aGuard( this ); awt::Rectangle aBounds( implGetBounds() ); @@ -225,7 +225,7 @@ namespace comphelper } - awt::Point OCommonAccessibleComponent::getLocation( ) + awt::Point SAL_CALL OAccessibleComponentHelper::getLocation() { OExternalLockGuard aGuard( this ); awt::Rectangle aBounds( implGetBounds() ); @@ -233,14 +233,14 @@ namespace comphelper } - awt::Point OCommonAccessibleComponent::getLocationOnScreen( ) + awt::Point SAL_CALL OAccessibleComponentHelper::getLocationOnScreen() { OExternalLockGuard aGuard( this ); awt::Point aScreenLoc( 0, 0 ); Reference< XAccessibleComponent > xParentComponent( implGetParentContext(), UNO_QUERY ); - OSL_ENSURE( xParentComponent.is(), "OCommonAccessibleComponent::getLocationOnScreen: no parent component!" ); + OSL_ENSURE(xParentComponent.is(), "OAccessibleComponentHelper::getLocationOnScreen: no parent component!"); if ( xParentComponent.is() ) { awt::Point aParentScreenLoc( xParentComponent->getLocationOnScreen() ); @@ -253,7 +253,7 @@ namespace comphelper } - awt::Size OCommonAccessibleComponent::getSize( ) + awt::Size SAL_CALL OAccessibleComponentHelper::getSize() { OExternalLockGuard aGuard( this ); awt::Rectangle aBounds( implGetBounds() ); @@ -261,46 +261,12 @@ namespace comphelper } - awt::Rectangle OCommonAccessibleComponent::getBounds( ) + awt::Rectangle SAL_CALL OAccessibleComponentHelper::getBounds() { OExternalLockGuard aGuard( this ); return implGetBounds(); } - OAccessibleComponentHelper::OAccessibleComponentHelper( ) - { - } - - - sal_Bool SAL_CALL OAccessibleComponentHelper::containsPoint( const awt::Point& _rPoint ) - { - return OCommonAccessibleComponent::containsPoint( _rPoint ); - } - - - awt::Point SAL_CALL OAccessibleComponentHelper::getLocation( ) - { - return OCommonAccessibleComponent::getLocation( ); - } - - - awt::Point SAL_CALL OAccessibleComponentHelper::getLocationOnScreen( ) - { - return OCommonAccessibleComponent::getLocationOnScreen( ); - } - - - awt::Size SAL_CALL OAccessibleComponentHelper::getSize( ) - { - return OCommonAccessibleComponent::getSize( ); - } - - - awt::Rectangle SAL_CALL OAccessibleComponentHelper::getBounds( ) - { - return OCommonAccessibleComponent::getBounds( ); - } - OUString SAL_CALL OAccessibleComponentHelper::getTitledBorderText() { OExternalLockGuard aGuard(this); diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index faacf8fd538b..b8ca9446c8a4 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -458,7 +458,6 @@ maybe merge comphelper::OAccessibleSelectionHelper with cppu::ImplInheritanceHel maybe merge comphelper::OAccessibleTextHelper with cppu::ImplInheritanceHelper, in modules comphelper and cppuhelper merge comphelper::OAccessibleWrapper_Base with comphelper::OAccessibleWrapper merge comphelper::OAnyEnumeration_BASE with comphelper::OAnyEnumeration -maybe merge comphelper::OCommonAccessibleComponent with cppu::ImplInheritanceHelper, in modules comphelper and cppuhelper merge comphelper::OComponentProxyAggregation with comphelper::OAccessibleWrapper merge comphelper::OContainerListenerAdapter_Base with comphelper::OContainerListenerAdapter maybe merge comphelper::OPropertyChangeListener2 with FmFieldWin, in modules comphelper and svx diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index dd7485b4652a..baf02acfbf44 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -61,7 +61,7 @@ namespace dbaui virtual OUString SAL_CALL getAccessibleDescription( ) override; virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; // XAccessibleComponent diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx index 626595e9d6ed..38ffce787a96 100644 --- a/include/comphelper/accessiblecomponenthelper.hxx +++ b/include/comphelper/accessiblecomponenthelper.hxx @@ -34,28 +34,31 @@ namespace comphelper { + //= OAccessibleComponentHelper - //= OCommonAccessibleComponent - - typedef ::cppu::WeakComponentImplHelper < css::accessibility::XAccessibleContext2, - css::accessibility::XAccessibleEventBroadcaster - > OCommonAccessibleComponent_Base; - - /** base class encapsulating common functionality for the helper classes implementing - the XAccessibleComponent respectively XAccessibleExtendendComponent + /** a helper class for implementing an AccessibleContext which at the same time + supports an XAccessibleExtendedComponent interface. */ - class COMPHELPER_DLLPUBLIC OCommonAccessibleComponent - :public ::cppu::BaseMutex - ,public OCommonAccessibleComponent_Base + class COMPHELPER_DLLPUBLIC OAccessibleComponentHelper + : public cppu::BaseMutex, + public cppu::WeakComponentImplHelper<css::accessibility::XAccessibleContext2, + css::accessibility::XAccessibleEventBroadcaster, + css::accessibility::XAccessibleExtendedComponent> { friend class OContextEntryGuard; private: AccessibleEventNotifier::TClientId m_nClientId; protected: - virtual ~OCommonAccessibleComponent( ) override; + virtual ~OAccessibleComponentHelper( ) override; - OCommonAccessibleComponent( ); + OAccessibleComponentHelper( ); + + private: + OAccessibleComponentHelper(OAccessibleComponentHelper const &) = delete; + OAccessibleComponentHelper(OAccessibleComponentHelper &&) = delete; + void operator =(OAccessibleComponentHelper const &) = delete; + void operator =(OAccessibleComponentHelper &&) = delete; public: // XAccessibleEventBroadcaster @@ -79,7 +82,7 @@ namespace comphelper /** default implementation for retrieving the index of this object within the parent <p>This basic implementation here returns the index <code>i</code> of the child for which <code><parent>.getAccessibleChild(i).getAccessibleContext()</code> returns - a reference to this OCommonAccessibleComponent object.</p> + a reference to this OAccessibleComponentHelper object.</p> */ virtual sal_Int64 SAL_CALL getAccessibleIndexInParent( ) override; /** default implementation for retrieving the locale @@ -140,48 +143,16 @@ namespace comphelper /// @throws css::uno::RuntimeException virtual css::awt::Rectangle implGetBounds( ) = 0; - protected: - /** non-virtual versions of the methods which can be implemented using <method>implGetBounds</method> - note: getLocationOnScreen relies on a valid parent (XAccessibleContext::getParent()->getAccessibleContext()), - which itself implements XAccessibleComponent - - @throws css::uno::RuntimeException - */ - bool containsPoint( const css::awt::Point& aPoint ); - /// @throws css::uno::RuntimeException - css::awt::Point getLocation( ); - /// @throws css::uno::RuntimeException - css::awt::Point getLocationOnScreen( ); - /// @throws css::uno::RuntimeException - css::awt::Size getSize( ); - /// @throws css::uno::RuntimeException - css::awt::Rectangle getBounds( ); - }; - - - //= OAccessibleComponentHelper - - - /** a helper class for implementing an AccessibleContext which at the same time - supports an XAccessibleExtendedComponent interface. - */ - class COMPHELPER_DLLPUBLIC OAccessibleComponentHelper - :public cppu::ImplInheritanceHelper< - OCommonAccessibleComponent, css::accessibility::XAccessibleExtendedComponent> - { - private: - OAccessibleComponentHelper(OAccessibleComponentHelper const &) = delete; - OAccessibleComponentHelper(OAccessibleComponentHelper &&) = delete; - void operator =(OAccessibleComponentHelper const &) = delete; - void operator =(OAccessibleComponentHelper &&) = delete; - - protected: - OAccessibleComponentHelper(); public: - // XAccessibleComponent - default implementations + // XAccessibleComponent - default implementations which can be implemented using <method>implGetBounds</method> virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override final; virtual css::awt::Point SAL_CALL getLocation( ) override final; + /* note: getLocationOnScreen relies on a valid parent (XAccessibleContext::getParent()->getAccessibleContext()), + which itself implements XAccessibleComponent + + @throws css::uno::RuntimeException + */ virtual css::awt::Point SAL_CALL getLocationOnScreen( ) override; virtual css::awt::Size SAL_CALL getSize( ) override final; virtual css::awt::Rectangle SAL_CALL getBounds( ) override final; diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index 229a4e09615a..3951eb14325f 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -29,11 +29,11 @@ namespace comphelper //= OContextEntryGuard - /** helper class for guarding the entry into OCommonAccessibleComponent methods. + /** helper class for guarding the entry into OAccessibleComponentHelper methods. <p>The class has two responsibilities: - <ul><li>it locks the mutex of an OCommonAccessibleComponent instance, as long as the guard lives</li> - <li>it checks if a given OCommonAccessibleComponent instance is alive, else an exception is thrown + <ul><li>it locks the mutex of an OAccessibleComponentHelper instance, as long as the guard lives</li> + <li>it checks if a given OAccessibleComponentHelper instance is alive, else an exception is thrown our of the constructor of the guard</li> </ul> <br/> @@ -53,11 +53,11 @@ namespace comphelper the context which shall be guarded @precond <arg>_pContext</arg> != NULL */ - inline OContextEntryGuard( OCommonAccessibleComponent* _pContext ); + inline OContextEntryGuard(OAccessibleComponentHelper* _pContext); }; - inline OContextEntryGuard::OContextEntryGuard( OCommonAccessibleComponent* _pContext ) + inline OContextEntryGuard::OContextEntryGuard(OAccessibleComponentHelper* _pContext) : ::osl::ClearableMutexGuard( _pContext->GetMutex() ) { _pContext->ensureAlive(); @@ -71,16 +71,16 @@ namespace comphelper ,public OContextEntryGuard { public: - inline OExternalLockGuard( OCommonAccessibleComponent* _pContext ); + inline OExternalLockGuard(OAccessibleComponentHelper* _pContext); }; - inline OExternalLockGuard::OExternalLockGuard( OCommonAccessibleComponent* _pContext ) + inline OExternalLockGuard::OExternalLockGuard(OAccessibleComponentHelper* _pContext) :osl::Guard<SolarMutex>( SolarMutex::get() ) ,OContextEntryGuard( _pContext ) { // Only lock the external mutex, - // release the ::osl::Mutex of the OCommonAccessibleComponent instance. + // release the ::osl::Mutex of the OAccessibleComponentHelper instance. // If you call into another UNO object with locked ::osl::Mutex, // this may lead to dead locks. clear(); diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index 641214ba600e..80f0830eb912 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -226,7 +226,7 @@ public: virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; //===== XAccessibleComponent ============================================ diff --git a/sd/source/console/AccessibleObject.hxx b/sd/source/console/AccessibleObject.hxx index 5632501d000a..40f86846f28e 100644 --- a/sd/source/console/AccessibleObject.hxx +++ b/sd/source/console/AccessibleObject.hxx @@ -129,7 +129,7 @@ protected: css::uno::Reference<css::accessibility::XAccessible> mxParentAccessible; ::std::vector<rtl::Reference<AccessibleObject> > maChildren; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; virtual awt::Point GetRelativeLocation(); diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 9897e1d5eac2..7d8e506bd53e 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -71,7 +71,7 @@ uno::Reference<XAccessible> SAL_CALL static_cast<uno::XWeak*>(this)); } -// OCommonAccessibleComponent +// OAccessibleComponentHelper awt::Rectangle AccessiblePageShape::implGetBounds() { diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 7b741be2d221..445fa9cf1d93 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -146,7 +146,7 @@ public: virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int64 nIndex) override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; //===== XAccessibleComponent ============================================ diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index 49964167b8ff..13de2fa85ce2 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -73,7 +73,7 @@ public: virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int64 nIndex) override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; //===== XAccessibleComponent ============================================ diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index b8d33bb0a6c5..b34f49f33657 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -103,7 +103,7 @@ public: virtual css::lang::Locale SAL_CALL getLocale() override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; //===== XAccessibleComponent ================================================ diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index c25e8782a75e..f6126389dbdc 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -109,7 +109,7 @@ public: virtual css::lang::Locale SAL_CALL getLocale() override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; //===== XAccessibleComponent ================================================ diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index 944e05d9a27e..5b85249d6489 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -71,7 +71,7 @@ public: virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override; virtual css::lang::Locale SAL_CALL getLocale( ) override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; // XAccessibleComponent diff --git a/sfx2/source/control/thumbnailviewitemacc.hxx b/sfx2/source/control/thumbnailviewitemacc.hxx index 98f1e303eac4..fe87cee1ea2d 100644 --- a/sfx2/source/control/thumbnailviewitemacc.hxx +++ b/sfx2/source/control/thumbnailviewitemacc.hxx @@ -55,7 +55,7 @@ public: virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override; virtual css::lang::Locale SAL_CALL getLocale( ) override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; // XAccessibleComponent diff --git a/svtools/source/control/accessibletabbar.cxx b/svtools/source/control/accessibletabbar.cxx index cad39ef7e4a7..8c9cec78f532 100644 --- a/svtools/source/control/accessibletabbar.cxx +++ b/svtools/source/control/accessibletabbar.cxx @@ -138,7 +138,7 @@ namespace accessibility } - // OCommonAccessibleComponent + // OAccessibleComponentHelper awt::Rectangle AccessibleTabBar::implGetBounds() diff --git a/svtools/source/control/accessibletabbar.hxx b/svtools/source/control/accessibletabbar.hxx index 5b6f951fa14a..3d6844f9f711 100644 --- a/svtools/source/control/accessibletabbar.hxx +++ b/svtools/source/control/accessibletabbar.hxx @@ -43,7 +43,7 @@ namespace accessibility virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; void FillAccessibleStateSet( sal_Int64& rStateSet ); - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds( ) override; // XComponent diff --git a/svtools/source/control/accessibletabbarpage.cxx b/svtools/source/control/accessibletabbarpage.cxx index 5a15d33b6309..9a08c3d58c52 100644 --- a/svtools/source/control/accessibletabbarpage.cxx +++ b/svtools/source/control/accessibletabbarpage.cxx @@ -156,7 +156,7 @@ namespace accessibility } - // OCommonAccessibleComponent + // OAccessibleComponentHelper awt::Rectangle AccessibleTabBarPage::implGetBounds() diff --git a/svtools/source/control/accessibletabbarpage.hxx b/svtools/source/control/accessibletabbarpage.hxx index 6a7198dff737..cd770913b1f5 100644 --- a/svtools/source/control/accessibletabbarpage.hxx +++ b/svtools/source/control/accessibletabbarpage.hxx @@ -56,7 +56,7 @@ namespace accessibility void FillAccessibleStateSet( sal_Int64& rStateSet ); - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds( ) override; // XComponent diff --git a/svtools/source/control/accessibletabbarpagelist.cxx b/svtools/source/control/accessibletabbarpagelist.cxx index 6a618f573bd1..583ed79b45f8 100644 --- a/svtools/source/control/accessibletabbarpagelist.cxx +++ b/svtools/source/control/accessibletabbarpagelist.cxx @@ -300,7 +300,7 @@ namespace accessibility } - // OCommonAccessibleComponent + // OAccessibleComponentHelper awt::Rectangle AccessibleTabBarPageList::implGetBounds() diff --git a/svtools/source/control/accessibletabbarpagelist.hxx b/svtools/source/control/accessibletabbarpagelist.hxx index 88bb87b0a96a..47190eb88a9d 100644 --- a/svtools/source/control/accessibletabbarpagelist.hxx +++ b/svtools/source/control/accessibletabbarpagelist.hxx @@ -55,7 +55,7 @@ namespace accessibility virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; void FillAccessibleStateSet( sal_Int64& rStateSet ); - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds( ) override; // XComponent diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 4b8490d66bff..9540cf11e22b 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -105,7 +105,7 @@ public: virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override; virtual css::lang::Locale SAL_CALL getLocale( ) override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; // XAccessibleComponent @@ -194,7 +194,7 @@ public: virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override; virtual css::lang::Locale SAL_CALL getLocale( ) override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; // XAccessibleComponent diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index 37ed1aa06103..9ddd1fb8b61e 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -64,7 +64,7 @@ public: void Invalidate(); private: - // OCommonAccessibleComponent + // OAccessibleComponentHelper /// implements the calculation of the bounding rectangle virtual css::awt::Rectangle implGetBounds( ) override; @@ -111,7 +111,7 @@ public: void Invalidate(); private: - // OCommonAccessibleComponent + // OAccessibleComponentHelper /// implements the calculation of the bounding rectangle virtual css::awt::Rectangle implGetBounds( ) override; diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index 995aa97ae866..d39a82deeb81 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -76,7 +76,7 @@ namespace svx virtual void SAL_CALL grabFocus( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; - //OCommonAccessibleComponent + //OAccessibleComponentHelper // XAccessibleContext - still waiting to be overwritten virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override; @@ -136,7 +136,7 @@ namespace svx virtual void implSelect( sal_Int64 nAccessibleChildIndex, bool bSelect ) override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper /// implements the calculation of the bounding rectangle - still waiting to be overwritten virtual css::awt::Rectangle implGetBounds( ) override; }; @@ -156,7 +156,7 @@ namespace svx virtual ~SvxShowCharSetItemAcc() override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper /// implements the calculation of the bounding rectangle - still waiting to be overwritten virtual css::awt::Rectangle implGetBounds( ) override; public: @@ -169,7 +169,7 @@ namespace svx virtual void SAL_CALL grabFocus( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; - //OCommonAccessibleComponent + //OAccessibleComponentHelper // XAccessibleContext - still waiting to be overwritten virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override; diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index ae79b36f7b1d..b07933aef47b 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -81,7 +81,7 @@ private: virtual void SAL_CALL disposing() override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper /// implements the calculation of the bounding rectangle virtual css::awt::Rectangle implGetBounds( ) override; @@ -132,7 +132,7 @@ private: // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) virtual void implSelect(sal_Int64 nAccessibleChildIndex, bool bSelect) override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; virtual void SAL_CALL disposing() override; diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index f44338ade754..f24ec69276f1 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -91,7 +91,7 @@ private: // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) virtual void implSelect(sal_Int64 nAccessibleChildIndex, bool bSelect) override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; virtual void SAL_CALL disposing() override; @@ -191,7 +191,7 @@ private: virtual void SAL_CALL disposing() override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper /// implements the calculation of the bounding rectangle virtual css::awt::Rectangle implGetBounds( ) override; diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index 86276917def3..210b9b76dce7 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -63,7 +63,7 @@ public: void UpdateChildren(); static OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ); - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; // XAccessibleComponent diff --git a/toolkit/inc/controls/accessiblecontrolcontext.hxx b/toolkit/inc/controls/accessiblecontrolcontext.hxx index 4ab60f8be207..025ce57ba102 100644 --- a/toolkit/inc/controls/accessiblecontrolcontext.hxx +++ b/toolkit/inc/controls/accessiblecontrolcontext.hxx @@ -73,7 +73,7 @@ namespace toolkit virtual sal_Int32 SAL_CALL getBackground( ) override; // XEventListener - using comphelper::OCommonAccessibleComponent::disposing; + using comphelper::OAccessibleComponentHelper::disposing; virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // retrieves the value of a string property from the model, if the property is present @@ -89,7 +89,7 @@ namespace toolkit OAccessibleControlContext(const css::uno::Reference<css::awt::XControl>& rxControl); virtual ~OAccessibleControlContext() override; - // OCommonAccessibleComponent overridables + // OAccessibleComponentHelper overridables virtual css::awt::Rectangle implGetBounds( ) override; css::uno::Reference< css::beans::XPropertySet > diff --git a/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx b/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx index c602effa597a..0b8024dfe751 100644 --- a/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx +++ b/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx @@ -70,7 +70,7 @@ class AccessibleIconChoiceCtrlEntry final : public AccessibleIconChoiceCtrlEntry */ virtual void SAL_CALL disposing() override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; // OCommonAccessibleText diff --git a/vcl/inc/accessibility/accessiblemenucomponent.hxx b/vcl/inc/accessibility/accessiblemenucomponent.hxx index 2954b52119e5..9ce531731bd9 100644 --- a/vcl/inc/accessibility/accessiblemenucomponent.hxx +++ b/vcl/inc/accessibility/accessiblemenucomponent.hxx @@ -36,7 +36,7 @@ protected: virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds( ) override; public: diff --git a/vcl/inc/accessibility/accessiblemenuitemcomponent.hxx b/vcl/inc/accessibility/accessiblemenuitemcomponent.hxx index 58b819f8ad66..2bd5405d1e91 100644 --- a/vcl/inc/accessibility/accessiblemenuitemcomponent.hxx +++ b/vcl/inc/accessibility/accessiblemenuitemcomponent.hxx @@ -50,7 +50,7 @@ protected: virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds( ) override; // XComponent diff --git a/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx b/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx index 01925ee6846c..25e5460d7972 100644 --- a/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx +++ b/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx @@ -45,7 +45,7 @@ private: void FillAccessibleStateSet( sal_Int64& rStateSet ); - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds( ) override; public: diff --git a/vcl/inc/accessibility/vclxaccessiblelistitem.hxx b/vcl/inc/accessibility/vclxaccessiblelistitem.hxx index 8f60b42d496d..4f632f663a13 100644 --- a/vcl/inc/accessibility/vclxaccessiblelistitem.hxx +++ b/vcl/inc/accessibility/vclxaccessiblelistitem.hxx @@ -51,7 +51,7 @@ private: virtual css::lang::Locale implGetLocale() override; virtual void implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) override; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds() override; OUString getTextRangeImpl(sal_Int32 nStartIndex, sal_Int32 nEndIndex); diff --git a/vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx b/vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx index 87bed611bf0a..4b8f3e57b24d 100644 --- a/vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx +++ b/vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx @@ -51,7 +51,7 @@ private: void FillAccessibleStateSet( sal_Int64& rStateSet ); - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds( ) override; // OCommonAccessibleText diff --git a/vcl/inc/accessibility/vclxaccessibletabpage.hxx b/vcl/inc/accessibility/vclxaccessibletabpage.hxx index fece8744721a..7ec48b3084bd 100644 --- a/vcl/inc/accessibility/vclxaccessibletabpage.hxx +++ b/vcl/inc/accessibility/vclxaccessibletabpage.hxx @@ -60,7 +60,7 @@ private: void FillAccessibleStateSet( sal_Int64& rStateSet ); - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds( ) override; // OCommonAccessibleText diff --git a/vcl/inc/accessibility/vclxaccessibletabpagewindow.hxx b/vcl/inc/accessibility/vclxaccessibletabpagewindow.hxx index 3d7aa600e526..29daa4121967 100644 --- a/vcl/inc/accessibility/vclxaccessibletabpagewindow.hxx +++ b/vcl/inc/accessibility/vclxaccessibletabpagewindow.hxx @@ -34,7 +34,7 @@ private: VclPtr<TabPage> m_pTabPage; sal_uInt16 m_nPageId; - // OCommonAccessibleComponent + // OAccessibleComponentHelper virtual css::awt::Rectangle implGetBounds( ) override; // XComponent diff --git a/vcl/source/accessibility/accessiblemenucomponent.cxx b/vcl/source/accessibility/accessiblemenucomponent.cxx index c8ca74a26292..fd70b8554190 100644 --- a/vcl/source/accessibility/accessiblemenucomponent.cxx +++ b/vcl/source/accessibility/accessiblemenucomponent.cxx @@ -82,7 +82,7 @@ void OAccessibleMenuComponent::FillAccessibleStateSet( sal_Int64& rStateSet ) } -// OCommonAccessibleComponent +// OAccessibleComponentHelper awt::Rectangle OAccessibleMenuComponent::implGetBounds() diff --git a/vcl/source/accessibility/accessiblemenuitemcomponent.cxx b/vcl/source/accessibility/accessiblemenuitemcomponent.cxx index a50415e9ab77..9723f37f87c3 100644 --- a/vcl/source/accessibility/accessiblemenuitemcomponent.cxx +++ b/vcl/source/accessibility/accessiblemenuitemcomponent.cxx @@ -229,7 +229,7 @@ void OAccessibleMenuItemComponent::FillAccessibleStateSet( sal_Int64& rStateSet } -// OCommonAccessibleComponent +// OAccessibleComponentHelper awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() diff --git a/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx b/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx index fea43144bac9..c0a7e346174d 100644 --- a/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx +++ b/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx @@ -68,7 +68,7 @@ void VCLXAccessibleHeaderBarItem::FillAccessibleStateSet( sal_Int64& rStateSet ) } } -// OCommonAccessibleComponent +// OAccessibleComponentHelper awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds() { awt::Rectangle aBounds; diff --git a/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx b/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx index 4b63f9765f18..e87e88273eca 100644 --- a/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx +++ b/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx @@ -140,7 +140,7 @@ void VCLXAccessibleStatusBarItem::FillAccessibleStateSet( sal_Int64& rStateSet ) } -// OCommonAccessibleComponent +// OAccessibleComponentHelper awt::Rectangle VCLXAccessibleStatusBarItem::implGetBounds() diff --git a/vcl/source/accessibility/vclxaccessibletabpage.cxx b/vcl/source/accessibility/vclxaccessibletabpage.cxx index 17618f931bb6..7b10582a7213 100644 --- a/vcl/source/accessibility/vclxaccessibletabpage.cxx +++ b/vcl/source/accessibility/vclxaccessibletabpage.cxx @@ -183,7 +183,7 @@ void VCLXAccessibleTabPage::FillAccessibleStateSet( sal_Int64& rStateSet ) } -// OCommonAccessibleComponent +// OAccessibleComponentHelper awt::Rectangle VCLXAccessibleTabPage::implGetBounds() diff --git a/vcl/source/accessibility/vclxaccessibletabpagewindow.cxx b/vcl/source/accessibility/vclxaccessibletabpagewindow.cxx index ddfeddeb90c4..3831f9a421d6 100644 --- a/vcl/source/accessibility/vclxaccessibletabpagewindow.cxx +++ b/vcl/source/accessibility/vclxaccessibletabpagewindow.cxx @@ -58,7 +58,7 @@ VCLXAccessibleTabPageWindow::VCLXAccessibleTabPageWindow(vcl::Window* pWindow) } -// OCommonAccessibleComponent +// OAccessibleComponentHelper awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds() commit e856e8e71ffe0215911ad1aaabc64f5bef7fc696 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Mar 31 13:49:20 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Apr 1 11:20:12 2025 +0200 a11y: Merge OAccessible{,Extended}ComponentHelper, add default impl Merge OAccessibleExtendedComponentHelper and OAccessibleComponentHelper by letting OAccessibleComponentHelper already implement the XAccessibleExtendedComponent interface. Add default implementations for the two XAccessibleExtendedComponent methods (XAccessibleExtendedComponent::getToolTipText and XAccessibleExtendedComponent::getTitledBorderText) that simply return an empty string. Replace all uses of XAccessibleExtendedComponent by OAccessibleComponentHelper. This simplifies the class hierarchy and prepares for further simplification in upcoming commits. Change-Id: I05547b12806a6a90b166edbe196b4bc5a27344be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183551 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 7f2b16403032..4d740b53e18d 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -231,7 +231,7 @@ awt::Rectangle AccessibleDialogControlShape::implGetBounds() // XComponent void AccessibleDialogControlShape::disposing() { - OAccessibleExtendedComponentHelper::disposing(); + OAccessibleComponentHelper::disposing(); m_pDialogWindow = nullptr; m_pDlgEdObj = nullptr; diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index fe6d87972ac9..4fe04c85f38a 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -483,7 +483,7 @@ void AccessibleDialogWindow::Notify( SfxBroadcaster&, const SfxHint& rHint ) void AccessibleDialogWindow::disposing() { - OAccessibleExtendedComponentHelper::disposing(); + OAccessibleComponentHelper::disposing(); if ( !m_pDialogWindow ) return; diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index 6979fee0f025..de097240bc32 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -36,7 +36,7 @@ class DialogWindow; class AccessibleDialogControlShape final : public cppu::ImplInheritanceHelper< - comphelper::OAccessibleExtendedComponentHelper, + comphelper::OAccessibleComponentHelper, css::accessibility::XAccessible, css::lang::XServiceInfo, css::beans::XPropertyChangeListener> diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index 42c1f9390433..1c5fcd8c0807 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -41,7 +41,7 @@ class AccessibleDialogControlShape; class AccessibleDialogWindow final : public cppu::ImplInheritanceHelper< - comphelper::OAccessibleExtendedComponentHelper, + comphelper::OAccessibleComponentHelper, css::accessibility::XAccessible, css::accessibility::XAccessibleSelection, css::lang::XServiceInfo>, diff --git a/bin/find-mergedlib-can-be-private-symbols.functions.results b/bin/find-mergedlib-can-be-private-symbols.functions.results index 8756295355ce..b6eda7e4d321 100644 --- a/bin/find-mergedlib-can-be-private-symbols.functions.results +++ b/bin/find-mergedlib-can-be-private-symbols.functions.results @@ -11531,8 +11531,6 @@ comphelper::NamedValueCollection::impl_assign(com::sun::star::uno::Sequence<com: comphelper::NamedValueCollection::impl_remove(rtl::OUString const&) comphelper::NamedValueCollection::merge(comphelper::NamedValueCollection const&, bool) comphelper::NamedValueCollection::size() const -comphelper::OAccessibleExtendedComponentHelper::OAccessibleExtendedComponentHelper() -comphelper::OAccessibleExtendedComponentHelper::getLocationOnScreen() comphelper::OAccessibleKeyBindingHelper::AddKeyBinding(com::sun::star::uno::Sequence<com::sun::star::awt::KeyStroke> const&) comphelper::OAccessibleKeyBindingHelper::OAccessibleKeyBindingHelper(comphelper::OAccessibleKeyBindingHelper const&) comphelper::OAccessibleKeyBindingHelper::getAccessibleKeyBinding(int) diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index e28b1ea62fed..f31f716e4b94 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -352,7 +352,7 @@ void SAL_CALL AccessibleBase::disposing() MutexGuard aGuard(m_aMutex); OSL_ENSURE(isAlive(), "dispose() called twice"); - OAccessibleExtendedComponentHelper::disposing(); + OAccessibleComponentHelper::disposing(); // reset pointers m_aAccInfo.m_pWindow.clear(); diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index f2b8f5d99717..d6d28dcfbe08 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -74,7 +74,7 @@ struct AccessibleElementInfo /** Base class for all Chart Accessibility objects */ class AccessibleBase - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleExtendedComponentHelper, + : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, css::accessibility::XAccessible, css::lang::XServiceInfo> { public: diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx index 659f9c39f9b6..836d3fa12f25 100644 --- a/comphelper/source/misc/accessiblecomponenthelper.cxx +++ b/comphelper/source/misc/accessiblecomponenthelper.cxx @@ -301,41 +301,18 @@ namespace comphelper return OCommonAccessibleComponent::getBounds( ); } - OAccessibleExtendedComponentHelper::OAccessibleExtendedComponentHelper( ) + OUString SAL_CALL OAccessibleComponentHelper::getTitledBorderText() { + OExternalLockGuard aGuard(this); + return OUString(); } - - sal_Bool SAL_CALL OAccessibleExtendedComponentHelper::containsPoint( const awt::Point& _rPoint ) - { - return OCommonAccessibleComponent::containsPoint( _rPoint ); - } - - - awt::Point SAL_CALL OAccessibleExtendedComponentHelper::getLocation( ) - { - return OCommonAccessibleComponent::getLocation( ); - } - - - awt::Point SAL_CALL OAccessibleExtendedComponentHelper::getLocationOnScreen( ) - { - return OCommonAccessibleComponent::getLocationOnScreen( ); - } - - - awt::Size SAL_CALL OAccessibleExtendedComponentHelper::getSize( ) - { - return OCommonAccessibleComponent::getSize( ); - } - - - awt::Rectangle SAL_CALL OAccessibleExtendedComponentHelper::getBounds( ) + OUString SAL_CALL OAccessibleComponentHelper::getToolTipText() { - return OCommonAccessibleComponent::getBounds( ); + OExternalLockGuard aGuard(this); + return OUString(); } - } // namespace comphelper diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index 2ec4fed420f0..a08597860972 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -400,7 +400,7 @@ void SAL_CALL AccessibleContextBase::disposing() ::osl::MutexGuard aGuard (m_aMutex); - comphelper::OAccessibleExtendedComponentHelper::disposing(); + comphelper::OAccessibleComponentHelper::disposing(); mxParent.clear(); mxRelationSet.clear(); diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx index 6d58b421bada..626595e9d6ed 100644 --- a/include/comphelper/accessiblecomponenthelper.hxx +++ b/include/comphelper/accessiblecomponenthelper.hxx @@ -163,11 +163,11 @@ namespace comphelper /** a helper class for implementing an AccessibleContext which at the same time - supports an XAccessibleComponent interface. + supports an XAccessibleExtendedComponent interface. */ class COMPHELPER_DLLPUBLIC OAccessibleComponentHelper :public cppu::ImplInheritanceHelper< - OCommonAccessibleComponent, css::accessibility::XAccessibleComponent> + OCommonAccessibleComponent, css::accessibility::XAccessibleExtendedComponent> { private: OAccessibleComponentHelper(OAccessibleComponentHelper const &) = delete; @@ -185,38 +185,12 @@ namespace comphelper virtual css::awt::Point SAL_CALL getLocationOnScreen( ) override; virtual css::awt::Size SAL_CALL getSize( ) override final; virtual css::awt::Rectangle SAL_CALL getBounds( ) override final; - }; - - - //= OAccessibleExtendedComponentHelper - - - /** a helper class for implementing an AccessibleContext which at the same time - supports an XAccessibleExtendedComponent interface. - */ - class COMPHELPER_DLLPUBLIC OAccessibleExtendedComponentHelper - :public cppu::ImplInheritanceHelper< - OCommonAccessibleComponent, css::accessibility::XAccessibleExtendedComponent> - { - private: - OAccessibleExtendedComponentHelper(OAccessibleExtendedComponentHelper const &) = delete; - OAccessibleExtendedComponentHelper(OAccessibleExtendedComponentHelper &&) = delete; - void operator =(OAccessibleExtendedComponentHelper const &) = delete; - void operator =(OAccessibleExtendedComponentHelper &&) = delete; - - protected: - OAccessibleExtendedComponentHelper( ); - public: - // XAccessibleComponent - default implementations - virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override final; - virtual css::awt::Point SAL_CALL getLocation( ) override final; - virtual css::awt::Point SAL_CALL getLocationOnScreen( ) override; - virtual css::awt::Size SAL_CALL getSize( ) override final; - virtual css::awt::Rectangle SAL_CALL getBounds( ) override final; + // XAccessibleExtendedComponent - default implementations returning empty strings + virtual OUString SAL_CALL getTitledBorderText() override; + virtual OUString SAL_CALL getToolTipText() override; }; - } // namespace comphelper diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index eab5df05be41..0694c23e85d0 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -116,7 +116,7 @@ namespace comphelper supports an XAccessibleText interface */ class UNLESS_MERGELIBS_MORE(COMPHELPER_DLLPUBLIC) OAccessibleTextHelper : public cppu::ImplInheritanceHelper< - OAccessibleExtendedComponentHelper, + OAccessibleComponentHelper, css::accessibility::XAccessibleText>, public OCommonAccessibleText { diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx index 9f0d5cc0a30b..8a64472bde38 100644 --- a/include/editeng/AccessibleContextBase.hxx +++ b/include/editeng/AccessibleContextBase.hxx @@ -34,7 +34,7 @@ namespace utl { class AccessibleRelationSetHelper; } namespace accessibility { class EDITENG_DLLPUBLIC AccessibleContextBase - : public cppu::ImplInheritanceHelper<comphelper::OAccessibleExtendedComponentHelper, + : public cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper, css::lang::XServiceInfo, css::accessibility::XAccessible> { public: diff --git a/include/vcl/accessibility/vclxaccessiblecomponent.hxx b/include/vcl/accessibility/vclxaccessiblecomponent.hxx index fa52ac9650aa..4e9022e43e0e 100644 --- a/include/vcl/accessibility/vclxaccessiblecomponent.hxx +++ b/include/vcl/accessibility/vclxaccessiblecomponent.hxx @@ -41,7 +41,7 @@ class AccessibleRelationSetHelper; class VCL_DLLPUBLIC VCLXAccessibleComponent :public cppu::ImplInheritanceHelper< - comphelper::OAccessibleExtendedComponentHelper, css::lang::XServiceInfo> + comphelper::OAccessibleComponentHelper, css::lang::XServiceInfo> { private: VclPtr<vcl::Window> m_xWindow; diff --git a/svtools/source/control/accessibletabbarbase.cxx b/svtools/source/control/accessibletabbarbase.cxx index 08142db60f6f..8f1c6e438d6d 100644 --- a/svtools/source/control/accessibletabbarbase.cxx +++ b/svtools/source/control/accessibletabbarbase.cxx @@ -65,7 +65,7 @@ void AccessibleTabBarBase::ProcessWindowEvent( const VclWindowEvent& rVclWindowE void AccessibleTabBarBase::disposing() { - OAccessibleExtendedComponentHelper::disposing(); + OAccessibleComponentHelper::disposing(); ClearTabBarPointer(); } diff --git a/svtools/source/control/accessibletabbarbase.hxx b/svtools/source/control/accessibletabbarbase.hxx index d08f20e3e379..c805ab35b9f8 100644 --- a/svtools/source/control/accessibletabbarbase.hxx +++ b/svtools/source/control/accessibletabbarbase.hxx @@ -31,7 +31,7 @@ class VclWindowEvent; namespace accessibility { -class AccessibleTabBarBase : public comphelper::OAccessibleExtendedComponentHelper +class AccessibleTabBarBase : public comphelper::OAccessibleComponentHelper { public: explicit AccessibleTabBarBase( TabBar* pTabBar ); diff --git a/vcl/inc/accessibility/accessiblemenubasecomponent.hxx b/vcl/inc/accessibility/accessiblemenubasecomponent.hxx index 4ddcdd791e1b..bd3f8fc74c3a 100644 --- a/vcl/inc/accessibility/accessiblemenubasecomponent.hxx +++ b/vcl/inc/accessibility/accessiblemenubasecomponent.hxx @@ -36,7 +36,7 @@ class VclMenuEvent; class OAccessibleMenuItemComponent; class OAccessibleMenuBaseComponent : public cppu::ImplInheritanceHelper< - comphelper::OAccessibleExtendedComponentHelper, + comphelper::OAccessibleComponentHelper, css::accessibility::XAccessible, css::lang::XServiceInfo> { diff --git a/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx b/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx index 337a3db65845..01925ee6846c 100644 --- a/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx +++ b/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx @@ -35,7 +35,7 @@ class VclWindowEvent; // ---------------------------------------------------- class VCLXAccessibleHeaderBarItem final : public cppu::ImplInheritanceHelper< - comphelper::OAccessibleExtendedComponentHelper, + comphelper::OAccessibleComponentHelper, css::accessibility::XAccessible, css::lang::XServiceInfo> { diff --git a/vcl/source/accessibility/accessiblemenubasecomponent.cxx b/vcl/source/accessibility/accessiblemenubasecomponent.cxx index 10f7dff9e6b5..9d7fe0bdf6f2 100644 --- a/vcl/source/accessibility/accessiblemenubasecomponent.cxx +++ b/vcl/source/accessibility/accessiblemenubasecomponent.cxx @@ -605,7 +605,7 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen void OAccessibleMenuBaseComponent::disposing() { - OAccessibleExtendedComponentHelper::disposing(); + OAccessibleComponentHelper::disposing(); if ( !m_pMenu ) return; diff --git a/vcl/source/accessibility/vclxaccessiblecomponent.cxx b/vcl/source/accessibility/vclxaccessiblecomponent.cxx index 225a42d8b8f9..6df94b2ee0d6 100644 --- a/vcl/source/accessibility/vclxaccessiblecomponent.cxx +++ b/vcl/source/accessibility/vclxaccessiblecomponent.cxx @@ -362,7 +362,7 @@ void VCLXAccessibleComponent::disposing() { DisconnectEvents(); - OAccessibleExtendedComponentHelper::disposing(); + OAccessibleComponentHelper::disposing(); } vcl::Window* VCLXAccessibleComponent::GetWindow() const { return m_xWindow; }
