basctl/source/accessibility/accessibledialogcontrolshape.cxx | 6 ---
basctl/source/accessibility/accessibledialogwindow.cxx | 6 ---
basctl/source/basicide/textwindowaccessibility.cxx | 8 ----
basctl/source/basicide/textwindowaccessibility.hxx | 11 +-----
basctl/source/inc/accessibledialogcontrolshape.hxx | 14 ++------
basctl/source/inc/accessibledialogwindow.hxx | 11 +-----
chart2/source/controller/accessibility/AccessibleBase.cxx | 6 ---
chart2/source/controller/inc/AccessibleBase.hxx | 7 ----
comphelper/source/misc/accessiblecomponenthelper.cxx | 6 +++
editeng/source/accessibility/AccessibleContextBase.cxx | 10 ------
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 7 ----
editeng/source/accessibility/AccessibleImageBullet.cxx | 6 ---
editeng/source/accessibility/AccessibleImageBullet.hxx | 5 ---
include/comphelper/accessiblecomponenthelper.hxx | 7 +++-
include/editeng/AccessibleContextBase.hxx | 10 ------
include/editeng/AccessibleEditableTextPara.hxx | 6 ---
include/vcl/accessibility/AccessibleBrowseBoxBase.hxx | 7 ----
include/vcl/accessibility/vclxaccessiblecomponent.hxx | 6 ---
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 8 ----
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 7 ++--
sc/source/ui/inc/AccessibleContextBase.hxx | 10 ------
sc/source/ui/inc/AccessibleCsvControl.hxx | 11 +-----
sd/source/console/AccessibleObject.cxx | 10 ------
sd/source/console/AccessibleObject.hxx | 10 +-----
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 9 -----
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 9 -----
sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 9 -----
sd/source/ui/inc/AccessibleSlideSorterView.hxx | 11 +-----
sfx2/source/control/thumbnailviewacc.cxx | 6 ---
sfx2/source/control/thumbnailviewacc.hxx | 4 --
sfx2/source/control/thumbnailviewitemacc.cxx | 5 ---
sfx2/source/control/thumbnailviewitemacc.hxx | 9 -----
starmath/source/accessibility.cxx | 5 ---
starmath/source/accessibility.hxx | 5 ---
svtools/source/control/accessibleruler.cxx | 7 ----
svtools/source/control/accessibleruler.hxx | 9 -----
svtools/source/control/accessibletabbarbase.cxx | 8 ----
svtools/source/control/accessibletabbarbase.hxx | 8 ----
svtools/source/control/valueacc.cxx | 15 ---------
svtools/source/control/valueimp.hxx | 12 -------
svx/source/accessibility/AccessibleFrameSelector.cxx | 10 ------
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 6 ---
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 11 ------
svx/source/dialog/weldeditview.cxx | 11 ------
svx/source/inc/AccessibleFrameSelector.hxx | 14 +-------
svx/source/inc/GraphCtlAccessibleContext.hxx | 6 ---
svx/source/inc/charmapacc.hxx | 17 +++-------
svx/source/inc/svxpixelctlaccessiblecontext.hxx | 13 +------
svx/source/inc/svxrectctaccessiblecontext.hxx | 18 +++--------
toolkit/inc/controls/table/AccessibleGridControlBase.hxx | 7 ----
toolkit/source/controls/table/AccessibleGridControlBase.cxx | 10 ------
vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx | 13 ++-----
vcl/inc/accessibility/accessiblelistboxentry.hxx | 15 +++------
vcl/inc/accessibility/accessiblemenubasecomponent.hxx | 8 +---
vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx | 10 +-----
vcl/inc/accessibility/vclxaccessiblelistitem.hxx | 9 +----
vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx | 10 +-----
vcl/inc/accessibility/vclxaccessibletabpage.hxx | 10 +-----
vcl/inc/accessibility/vclxaccessibletoolboxitem.hxx | 14 ++------
vcl/source/accessibility/AccessibleBrowseBoxBase.cxx | 10 ------
vcl/source/accessibility/accessibleiconchoicectrlentry.cxx | 8 ----
vcl/source/accessibility/accessiblelistboxentry.cxx | 8 ----
vcl/source/accessibility/accessiblemenubasecomponent.cxx | 12 -------
vcl/source/accessibility/vclxaccessiblecomponent.cxx | 9 -----
vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx | 7 ----
vcl/source/accessibility/vclxaccessiblelistitem.cxx | 7 ----
vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx | 12 -------
vcl/source/accessibility/vclxaccessibletabpage.cxx | 12 -------
vcl/source/accessibility/vclxaccessibletoolboxitem.cxx | 7 ----
vcl/unx/gtk3/a11y/atkwrapper.cxx | 5 +--
winaccessibility/source/service/AccFrameEventListener.cxx | 4 +-
71 files changed, 93 insertions(+), 546 deletions(-)
New commits:
commit 4f16e857f4b01164de32e56e4b08eaf9af5cf09c
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon May 26 13:31:23 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Jun 25 07:40:36 2025 +0200
a11y: Drop redundant call to get VCLXAccessibleComponent context
VCLXAccessibleComponent by now implements both,
the XAccessible and XAccessibleContext interfaces,
so calling VCLXAccessibleComponent::getAccessibleContext
(implemented in the OAccessibleComponentHelper base class)
is redundant.
Change-Id: I1cee73b042ec38612bee0cc97590d58faccb96d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185850
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/vcl/unx/gtk3/a11y/atkwrapper.cxx b/vcl/unx/gtk3/a11y/atkwrapper.cxx
index 17eefbf637e9..34c1c2f0fdab 100644
--- a/vcl/unx/gtk3/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk3/a11y/atkwrapper.cxx
@@ -1037,9 +1037,8 @@ atk_object_wrapper_new( const css::uno::Reference<
css::accessibility::XAccessib
}
// tdf#141197 if we have a sysobj child then include that in the
hierarchy
- rtl::Reference<VCLXAccessibleComponent> pVCLAccComponent
- =
dynamic_cast<VCLXAccessibleComponent*>(rxAccessible->getAccessibleContext().get());
- if (pVCLAccComponent.is())
+ if (VCLXAccessibleComponent* pVCLAccComponent
+ = dynamic_cast<VCLXAccessibleComponent*>(rxAccessible.get()))
{
VclPtr<vcl::Window> xWindow = pVCLAccComponent->GetWindow();
if (xWindow && xWindow->GetType() == WindowType::SYSTEMCHILDWINDOW)
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx
b/winaccessibility/source/service/AccFrameEventListener.cxx
index 322eb3bc0382..8a73c5e7facb 100644
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -78,8 +78,8 @@ void AccFrameEventListener::HandleChildChangedEvent(Any
oldValue, Any newValue)
{
if(xChild.is())
{
- VCLXAccessibleComponent* pVCLAccComponent =
dynamic_cast<VCLXAccessibleComponent*>(
- m_xAccessible->getAccessibleContext().get());
+ VCLXAccessibleComponent* pVCLAccComponent
+ = dynamic_cast<VCLXAccessibleComponent*>(m_xAccessible.get());
assert(pVCLAccComponent);
const SystemEnvData* systemdata =
pVCLAccComponent->GetWindow()->GetSystemData();
commit 22049f633b4131f607358db41c7a1fc6b9f4c464
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon May 26 12:24:52 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Jun 25 07:40:30 2025 +0200
vcl a11y: Let OAccessibleComponentHelper implement XAccessible
By now, in particular after
Change-Id: I62da0040e6c98636681c4f05dbd0b796dae5b928
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Mon May 26 09:35:07 2025 +0200
vcl a11y: Let VCLXAccessibleComponent implement XAccessible
, all OAccessibleComponentHelper subclasses are
implementing the XAccessible interface and returning
`this` in their XAccessible::getAccessibleContext implementation.
Unify and deduplicate that by moving the implementation to the
OAccessibleComponentHelper base class.
Locking specifics (whether a mutex was locked and which one)
and whether a check whether the accessible hadn't been
disposed yet was done varied across the different implementations.
The new OAccessibleComponentHelper::getAccessibleContext
unifies this to use OExternalLockGuard, i.e. it both locks
the mutex and throws an exception if the instance is no
longer alive.
Should this commit result in any issues, it's likely because
there is a preexisting locking issue/inconsistency or an object
has already been disposed and that needs to be addressed.
(The easiest approach in case of a disposed object would be
to simply catch + ignore the exception in the caller, but
a more thorough investigation would likely be helpful.)
Change-Id: Ib56a9ddb1c36356943c2dfd7a5705351ee43e9d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185849
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index 3c848fcb0f5f..4159c93a179d 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -293,12 +293,6 @@ Sequence< OUString >
AccessibleDialogControlShape::getSupportedServiceNames()
return { u"com.sun.star.drawing.AccessibleShape"_ustr };
}
-// XAccessible
-Reference< XAccessibleContext >
AccessibleDialogControlShape::getAccessibleContext( )
-{
- return this;
-}
-
// XAccessibleContext
sal_Int64 AccessibleDialogControlShape::getAccessibleChildCount()
{
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx
b/basctl/source/accessibility/accessibledialogwindow.cxx
index aa6654b29a92..906a1684cdae 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -520,12 +520,6 @@ Sequence< OUString >
AccessibleDialogWindow::getSupportedServiceNames()
return { u"com.sun.star.awt.AccessibleWindow"_ustr };
}
-// XAccessible
-Reference< XAccessibleContext > AccessibleDialogWindow::getAccessibleContext(
)
-{
- return this;
-}
-
// XAccessibleContext
sal_Int64 AccessibleDialogWindow::getAccessibleChildCount()
{
diff --git a/basctl/source/basicide/textwindowaccessibility.cxx
b/basctl/source/basicide/textwindowaccessibility.cxx
index 45cc95fa3a5d..424f1993773f 100644
--- a/basctl/source/basicide/textwindowaccessibility.cxx
+++ b/basctl/source/basicide/textwindowaccessibility.cxx
@@ -121,14 +121,6 @@ void Paragraph::notifyEvent(::sal_Int16 nEventId,
NotifyAccessibleEvent(nEventId, rOldValue, rNewValue);
}
-// virtual
-css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL
-Paragraph::getAccessibleContext()
-{
- ensureAlive();
- return this;
-}
-
// virtual
sal_Int64 SAL_CALL Paragraph::getAccessibleChildCount()
{
diff --git a/basctl/source/basicide/textwindowaccessibility.hxx
b/basctl/source/basicide/textwindowaccessibility.hxx
index 4af1335d224a..b771369aa5b1 100644
--- a/basctl/source/basicide/textwindowaccessibility.hxx
+++ b/basctl/source/basicide/textwindowaccessibility.hxx
@@ -114,11 +114,9 @@ private:
typedef std::vector< ParagraphInfo > Paragraphs;
typedef cppu::ImplInheritanceHelper<
- comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible,
- css::accessibility::XAccessibleEditableText,
- css::accessibility::XAccessibleMultiLineText,
- css::accessibility::XAccessibleTextAttributes> ParagraphBase;
+ comphelper::OAccessibleComponentHelper,
css::accessibility::XAccessibleEditableText,
+ css::accessibility::XAccessibleMultiLineText,
css::accessibility::XAccessibleTextAttributes>
+ ParagraphBase;
// The Paragraph's number is the absolute position within the text engine (from
// 0 to N - 1), whereas the Paragraph's index is the position within the text
@@ -156,9 +154,6 @@ private:
css::i18n::Boundary& rBoundary,
::sal_Int32 nIndex ) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
- SAL_CALL getAccessibleContext() override;
-
virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx
b/basctl/source/inc/accessibledialogcontrolshape.hxx
index 482dc8360073..d4976ea2e3a9 100644
--- a/basctl/source/inc/accessibledialogcontrolshape.hxx
+++ b/basctl/source/inc/accessibledialogcontrolshape.hxx
@@ -33,13 +33,10 @@ namespace basctl
class DlgEdObj;
class DialogWindow;
-
-
-class AccessibleDialogControlShape final : public cppu::ImplInheritanceHelper<
-
comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible,
- css::lang::XServiceInfo,
-
css::beans::XPropertyChangeListener>
+class AccessibleDialogControlShape final
+ : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
+ css::lang::XServiceInfo,
+ css::beans::XPropertyChangeListener>
{
friend class AccessibleDialogWindow;
@@ -88,9 +85,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
diff --git a/basctl/source/inc/accessibledialogwindow.hxx
b/basctl/source/inc/accessibledialogwindow.hxx
index 357485d2add5..5e1e46a071fe 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -39,13 +39,11 @@ class DlgEdModel;
class DlgEdObj;
class AccessibleDialogControlShape;
-
-class AccessibleDialogWindow final : public cppu::ImplInheritanceHelper<
-
comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible,
+class AccessibleDialogWindow final
+ : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
css::accessibility::XAccessibleSelection,
css::lang::XServiceInfo>,
- public SfxListener
+ public SfxListener
{
private:
@@ -102,9 +100,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx
b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 954860d95276..3dd1a5ab5bbd 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -370,12 +370,6 @@ void SAL_CALL AccessibleBase::disposing()
OSL_ENSURE( m_aChildList.empty(), "Child list should be empty" );
}
-// ________ XAccessible ________
-Reference< XAccessibleContext > SAL_CALL AccessibleBase::getAccessibleContext()
-{
- return this;
-}
-
// ________ AccessibleBase::XAccessibleContext ________
sal_Int64 SAL_CALL AccessibleBase::getAccessibleChildCount()
{
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx
b/chart2/source/controller/inc/AccessibleBase.hxx
index f3f2baa0c879..7e16fa767da6 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -72,9 +72,7 @@ struct AccessibleElementInfo
/** Base class for all Chart Accessibility objects
*/
-class AccessibleBase
- : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible>
+class AccessibleBase : public comphelper::OAccessibleComponentHelper
{
public:
enum class EventType
@@ -190,9 +188,6 @@ protected:
// ________ WeakComponentImplHelper (XComponent::dispose) ________
virtual void SAL_CALL disposing() override;
- // ________ XAccessible ________
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext() override;
-
// ________ XAccessibleContext ________
virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx
b/comphelper/source/misc/accessiblecomponenthelper.cxx
index 4e490e40eb92..b3ddd1c3cd0d 100644
--- a/comphelper/source/misc/accessiblecomponenthelper.cxx
+++ b/comphelper/source/misc/accessiblecomponenthelper.cxx
@@ -62,6 +62,12 @@ void SAL_CALL OAccessibleComponentHelper::disposing()
}
}
+css::uno::Reference<com::sun::star::accessibility::XAccessibleContext>
+OAccessibleComponentHelper::getAccessibleContext()
+{
+ OExternalLockGuard aGuard(this);
+ return this;
+}
void SAL_CALL OAccessibleComponentHelper::addAccessibleEventListener(const
Reference< XAccessibleEventListener >& _rxListener)
{
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx
b/editeng/source/accessibility/AccessibleContextBase.cxx
index e0cb527900bb..19a390007d25 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -149,16 +149,6 @@ void AccessibleContextBase::SetRelationSet (
mxRelationSet = rxNewRelationSet;
}
-
-// XAccessible
-
-uno::Reference< XAccessibleContext> SAL_CALL
- AccessibleContextBase::getAccessibleContext()
-{
- return this;
-}
-
-
// XAccessibleContext
/** No children.
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 71d927e06782..8860df99da68 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -552,13 +552,6 @@ bool AccessibleEditableTextPara::GetAttributeRun(
sal_Int32& nStartIndex, sal_In
nIndex );
}
-// XAccessible
-uno::Reference< XAccessibleContext > SAL_CALL
AccessibleEditableTextPara::getAccessibleContext()
-{
- // We implement the XAccessibleContext interface in the same object
- return uno::Reference< XAccessibleContext > ( this );
-}
-
// XAccessibleContext
sal_Int64 SAL_CALL AccessibleEditableTextPara::getAccessibleChildCount()
{
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx
b/editeng/source/accessibility/AccessibleImageBullet.cxx
index a44f99909cd3..37baa2e5cdc7 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -64,12 +64,6 @@
AccessibleImageBullet::AccessibleImageBullet(uno::Reference<XAccessible> xParent
mnStateSet |= AccessibleStateType::SENSITIVE;
}
-uno::Reference< XAccessibleContext > SAL_CALL
AccessibleImageBullet::getAccessibleContext( )
-{
- // We implement the XAccessibleContext interface in the same object
- return uno::Reference< XAccessibleContext > ( this );
-}
-
sal_Int64 SAL_CALL AccessibleImageBullet::getAccessibleChildCount()
{
return 0;
diff --git a/editeng/source/accessibility/AccessibleImageBullet.hxx
b/editeng/source/accessibility/AccessibleImageBullet.hxx
index c5c6d3b33cd8..807155e9c1ec 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.hxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.hxx
@@ -39,7 +39,7 @@ namespace accessibility
*/
class AccessibleImageBullet final
: public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible,
css::lang::XServiceInfo>
+ css::lang::XServiceInfo>
{
public:
@@ -47,9 +47,6 @@ public:
AccessibleImageBullet(css::uno::Reference<css::accessibility::XAccessible>
xParent,
sal_Int64 nIndexInParent);
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
diff --git a/include/comphelper/accessiblecomponenthelper.hxx
b/include/comphelper/accessiblecomponenthelper.hxx
index 40992c15ab0f..a5222552ac9a 100644
--- a/include/comphelper/accessiblecomponenthelper.hxx
+++ b/include/comphelper/accessiblecomponenthelper.hxx
@@ -41,7 +41,8 @@ namespace comphelper
*/
class COMPHELPER_DLLPUBLIC OAccessibleComponentHelper
: public cppu::BaseMutex,
- public
cppu::WeakComponentImplHelper<css::accessibility::XAccessibleContext2,
+ public cppu::WeakComponentImplHelper<css::accessibility::XAccessible,
+
css::accessibility::XAccessibleContext2,
css::accessibility::XAccessibleEventBroadcaster,
css::accessibility::XAccessibleExtendedComponent>
{
@@ -61,6 +62,10 @@ private:
void operator =(OAccessibleComponentHelper &&) = delete;
public:
+ // XAccessible
+ virtual
css::uno::Reference<com::sun::star::accessibility::XAccessibleContext>
+ SAL_CALL getAccessibleContext() override final;
+
// XAccessibleEventBroadcaster
virtual void SAL_CALL addAccessibleEventListener( const
css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener
) override;
virtual void SAL_CALL removeAccessibleEventListener( const
css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener
) override;
diff --git a/include/editeng/AccessibleContextBase.hxx
b/include/editeng/AccessibleContextBase.hxx
index 14b45381d7a9..edd99b27fb59 100644
--- a/include/editeng/AccessibleContextBase.hxx
+++ b/include/editeng/AccessibleContextBase.hxx
@@ -34,7 +34,7 @@ namespace accessibility {
class EDITENG_DLLPUBLIC AccessibleContextBase
: public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::lang::XServiceInfo,
css::accessibility::XAccessible>
+ css::lang::XServiceInfo>
{
public:
/** The origin of the accessible name or description.
@@ -143,14 +143,6 @@ public:
void SetRelationSet (
const rtl::Reference< utl::AccessibleRelationSetHelper>&
rxRelationSet);
-
- //===== XAccessible =====================================================
-
- /// Return the XAccessibleContext.
- virtual css::uno::Reference< css::accessibility::XAccessibleContext>
SAL_CALL
- getAccessibleContext() override;
-
-
//===== XAccessibleContext ==============================================
/// Return the number of currently visible children.
diff --git a/include/editeng/AccessibleEditableTextPara.hxx
b/include/editeng/AccessibleEditableTextPara.hxx
index 3fa129df8385..455c77685a19 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -55,8 +55,7 @@ class AccessibleParaManager;
*/
class UNLESS_MERGELIBS(EDITENG_DLLPUBLIC) AccessibleEditableTextPara final
: public cppu::ImplInheritanceHelper<
- comphelper::OAccessibleComponentHelper,
css::accessibility::XAccessible,
- css::accessibility::XAccessibleEditableText,
+ comphelper::OAccessibleComponentHelper,
css::accessibility::XAccessibleEditableText,
css::accessibility::XAccessibleTextAttributes,
css::accessibility::XAccessibleHypertext,
css::accessibility::XAccessibleMultiLineText>,
private ::comphelper::OCommonAccessibleText
@@ -78,9 +77,6 @@ public:
AccessibleEditableTextPara ( css::uno::Reference<
css::accessibility::XAccessible > xParent,
const AccessibleParaManager* _pParaManager =
nullptr );
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
diff --git a/include/vcl/accessibility/AccessibleBrowseBoxBase.hxx
b/include/vcl/accessibility/AccessibleBrowseBoxBase.hxx
index c2039751a2ae..0ae9f7023e7f 100644
--- a/include/vcl/accessibility/AccessibleBrowseBoxBase.hxx
+++ b/include/vcl/accessibility/AccessibleBrowseBoxBase.hxx
@@ -43,8 +43,7 @@ namespace vcl {
implements basic functionality for various Accessibility interfaces. */
class VCL_DLLPUBLIC AccessibleBrowseBoxBase
: public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible,
css::awt::XFocusListener,
- css::lang::XServiceInfo>
+ css::awt::XFocusListener,
css::lang::XServiceInfo>
{
public:
/** Constructor sets specified name and description. If the constant of a
@@ -88,10 +87,6 @@ protected:
virtual css::awt::Rectangle implGetBounds() override;
public:
- // XAccessible
- css::uno::Reference<css::accessibility::XAccessibleContext>
- SAL_CALL getAccessibleContext() override;
-
// XAccessibleContext
/** @return A reference to the parent accessible object. */
virtual css::uno::Reference<css::accessibility::XAccessible > SAL_CALL
getAccessibleParent() override;
diff --git a/include/vcl/accessibility/vclxaccessiblecomponent.hxx
b/include/vcl/accessibility/vclxaccessiblecomponent.hxx
index 4aa4bc2204fd..e431f074292b 100644
--- a/include/vcl/accessibility/vclxaccessiblecomponent.hxx
+++ b/include/vcl/accessibility/vclxaccessiblecomponent.hxx
@@ -39,7 +39,7 @@ class AccessibleRelationSetHelper;
class VCL_DLLPUBLIC VCLXAccessibleComponent
: public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::lang::XServiceInfo,
css::accessibility::XAccessible>
+ css::lang::XServiceInfo>
{
private:
VclPtr<vcl::Window> m_xWindow;
@@ -73,10 +73,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
- // XAccessible
- virtual
css::uno::Reference<com::sun::star::accessibility::XAccessibleContext>
- SAL_CALL getAccessibleContext() override final;
-
// css::accessibility::XAccessibleContext
sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index b6620e59f063..0537f874c6ab 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -89,14 +89,6 @@ void ScAccessibleContextBase::Notify( SfxBroadcaster&, const
SfxHint& rHint )
}
}
-//===== XAccessible =========================================================
-
-uno::Reference< XAccessibleContext> SAL_CALL
- ScAccessibleContextBase::getAccessibleContext()
-{
- return this;
-}
-
// OAccessibleComponentHelper
awt::Rectangle ScAccessibleContextBase::implGetBounds( )
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 2ec872cd8c2d..8170c387bd27 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -1232,7 +1232,7 @@ ScAccessibleCsvCell::ScAccessibleCsvCell(
ScCsvGrid& rGrid,
OUString aCellText,
sal_Int32 nRow, sal_Int32 nColumn ) :
- ImplInheritanceHelper( rGrid ),
+ ScAccessibleCsvControl( rGrid ),
AccessibleStaticTextBase( SvxEditSourcePtr() ),
maCellText(std::move( aCellText )),
mnLine( nRow ? (nRow + rGrid.GetFirstVisLine() - 1) : CSV_LINE_HEADER ),
@@ -1323,11 +1323,12 @@ sal_Int64 SAL_CALL
ScAccessibleCsvCell::getAccessibleStateSet()
// XInterface -----------------------------------------------------------------
-IMPLEMENT_FORWARD_XINTERFACE2( ScAccessibleCsvCell, ImplInheritanceHelper,
AccessibleStaticTextBase )
+IMPLEMENT_FORWARD_XINTERFACE2(ScAccessibleCsvCell, ScAccessibleCsvControl,
AccessibleStaticTextBase)
// XTypeProvider --------------------------------------------------------------
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( ScAccessibleCsvCell, ImplInheritanceHelper,
AccessibleStaticTextBase )
+IMPLEMENT_FORWARD_XTYPEPROVIDER2(ScAccessibleCsvCell, ScAccessibleCsvControl,
+ AccessibleStaticTextBase)
// helpers --------------------------------------------------------------------
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx
b/sc/source/ui/inc/AccessibleContextBase.hxx
index 0824eba867e0..95d1d13e0bc1 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -34,9 +34,7 @@
namespace tools { class Rectangle; }
class AbsoluteScreenPixelRectangle;
-class ScAccessibleContextBase
- : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible>,
+class ScAccessibleContextBase : public comphelper::OAccessibleComponentHelper,
public SfxListener
{
@@ -61,12 +59,6 @@ public:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
- ///===== XAccessible
=====================================================
-
- /// Return the XAccessibleContext.
- virtual css::uno::Reference< css::accessibility::XAccessibleContext>
SAL_CALL
- getAccessibleContext() override;
-
// OAccessibleComponentHelper
virtual css::awt::Rectangle implGetBounds() override;
diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx
b/sc/source/ui/inc/AccessibleCsvControl.hxx
index 73796820c662..937df12b9cc5 100644
--- a/sc/source/ui/inc/AccessibleCsvControl.hxx
+++ b/sc/source/ui/inc/AccessibleCsvControl.hxx
@@ -38,8 +38,7 @@ class ScCsvControl;
/** Accessible base class used for CSV controls. */
class ScAccessibleCsvControl
- : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible>
+ : public comphelper::OAccessibleComponentHelper
{
private:
ScCsvControl* mpControl; /// Pointer to the VCL
control.
@@ -50,12 +49,6 @@ public:
virtual void SAL_CALL disposing() override;
- virtual css::uno::Reference<css::accessibility::XAccessibleContext>
- SAL_CALL getAccessibleContext() override final
- {
- return this;
- }
-
virtual void SAL_CALL grabFocus( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
@@ -398,7 +391,7 @@ private:
};
/** Accessible class representing a cell of the CSV grid control. */
-class ScAccessibleCsvCell : public
cppu::ImplInheritanceHelper<ScAccessibleCsvControl>,
+class ScAccessibleCsvCell : public ScAccessibleCsvControl,
public ::accessibility::AccessibleStaticTextBase
{
protected:
diff --git a/sd/source/console/AccessibleObject.cxx
b/sd/source/console/AccessibleObject.cxx
index 05cb5de35cc4..bfd89e50470c 100644
--- a/sd/source/console/AccessibleObject.cxx
+++ b/sd/source/console/AccessibleObject.cxx
@@ -80,16 +80,6 @@ void SAL_CALL AccessibleObject::disposing()
SetWindow(nullptr, nullptr);
}
-//----- XAccessible -------------------------------------------------------
-
-Reference<XAccessibleContext> SAL_CALL
- AccessibleObject::getAccessibleContext()
-{
- ensureAlive();
-
- return this;
-}
-
//----- XAccessibleContext ----------------------------------------------
sal_Int64 SAL_CALL AccessibleObject::getAccessibleChildCount()
diff --git a/sd/source/console/AccessibleObject.hxx
b/sd/source/console/AccessibleObject.hxx
index 8718de1aa1fd..abaa85c7940f 100644
--- a/sd/source/console/AccessibleObject.hxx
+++ b/sd/source/console/AccessibleObject.hxx
@@ -36,9 +36,8 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
-class AccessibleObject
- : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible,
css::awt::XWindowListener>
+class AccessibleObject : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
+
css::awt::XWindowListener>
{
public:
AccessibleObject(const sal_Int16 nRole, const OUString& rName =
OUString());
@@ -64,11 +63,6 @@ public:
void UpdateStateSet();
- //----- XAccessible -------------------------------------------------------
-
- virtual css::uno::Reference<css::accessibility::XAccessibleContext>
SAL_CALL
- getAccessibleContext() override;
-
//----- XAccessibleContext ----------------------------------------------
virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index c0e38926221b..42410e4dcf06 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -71,15 +71,6 @@ void AccessibleSlideSorterObject::FireAccessibleEvent (
NotifyAccessibleEvent(nEventId, rOldValue, rNewValue);
}
-//===== XAccessible ===========================================================
-
-Reference<XAccessibleContext> SAL_CALL
- AccessibleSlideSorterObject::getAccessibleContext()
-{
- ensureAlive();
- return this;
-}
-
//===== XAccessibleContext ====================================================
sal_Int64 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount()
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 85211a36f243..5858af5feaf1 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -154,15 +154,6 @@ AccessibleSlideSorterObject*
AccessibleSlideSorterView::GetAccessibleChildImplem
return pResult;
}
-//===== XAccessible =========================================================
-
-Reference<XAccessibleContext > SAL_CALL
- AccessibleSlideSorterView::getAccessibleContext()
-{
- ThrowIfDisposed ();
- return this;
-}
-
//===== XAccessibleContext ==================================================
sal_Int64 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount()
diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
index c5e535f989f3..0b84b1485610 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
@@ -32,9 +32,7 @@ namespace accessibility {
/** This class makes page objects of the slide sorter accessible.
*/
-class AccessibleSlideSorterObject final
- : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible>
+class AccessibleSlideSorterObject final : public
comphelper::OAccessibleComponentHelper
{
public:
/** Create a new object that represents a page object in the slide
@@ -65,11 +63,6 @@ public:
const css::uno::Any& rOldValue,
const css::uno::Any& rNewValue);
- //===== XAccessible =======================================================
-
- virtual css::uno::Reference<css::accessibility::XAccessibleContext >
SAL_CALL
- getAccessibleContext() override;
-
//===== XAccessibleContext ==============================================
virtual sal_Int64 SAL_CALL
diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx
b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
index 9aa15a72a135..bfe8578f15cd 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
@@ -40,9 +40,9 @@ class AccessibleSlideSorterObject;
accessible.
*/
class AccessibleSlideSorterView final
- : public cppu::ImplInheritanceHelper<
- comphelper::OAccessibleComponentHelper,
css::accessibility::XAccessible,
- css::accessibility::XAccessibleSelection, css::lang::XServiceInfo>
+ : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
+
css::accessibility::XAccessibleSelection,
+ css::lang::XServiceInfo>
{
public:
AccessibleSlideSorterView(
@@ -66,11 +66,6 @@ public:
*/
AccessibleSlideSorterObject* GetAccessibleChildImplementation (sal_Int32
nIndex);
- //===== XAccessible =======================================================
-
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL
- getAccessibleContext() override;
-
//===== XAccessibleContext ==============================================
/// Return the number of currently visible children.
diff --git a/sfx2/source/control/thumbnailviewacc.cxx
b/sfx2/source/control/thumbnailviewacc.cxx
index 268538b18f23..6021367394c4 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -45,12 +45,6 @@ ThumbnailViewAcc::~ThumbnailViewAcc()
{
}
-uno::Reference< accessibility::XAccessibleContext > SAL_CALL
ThumbnailViewAcc::getAccessibleContext()
-{
- ThrowIfDisposed();
- return this;
-}
-
sal_Int64 SAL_CALL ThumbnailViewAcc::getAccessibleChildCount()
{
const SolarMutexGuard aSolarGuard;
diff --git a/sfx2/source/control/thumbnailviewacc.hxx
b/sfx2/source/control/thumbnailviewacc.hxx
index 318a6f671d51..c67b0b4a7e14 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -31,7 +31,6 @@ class ThumbnailViewItem;
class ThumbnailViewAcc
: public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible,
css::accessibility::XAccessibleSelection>
{
public:
@@ -56,9 +55,6 @@ public:
*/
void LoseFocus();
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
diff --git a/sfx2/source/control/thumbnailviewitemacc.cxx
b/sfx2/source/control/thumbnailviewitemacc.cxx
index a78ad3cb5293..087804391ca3 100644
--- a/sfx2/source/control/thumbnailviewitemacc.cxx
+++ b/sfx2/source/control/thumbnailviewitemacc.cxx
@@ -51,11 +51,6 @@ void ThumbnailViewItemAcc::ThumbnailViewItemDestroyed()
mpThumbnailViewItem = nullptr;
}
-uno::Reference< accessibility::XAccessibleContext > SAL_CALL
ThumbnailViewItemAcc::getAccessibleContext()
-{
- return this;
-}
-
sal_Int64 SAL_CALL ThumbnailViewItemAcc::getAccessibleChildCount()
{
return 0;
diff --git a/sfx2/source/control/thumbnailviewitemacc.hxx
b/sfx2/source/control/thumbnailviewitemacc.hxx
index fe87cee1ea2d..58f7ac091e03 100644
--- a/sfx2/source/control/thumbnailviewitemacc.hxx
+++ b/sfx2/source/control/thumbnailviewitemacc.hxx
@@ -25,9 +25,7 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
class ThumbnailViewItem;
-class ThumbnailViewItemAcc
- : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible>
+class ThumbnailViewItemAcc : public comphelper::OAccessibleComponentHelper
{
private:
ThumbnailViewItem*
mpThumbnailViewItem;
@@ -38,11 +36,6 @@ public:
void ThumbnailViewItemDestroyed();
-public:
-
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
diff --git a/starmath/source/accessibility.cxx
b/starmath/source/accessibility.cxx
index 176811f64154..1139833142c5 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -91,11 +91,6 @@ void SmGraphicAccessible::LaunchEvent(
NotifyAccessibleEvent(nAccessibleEventId, rOldVal, rNewVal);
}
-uno::Reference< XAccessibleContext > SAL_CALL
SmGraphicAccessible::getAccessibleContext()
-{
- return this;
-}
-
uno::Reference<XAccessible> SAL_CALL
SmGraphicAccessible::getAccessibleAtPoint(const awt::Point&)
{
SolarMutexGuard aGuard;
diff --git a/starmath/source/accessibility.hxx
b/starmath/source/accessibility.hxx
index 3ae25fac863c..8a40dc6895d2 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -37,7 +37,7 @@ namespace accessibility { class AccessibleTextHelper; }
class SmGraphicAccessible final
: public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::lang::XServiceInfo,
css::accessibility::XAccessible,
+ css::lang::XServiceInfo,
css::accessibility::XAccessibleText>
{
OUString aAccName;
@@ -64,9 +64,6 @@ public:
void SAL_CALL disposing() override;
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleComponent
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
virtual void SAL_CALL grabFocus( ) override;
diff --git a/svtools/source/control/accessibleruler.cxx
b/svtools/source/control/accessibleruler.cxx
index 457debe1ae47..d22dc33225da 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -46,13 +46,6 @@
SvtRulerAccessible::SvtRulerAccessible(uno::Reference<XAccessible> xParent, Rule
{
}
-//===== XAccessible =========================================================
-
-uno::Reference< XAccessibleContext > SAL_CALL
SvtRulerAccessible::getAccessibleContext()
-{
- return this;
-}
-
//===== XAccessibleComponent ================================================
uno::Reference< XAccessible > SAL_CALL
SvtRulerAccessible::getAccessibleAtPoint( const awt::Point& )
diff --git a/svtools/source/control/accessibleruler.hxx
b/svtools/source/control/accessibleruler.hxx
index 66079615c6b5..389192a71446 100644
--- a/svtools/source/control/accessibleruler.hxx
+++ b/svtools/source/control/accessibleruler.hxx
@@ -32,19 +32,12 @@
namespace tools { class Rectangle; }
class Ruler;
-class SvtRulerAccessible final
- : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible>
+class SvtRulerAccessible final : public comphelper::OAccessibleComponentHelper
{
public:
SvtRulerAccessible(
css::uno::Reference< css::accessibility::XAccessible> xParent, Ruler&
rRepresentation, OUString aName );
- //===== XAccessible =====================================================
-
- virtual css::uno::Reference< css::accessibility::XAccessibleContext>
SAL_CALL
- getAccessibleContext() override;
-
//===== XAccessibleComponent ============================================
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
diff --git a/svtools/source/control/accessibletabbarbase.cxx
b/svtools/source/control/accessibletabbarbase.cxx
index bfd6721c3bde..32252bd6bc0e 100644
--- a/svtools/source/control/accessibletabbarbase.cxx
+++ b/svtools/source/control/accessibletabbarbase.cxx
@@ -40,14 +40,6 @@ AccessibleTabBarBase::~AccessibleTabBarBase()
ClearTabBarPointer();
}
-css::uno::Reference<css::accessibility::XAccessibleContext>
-AccessibleTabBarBase::getAccessibleContext()
-{
- comphelper::OExternalLockGuard aGuard(this);
-
- return this;
-}
-
IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclWindowEvent&, rEvent,
void )
{
vcl::Window* pEventWindow = rEvent.GetWindow();
diff --git a/svtools/source/control/accessibletabbarbase.hxx
b/svtools/source/control/accessibletabbarbase.hxx
index d39d7c77c38d..806cd311ee62 100644
--- a/svtools/source/control/accessibletabbarbase.hxx
+++ b/svtools/source/control/accessibletabbarbase.hxx
@@ -30,18 +30,12 @@ class VclWindowEvent;
namespace accessibility
{
-class AccessibleTabBarBase
- : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible>
+class AccessibleTabBarBase : public comphelper::OAccessibleComponentHelper
{
public:
explicit AccessibleTabBarBase( TabBar* pTabBar );
virtual ~AccessibleTabBarBase() override;
- // XAccessible
- virtual css::uno::Reference<css::accessibility::XAccessibleContext>
- SAL_CALL getAccessibleContext() override;
-
protected:
DECL_LINK( WindowEventListener, VclWindowEvent&, void );
diff --git a/svtools/source/control/valueacc.cxx
b/svtools/source/control/valueacc.cxx
index ab71010dff37..7c7be71e81ee 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -77,12 +77,6 @@ void ValueItemAcc::ValueSetItemDestroyed()
mpValueSetItem = nullptr;
}
-uno::Reference< accessibility::XAccessibleContext > SAL_CALL
ValueItemAcc::getAccessibleContext()
-{
- return this;
-}
-
-
sal_Int64 SAL_CALL ValueItemAcc::getAccessibleChildCount()
{
return 0;
@@ -330,15 +324,6 @@ void ValueSetAcc::LoseFocus()
aOldState, aNewState);
}
-
-uno::Reference< accessibility::XAccessibleContext > SAL_CALL
ValueSetAcc::getAccessibleContext()
-{
- // still allow retrieving a11y context when not disposed yet, but ValueSet
is unset
- ThrowIfDisposed(false);
- return this;
-}
-
-
sal_Int64 SAL_CALL ValueSetAcc::getAccessibleChildCount()
{
const SolarMutexGuard aSolarGuard;
diff --git a/svtools/source/control/valueimp.hxx
b/svtools/source/control/valueimp.hxx
index 9540cf11e22b..f8876f1298dc 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -64,7 +64,6 @@ struct ValueSetItem
class ValueSetAcc final
: public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible,
css::accessibility::XAccessibleSelection>
{
public:
@@ -90,9 +89,6 @@ public:
/** Called by the corresponding ValueSet when it gets destroyed. */
void Invalidate();
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
@@ -162,8 +158,7 @@ private:
bool HasNoneField() const;
};
-class ValueItemAcc : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
-
css::accessibility::XAccessible>
+class ValueItemAcc : public comphelper::OAccessibleComponentHelper
{
private:
ValueSetItem*
mpValueSetItem;
@@ -177,11 +172,6 @@ public:
void FireAccessibleEvent( short nEventId, const css::uno::Any&
rOldValue, const css::uno::Any& rNewValue );
-public:
-
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
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/accessibility/AccessibleFrameSelector.cxx
b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 7bd808283aa8..e6bb5c003eec 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -47,11 +47,6 @@ AccFrameSelector::~AccFrameSelector()
{
}
-Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext( )
-{
- return this;
-}
-
sal_Int64 AccFrameSelector::getAccessibleChildCount( )
{
SolarMutexGuard aGuard;
@@ -231,11 +226,6 @@ AccFrameSelectorChild::~AccFrameSelectorChild()
{
}
-Reference< XAccessibleContext > AccFrameSelectorChild::getAccessibleContext( )
-{
- return this;
-}
-
sal_Int64 AccFrameSelectorChild::getAccessibleChildCount( )
{
SolarMutexGuard aGuard;
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index edf079cb8caa..137ee428e9f9 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -127,12 +127,6 @@ Reference< XAccessible >
SvxGraphCtrlAccessibleContext::getAccessible( const Sdr
return xAccessibleShape;
}
-// XAccessible
-Reference< XAccessibleContext > SAL_CALL
SvxGraphCtrlAccessibleContext::getAccessibleContext()
-{
- return this;
-}
-
Reference< XAccessible > SAL_CALL
SvxGraphCtrlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint )
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index c6914c5242e2..209775a1230a 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -50,11 +50,6 @@ SvxPixelCtlAccessible::~SvxPixelCtlAccessible()
ensureDisposed();
}
-uno::Reference< XAccessibleContext >
SvxPixelCtlAccessible::getAccessibleContext( )
-{
- return this;
-}
-
sal_Int64 SvxPixelCtlAccessible::getAccessibleChildCount( )
{
return SvxPixelCtl::GetSquares();
@@ -315,12 +310,6 @@ SvxPixelCtlAccessibleChild::~SvxPixelCtlAccessibleChild()
ensureDisposed();
}
-// XAccessible
-uno::Reference< XAccessibleContext> SAL_CALL
SvxPixelCtlAccessibleChild::getAccessibleContext()
-{
- return this;
-}
-
uno::Reference< XAccessible > SAL_CALL
SvxPixelCtlAccessibleChild::getAccessibleAtPoint( const awt::Point& )
{
return uno::Reference< XAccessible >();
diff --git a/svx/source/dialog/weldeditview.cxx
b/svx/source/dialog/weldeditview.cxx
index 3fb6886d643a..28426e0952f4 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -507,9 +507,7 @@ public:
};
}
-class WeldEditAccessible
- : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible>
+class WeldEditAccessible : public comphelper::OAccessibleComponentHelper
{
weld::CustomWidgetController* m_pController;
EditEngine* m_pEditEngine;
@@ -562,13 +560,6 @@ public:
OAccessibleComponentHelper::dispose();
}
- // XAccessible
- virtual css::uno::Reference<css::accessibility::XAccessibleContext>
- SAL_CALL getAccessibleContext() override
- {
- return this;
- }
-
// XAccessibleComponent
virtual css::uno::Reference<css::accessibility::XAccessible>
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx
b/svx/source/inc/AccessibleFrameSelector.hxx
index 9ddd1fb8b61e..1567ce52ca48 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -32,9 +32,7 @@ class FrameSelector;
namespace a11y {
-class AccFrameSelector final : public cppu::ImplInheritanceHelper<
- ::comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible>
+class AccFrameSelector final : public comphelper::OAccessibleComponentHelper
{
public:
explicit AccFrameSelector(FrameSelector& rFrameSel);
@@ -55,9 +53,6 @@ public:
virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override;
virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
- //XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
virtual sal_Int32 SAL_CALL getForeground( ) override;
virtual sal_Int32 SAL_CALL getBackground( ) override;
@@ -74,9 +69,7 @@ private:
FrameSelector* mpFrameSel;
};
-class AccFrameSelectorChild final : public cppu::ImplInheritanceHelper<
-
::comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible>
+class AccFrameSelectorChild final : public
comphelper::OAccessibleComponentHelper
{
public:
explicit AccFrameSelectorChild( FrameSelector& rFrameSel,
FrameBorderType eBorder );
@@ -97,9 +90,6 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet >
SAL_CALL getAccessibleRelationSet( ) override;
virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override;
- //XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
virtual sal_Int32 SAL_CALL getForeground( ) override;
virtual sal_Int32 SAL_CALL getBackground( ) override;
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx
b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 49da10efd836..4c0a07d18dda 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -52,7 +52,6 @@ class SdrView;
class SvxGraphCtrlAccessibleContext final
: public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible,
css::accessibility::XAccessibleSelection,
css::lang::XServiceInfo,
css::lang::XServiceName>,
public SfxListener,
@@ -66,11 +65,6 @@ public:
void Notify( SfxBroadcaster& aBC, const SfxHint& aHint ) override;
- // XAccessible
- /// Return the XAccessibleContext.
- virtual css::uno::Reference< css::accessibility::XAccessibleContext>
SAL_CALL
- getAccessibleContext() override;
-
// XAccessibleComponent
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleAtPoint( const css::awt::Point& rPoint ) override;
virtual void SAL_CALL grabFocus() override;
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index d39a82deeb81..1eda19a0c786 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -61,10 +61,9 @@ namespace svx
/** The table implementation of the vcl control.
*/
- class SvxShowCharSetAcc final : public cppu::ImplInheritanceHelper<
-
::comphelper::OAccessibleSelectionHelper,
- css::accessibility::XAccessible,
- css::accessibility::XAccessibleTable>
+ class SvxShowCharSetAcc final
+ : public
cppu::ImplInheritanceHelper<::comphelper::OAccessibleSelectionHelper,
+
css::accessibility::XAccessibleTable>
{
::std::vector< rtl::Reference< SvxShowCharSetItemAcc > > m_aChildren;
SvxShowCharSet* m_pParent; // the vcl control
@@ -87,7 +86,6 @@ namespace svx
virtual css::uno::Reference<
css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(
) override;
virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override { return this; }
virtual sal_Int32 SAL_CALL getForeground( ) override;
virtual sal_Int32 SAL_CALL getBackground( ) override;
@@ -146,10 +144,9 @@ namespace svx
/** The child implementation of the table.
*/
- class SvxShowCharSetItemAcc final : public cppu::ImplInheritanceHelper<
-
::comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible,
-
css::accessibility::XAccessibleAction>
+ class SvxShowCharSetItemAcc final
+ : public
cppu::ImplInheritanceHelper<::comphelper::OAccessibleComponentHelper,
+
css::accessibility::XAccessibleAction>
{
private:
SvxShowCharSetItem* mpParent;
@@ -180,8 +177,6 @@ namespace svx
virtual css::uno::Reference<
css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(
) override;
virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override { return this; }
-
virtual sal_Int32 SAL_CALL getForeground( ) override { return
mpParent->m_pParent->getForeground(); }
virtual sal_Int32 SAL_CALL getBackground( ) override { return
mpParent->m_pParent->getBackground(); }
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index aceb571a9d7a..4974f694c037 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -33,9 +33,7 @@
class SvxPixelCtl;
class SvxPixelCtlAccessible;
-class SvxPixelCtlAccessibleChild final : public cppu::ImplInheritanceHelper<
-
::comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible>
+class SvxPixelCtlAccessibleChild final : public
comphelper::OAccessibleComponentHelper
{
public:
SvxPixelCtlAccessibleChild(
@@ -59,9 +57,6 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet >
SAL_CALL getAccessibleRelationSet( ) override;
virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override;
- //XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
virtual sal_Int32 SAL_CALL getForeground( ) override;
virtual sal_Int32 SAL_CALL getBackground( ) override;
@@ -87,9 +82,7 @@ private:
tools::Long mnIndexInParent;
};
-class SvxPixelCtlAccessible final : public cppu::ImplInheritanceHelper<
-
::comphelper::OAccessibleSelectionHelper,
- css::accessibility::XAccessible>
+class SvxPixelCtlAccessible final : public
comphelper::OAccessibleSelectionHelper
{
public:
SvxPixelCtlAccessible(SvxPixelCtl* pPixelCtl);
@@ -98,7 +91,6 @@ public:
virtual void SAL_CALL grabFocus( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
- //XAccessible
//XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
@@ -109,7 +101,6 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet >
SAL_CALL getAccessibleRelationSet( ) override;
virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
virtual sal_Int32 SAL_CALL getForeground( ) override;
virtual sal_Int32 SAL_CALL getBackground( ) override;
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx
b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 85df79490143..22a46f5ce76e 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -36,9 +36,8 @@
class SvxRectCtl;
class SvxRectCtlChildAccessibleContext;
-class SvxRectCtlAccessibleContext final : public cppu::ImplInheritanceHelper<
-
::comphelper::OAccessibleSelectionHelper,
- css::accessibility::XAccessible>
+class SvxRectCtlAccessibleContext final
+ : public
cppu::ImplInheritanceHelper<::comphelper::OAccessibleSelectionHelper>
{
public:
// internal
@@ -48,7 +47,6 @@ public:
virtual void SAL_CALL grabFocus() override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleAtPoint(const css::awt::Point& rPoint) override;
- // XAccessible
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
getAccessibleChild(sal_Int64 nIndex) override;
@@ -59,7 +57,6 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet >
SAL_CALL getAccessibleRelationSet() override;
virtual sal_Int64 SAL_CALL getAccessibleStateSet() override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext>
SAL_CALL getAccessibleContext() override { return this; }
virtual sal_Int32 SAL_CALL getForeground() override;
virtual sal_Int32 SAL_CALL getBackground() override;
@@ -120,11 +117,10 @@ private:
tools::Long mnSelectedChild;
};
-class SvxRectCtlChildAccessibleContext final : public
cppu::ImplInheritanceHelper<
-
::comphelper::OAccessibleComponentHelper,
-
css::accessibility::XAccessible,
-
css::accessibility::XAccessibleValue,
-
css::accessibility::XAccessibleAction>
+class SvxRectCtlChildAccessibleContext final
+ : public
cppu::ImplInheritanceHelper<::comphelper::OAccessibleComponentHelper,
+ css::accessibility::XAccessibleValue,
+ css::accessibility::XAccessibleAction>
{
public:
SvxRectCtlChildAccessibleContext(
@@ -147,8 +143,6 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet >
SAL_CALL getAccessibleRelationSet() override;
virtual sal_Int64 SAL_CALL getAccessibleStateSet() override;
- virtual css::uno::Reference< css::accessibility::XAccessibleContext>
SAL_CALL getAccessibleContext() override { return this; }
-
virtual sal_Int32 SAL_CALL getForeground() override;
virtual sal_Int32 SAL_CALL getBackground() override;
diff --git a/toolkit/inc/controls/table/AccessibleGridControlBase.hxx
b/toolkit/inc/controls/table/AccessibleGridControlBase.hxx
index c70bdb2c8bc1..f4bfd86c47b0 100644
--- a/toolkit/inc/controls/table/AccessibleGridControlBase.hxx
+++ b/toolkit/inc/controls/table/AccessibleGridControlBase.hxx
@@ -44,7 +44,7 @@ namespace accessibility {
implements basic functionality. */
class AccessibleGridControlBase
: public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible,
css::lang::XServiceInfo>
+ css::lang::XServiceInfo>
{
public:
/** Constructor.
@@ -61,11 +61,6 @@ protected:
virtual void SAL_CALL disposing() override;
public:
- // XAccessible
- /** @return The XAccessibleContext interface of this object. */
- virtual css::uno::Reference<css::accessibility::XAccessibleContext>
SAL_CALL
- getAccessibleContext() override;
-
// XAccessibleContext
/** @return A reference to the parent accessible object. */
diff --git a/toolkit/source/controls/table/AccessibleGridControlBase.cxx
b/toolkit/source/controls/table/AccessibleGridControlBase.cxx
index 2e90287260d7..c22df05d7a26 100644
--- a/toolkit/source/controls/table/AccessibleGridControlBase.cxx
+++ b/toolkit/source/controls/table/AccessibleGridControlBase.cxx
@@ -64,16 +64,6 @@ void SAL_CALL AccessibleGridControlBase::disposing()
//m_aTable = NULL;
}
-// css::accessibility::XAccessible
-
-css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL
AccessibleGridControlBase::getAccessibleContext()
-{
- SolarMutexGuard g;
-
- ensureAlive();
- return this;
-}
-
// css::accessibility::XAccessibleContext
css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
AccessibleGridControlBase::getAccessibleParent()
diff --git a/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx
b/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx
index d7f27ca1dac8..92454ad42efe 100644
--- a/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx
+++ b/vcl/inc/accessibility/accessibleiconchoicectrlentry.hxx
@@ -32,12 +32,10 @@
class SvtIconChoiceCtrl;
-typedef ::cppu::ImplInheritanceHelper< comphelper::OAccessibleComponentHelper
- , css::accessibility::XAccessible
- ,
css::accessibility::XAccessibleText
- ,
css::accessibility::XAccessibleAction
- , css::lang::XServiceInfo
- , css::lang::XEventListener >
AccessibleIconChoiceCtrlEntry_BASE;
+typedef ::cppu::ImplInheritanceHelper<
+ comphelper::OAccessibleComponentHelper,
css::accessibility::XAccessibleText,
+ css::accessibility::XAccessibleAction, css::lang::XServiceInfo,
css::lang::XEventListener>
+ AccessibleIconChoiceCtrlEntry_BASE;
/** the class AccessibleListBoxEntry represents the class for an accessible
object of a listbox entry */
class AccessibleIconChoiceCtrlEntry final : public
AccessibleIconChoiceCtrlEntry_BASE,
@@ -94,9 +92,6 @@ public:
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
override;
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
diff --git a/vcl/inc/accessibility/accessiblelistboxentry.hxx
b/vcl/inc/accessibility/accessiblelistboxentry.hxx
index 31814e6431a0..47c0ec4eb908 100644
--- a/vcl/inc/accessibility/accessiblelistboxentry.hxx
+++ b/vcl/inc/accessibility/accessiblelistboxentry.hxx
@@ -36,13 +36,11 @@ class AccessibleListBox;
class SvTreeListEntry;
// class AccessibleListBoxEntry ------------------------------------------
-typedef cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper
- , css::accessibility::XAccessible
- ,
css::accessibility::XAccessibleAction
- ,
css::accessibility::XAccessibleSelection
- ,
css::accessibility::XAccessibleText
- ,
css::accessibility::XAccessibleValue
- , css::lang::XServiceInfo >
AccessibleListBoxEntry_BASE;
+typedef cppu::ImplInheritanceHelper<
+ comphelper::OAccessibleComponentHelper,
css::accessibility::XAccessibleAction,
+ css::accessibility::XAccessibleSelection,
css::accessibility::XAccessibleText,
+ css::accessibility::XAccessibleValue, css::lang::XServiceInfo>
+ AccessibleListBoxEntry_BASE;
/** the class AccessibleListBoxEntry represents the class for an accessible
object of a listbox entry */
class AccessibleListBoxEntry final : public AccessibleListBoxEntry_BASE
@@ -102,9 +100,6 @@ private:
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
diff --git a/vcl/inc/accessibility/accessiblemenubasecomponent.hxx
b/vcl/inc/accessibility/accessiblemenubasecomponent.hxx
index 06f177712c77..d6b0c7941c94 100644
--- a/vcl/inc/accessibility/accessiblemenubasecomponent.hxx
+++ b/vcl/inc/accessibility/accessiblemenubasecomponent.hxx
@@ -34,9 +34,8 @@ class VclMenuEvent;
class OAccessibleMenuItemComponent;
-class OAccessibleMenuBaseComponent : public cppu::ImplInheritanceHelper<
-
comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible,
+class OAccessibleMenuBaseComponent
+ : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
css::lang::XServiceInfo>
{
friend class OAccessibleMenuItemComponent;
@@ -112,9 +111,6 @@ public:
// XServiceInfo
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleStateSet( ) override;
};
diff --git a/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx
b/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx
index 65849fa70f41..f9577bdc8957 100644
--- a/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx
+++ b/vcl/inc/accessibility/vclxaccessibleheaderbaritem.hxx
@@ -32,10 +32,9 @@ class HeaderBar;
// class VCLXAccessibleHeaderBarItem
// ----------------------------------------------------
-class VCLXAccessibleHeaderBarItem final : public cppu::ImplInheritanceHelper<
-
comphelper::OAccessibleComponentHelper,
- css::accessibility::XAccessible,
- css::lang::XServiceInfo>
+class VCLXAccessibleHeaderBarItem final
+ : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
+ css::lang::XServiceInfo>
{
private:
VclPtr<HeaderBar> m_pHeadBar;
@@ -55,9 +54,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
diff --git a/vcl/inc/accessibility/vclxaccessiblelistitem.hxx
b/vcl/inc/accessibility/vclxaccessiblelistitem.hxx
index e2cc1b1f8492..312c6a351740 100644
--- a/vcl/inc/accessibility/vclxaccessiblelistitem.hxx
+++ b/vcl/inc/accessibility/vclxaccessiblelistitem.hxx
@@ -26,9 +26,9 @@
#include <accessibility/vclxaccessiblelist.hxx>
class VCLXAccessibleListItem final
- : public cppu::ImplInheritanceHelper<
- comphelper::OAccessibleComponentHelper,
css::accessibility::XAccessible,
- css::accessibility::XAccessibleText, css::lang::XServiceInfo>,
+ : public
cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,
+ css::accessibility::XAccessibleText,
+ css::lang::XServiceInfo>,
public comphelper::OCommonAccessibleText
{
private:
@@ -74,9 +74,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
diff --git a/vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx
b/vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx
index e7752a83199a..7f27fa77c7b9 100644
--- a/vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx
+++ b/vcl/inc/accessibility/vclxaccessiblestatusbaritem.hxx
@@ -26,11 +26,8 @@
#include <vcl/status.hxx>
#include <vcl/vclptr.hxx>
-
-class VCLXAccessibleStatusBarItem final : public cppu::ImplInheritanceHelper<
-
comphelper::OAccessibleTextHelper,
- css::accessibility::XAccessible,
- css::lang::XServiceInfo>
+class VCLXAccessibleStatusBarItem final
+ : public cppu::ImplInheritanceHelper<comphelper::OAccessibleTextHelper,
css::lang::XServiceInfo>
{
friend class VCLXAccessibleStatusBar;
@@ -69,9 +66,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild(sal_Int64) override;
diff --git a/vcl/inc/accessibility/vclxaccessibletabpage.hxx
b/vcl/inc/accessibility/vclxaccessibletabpage.hxx
index 68b6bcc019fc..b76567819d34 100644
--- a/vcl/inc/accessibility/vclxaccessibletabpage.hxx
+++ b/vcl/inc/accessibility/vclxaccessibletabpage.hxx
@@ -28,11 +28,8 @@
class TabControl;
-
-class VCLXAccessibleTabPage final : public cppu::ImplInheritanceHelper<
- comphelper::OAccessibleTextHelper,
- css::accessibility::XAccessible,
- css::lang::XServiceInfo>
+class VCLXAccessibleTabPage final
+ : public cppu::ImplInheritanceHelper<comphelper::OAccessibleTextHelper,
css::lang::XServiceInfo>
{
friend class VCLXAccessibleTabControl;
@@ -79,9 +76,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
diff --git a/vcl/inc/accessibility/vclxaccessibletoolboxitem.hxx
b/vcl/inc/accessibility/vclxaccessibletoolboxitem.hxx
index 16d85a166c37..69dac4afe9c0 100644
--- a/vcl/inc/accessibility/vclxaccessibletoolboxitem.hxx
+++ b/vcl/inc/accessibility/vclxaccessibletoolboxitem.hxx
@@ -27,13 +27,10 @@
#include <vcl/toolbox.hxx>
#include <vcl/vclptr.hxx>
-
-class VCLXAccessibleToolBoxItem final : public cppu::ImplInheritanceHelper<
- comphelper::OAccessibleTextHelper,
- css::accessibility::XAccessible,
-
css::accessibility::XAccessibleAction,
-
css::accessibility::XAccessibleValue,
- css::lang::XServiceInfo>
+class VCLXAccessibleToolBoxItem final
+ : public cppu::ImplInheritanceHelper<
+ comphelper::OAccessibleTextHelper,
css::accessibility::XAccessibleAction,
+ css::accessibility::XAccessibleValue, css::lang::XServiceInfo>
{
private:
OUString m_sOldName;
@@ -90,9 +87,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName )
override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
override;
- // XAccessible
- virtual css::uno::Reference< css::accessibility::XAccessibleContext >
SAL_CALL getAccessibleContext( ) override;
-
// XAccessibleContext
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int64 i ) override;
diff --git a/vcl/source/accessibility/AccessibleBrowseBoxBase.cxx
b/vcl/source/accessibility/AccessibleBrowseBoxBase.cxx
index 80e3ce56d4a7..6ba252a8d9df 100644
--- a/vcl/source/accessibility/AccessibleBrowseBoxBase.cxx
+++ b/vcl/source/accessibility/AccessibleBrowseBoxBase.cxx
@@ -94,16 +94,6 @@ css::awt::Rectangle AccessibleBrowseBoxBase::implGetBounds()
return vcl::unohelper::ConvertToAWTRect(implGetBoundingBox());
}
-// css::accessibility::XAccessible
-
-Reference<css::accessibility::XAccessibleContext>
- SAL_CALL AccessibleBrowseBoxBase::getAccessibleContext()
-{
- osl::MutexGuard aGuard(getMutex());
- ensureIsAlive();
- return this;
-}
-
// css::accessibility::XAccessibleContext
Reference< css::accessibility::XAccessible > SAL_CALL
AccessibleBrowseBoxBase::getAccessibleParent()
diff --git a/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx
b/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx
index afca02a39458..161137a780b8 100644
--- a/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx
+++ b/vcl/source/accessibility/accessibleiconchoicectrlentry.cxx
@@ -203,14 +203,6 @@ sal_Bool SAL_CALL
AccessibleIconChoiceCtrlEntry::supportsService( const OUString
return cppu::supportsService(this, _rServiceName);
}
-// XAccessible
-
-Reference< XAccessibleContext > SAL_CALL
AccessibleIconChoiceCtrlEntry::getAccessibleContext( )
-{
- EnsureIsAlive();
- return this;
-}
-
// XAccessibleContext
sal_Int64 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChildCount( )
diff --git a/vcl/source/accessibility/accessiblelistboxentry.cxx
b/vcl/source/accessibility/accessiblelistboxentry.cxx
index b687b1f5202e..cec4748ac174 100644
--- a/vcl/source/accessibility/accessiblelistboxentry.cxx
+++ b/vcl/source/accessibility/accessiblelistboxentry.cxx
@@ -216,14 +216,6 @@ sal_Bool SAL_CALL AccessibleListBoxEntry::supportsService(
const OUString& _rSer
return cppu::supportsService(this, _rServiceName);
}
-// XAccessible
-
-Reference< XAccessibleContext > SAL_CALL
AccessibleListBoxEntry::getAccessibleContext( )
-{
- EnsureIsAlive();
- return this;
-}
-
// XAccessibleContext
sal_Int64 SAL_CALL AccessibleListBoxEntry::getAccessibleChildCount( )
diff --git a/vcl/source/accessibility/accessiblemenubasecomponent.cxx
b/vcl/source/accessibility/accessiblemenubasecomponent.cxx
index 9d7fe0bdf6f2..bd7f93b1837d 100644
--- a/vcl/source/accessibility/accessiblemenubasecomponent.cxx
+++ b/vcl/source/accessibility/accessiblemenubasecomponent.cxx
@@ -632,18 +632,6 @@ sal_Bool OAccessibleMenuBaseComponent::supportsService(
const OUString& rService
return cppu::supportsService(this, rServiceName);
}
-
-// XAccessible
-
-
-Reference< XAccessibleContext >
OAccessibleMenuBaseComponent::getAccessibleContext( )
-{
- OExternalLockGuard aGuard( this );
-
- return this;
-}
-
-
// XAccessibleContext
diff --git a/vcl/source/accessibility/vclxaccessiblecomponent.cxx
b/vcl/source/accessibility/vclxaccessiblecomponent.cxx
index fb62b7afe960..f2ce96d9a028 100644
--- a/vcl/source/accessibility/vclxaccessiblecomponent.cxx
+++ b/vcl/source/accessibility/vclxaccessiblecomponent.cxx
@@ -501,15 +501,6 @@ TRANSIENT
*/
}
-// XAccessible
-
-css::uno::Reference<com::sun::star::accessibility::XAccessibleContext>
-VCLXAccessibleComponent::getAccessibleContext()
-{
- OExternalLockGuard aGuard(this);
- return this;
-}
-
// accessibility::XAccessibleContext
sal_Int64 VCLXAccessibleComponent::getAccessibleChildCount()
{
diff --git a/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx
b/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx
index 8f2bdc0018d7..8053d1ec0690 100644
--- a/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx
+++ b/vcl/source/accessibility/vclxaccessibleheaderbaritem.cxx
@@ -98,13 +98,6 @@ Sequence< OUString >
VCLXAccessibleHeaderBarItem::getSupportedServiceNames()
return { u"com.sun.star.awt.AccessibleHeaderBarItem"_ustr };
}
-// XAccessible
-Reference< XAccessibleContext >
VCLXAccessibleHeaderBarItem::getAccessibleContext()
-{
- return this;
-}
-
-
// XAccessibleContext
diff --git a/vcl/source/accessibility/vclxaccessiblelistitem.cxx
b/vcl/source/accessibility/vclxaccessiblelistitem.cxx
index 1564e60cc2da..fd9814bb33ed 100644
--- a/vcl/source/accessibility/vclxaccessiblelistitem.cxx
+++ b/vcl/source/accessibility/vclxaccessiblelistitem.cxx
@@ -169,13 +169,6 @@ Sequence< OUString >
VCLXAccessibleListItem::getSupportedServiceNames()
u"com.sun.star.accessibility.AccessibleListItem"_ustr};
}
-// XAccessible
-
-Reference< XAccessibleContext > SAL_CALL
VCLXAccessibleListItem::getAccessibleContext( )
-{
- return this;
-}
-
// XAccessibleContext
sal_Int64 SAL_CALL VCLXAccessibleListItem::getAccessibleChildCount( )
diff --git a/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx
b/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx
index 8cf1a648976f..0842522a8ad5 100644
--- a/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx
+++ b/vcl/source/accessibility/vclxaccessiblestatusbaritem.cxx
@@ -209,18 +209,6 @@ Sequence< OUString >
VCLXAccessibleStatusBarItem::getSupportedServiceNames()
return { u"com.sun.star.awt.AccessibleStatusBarItem"_ustr };
}
-
-// XAccessible
-
-
-Reference< XAccessibleContext >
VCLXAccessibleStatusBarItem::getAccessibleContext( )
-{
- OExternalLockGuard aGuard( this );
-
- return this;
-}
-
-
// XAccessibleContext
diff --git a/vcl/source/accessibility/vclxaccessibletabpage.cxx
b/vcl/source/accessibility/vclxaccessibletabpage.cxx
index 17f0986c39a2..42dc51ac5ddf 100644
--- a/vcl/source/accessibility/vclxaccessibletabpage.cxx
+++ b/vcl/source/accessibility/vclxaccessibletabpage.cxx
@@ -251,18 +251,6 @@ Sequence< OUString >
VCLXAccessibleTabPage::getSupportedServiceNames()
return { u"com.sun.star.awt.AccessibleTabPage"_ustr };
}
-
-// XAccessible
-
-
-Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext( )
-{
- OExternalLockGuard aGuard( this );
-
- return this;
-}
-
-
// XAccessibleContext
diff --git a/vcl/source/accessibility/vclxaccessibletoolboxitem.cxx
b/vcl/source/accessibility/vclxaccessibletoolboxitem.cxx
index 145e67d15a63..61090ced9420 100644
--- a/vcl/source/accessibility/vclxaccessibletoolboxitem.cxx
+++ b/vcl/source/accessibility/vclxaccessibletoolboxitem.cxx
@@ -273,13 +273,6 @@ Sequence< OUString >
VCLXAccessibleToolBoxItem::getSupportedServiceNames()
u"com.sun.star.accessibility.AccessibleToolBoxItem"_ustr};
}
-// XAccessible
-
-Reference< XAccessibleContext > SAL_CALL
VCLXAccessibleToolBoxItem::getAccessibleContext( )
-{
- return this;
-}
-
// XAccessibleContext
sal_Int64 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChildCount( )
