diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-02-09 10:55:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-02-09 14:16:17 +0100 |
| commit | dce85afb01c74eddb2cec3656fa76867aa131bd1 (patch) | |
| tree | 6751ad19213e2c51c534139c03df6756dc276ff9 /toolkit/source | |
| parent | d794c377e503aa7d00dbc6daad0aa32efad9e682 (diff) | |
expand out IMPLEMENT_FORWARD_XTYPEPROVIDER3
Change-Id: I31a7452bd8822f13905812e8f3fcd31a0753e0a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129711
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit/source')
| -rw-r--r-- | toolkit/source/awt/vclxaccessiblecomponent.cxx | 10 | ||||
| -rw-r--r-- | toolkit/source/controls/accessiblecontrolcontext.cxx | 12 |
2 files changed, 19 insertions, 3 deletions
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index b13eeb1ade52..767004c3539d 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -80,7 +80,15 @@ VCLXAccessibleComponent::~VCLXAccessibleComponent() } IMPLEMENT_FORWARD_XINTERFACE3( VCLXAccessibleComponent, OAccessibleExtendedComponentHelper, OAccessibleImplementationAccess, VCLXAccessibleComponent_BASE ) -IMPLEMENT_FORWARD_XTYPEPROVIDER3( VCLXAccessibleComponent, OAccessibleExtendedComponentHelper, OAccessibleImplementationAccess, VCLXAccessibleComponent_BASE ) +css::uno::Sequence< css::uno::Type > SAL_CALL VCLXAccessibleComponent::getTypes() +{ + return ::comphelper::concatSequences( + OAccessibleExtendedComponentHelper::getTypes(), + OAccessibleImplementationAccess::getTypes(), + VCLXAccessibleComponent_BASE::getTypes() + ); +} +IMPLEMENT_GET_IMPLEMENTATION_ID( VCLXAccessibleComponent ) OUString VCLXAccessibleComponent::getImplementationName() { diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index 5b4be7ed0d84..219b4a610a40 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -58,9 +58,17 @@ namespace toolkit } + // (order matters: the first is the class name, the second is the class doing the ref counting) IMPLEMENT_FORWARD_XINTERFACE3( OAccessibleControlContext, OAccessibleControlContext_Base, OAccessibleImplementationAccess, OAccessibleControlContext_IBase ) - IMPLEMENT_FORWARD_XTYPEPROVIDER3( OAccessibleControlContext, OAccessibleControlContext_Base, OAccessibleImplementationAccess, OAccessibleControlContext_IBase ) - // (order matters: the first is the class name, the second is the class doing the ref counting) + css::uno::Sequence< css::uno::Type > SAL_CALL OAccessibleControlContext::getTypes() + { + return ::comphelper::concatSequences( + OAccessibleControlContext_Base::getTypes(), + OAccessibleImplementationAccess::getTypes(), + OAccessibleControlContext_IBase::getTypes() + ); + } + IMPLEMENT_GET_IMPLEMENTATION_ID( OAccessibleControlContext ) void OAccessibleControlContext::Init( const Reference< XAccessible >& _rxCreator ) |