diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-27 16:16:33 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-28 17:44:41 +0000 |
| commit | 000d88c53a60da1a12ff7c5feae9f21b940b72c5 (patch) | |
| tree | d373bc9fed7f9f47a154c77b0a4fcc42bb9dcfb5 /svx | |
| parent | 0a55335ef3b91bbf573f6e5eaa4241d14a15a4ee (diff) | |
Use ImplInheritanceHelper in SvxRectCtlChildAccessibleContext
Change-Id: I1e8fd8a9457925af7278e8006e7ad331f612b3ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146285
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/accessibility/svxrectctaccessiblecontext.cxx | 3 | ||||
| -rw-r--r-- | svx/source/inc/svxrectctaccessiblecontext.hxx | 16 |
2 files changed, 5 insertions, 14 deletions
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index f5cb1eaf3611..9366c4f6d44c 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -638,7 +638,4 @@ void SvxRectCtlChildAccessibleContext::FireFocusEvent() NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED, aOld, aNew); } -IMPLEMENT_FORWARD_XINTERFACE2( SvxRectCtlChildAccessibleContext, OAccessibleComponentHelper, OAccessibleHelper_Base_3 ) -IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxRectCtlChildAccessibleContext, OAccessibleComponentHelper, OAccessibleHelper_Base_3 ) - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 97552901d8b1..f44338ade754 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/accessibility/XAccessibleValue.hpp> #include <com/sun/star/uno/Reference.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/implbase3.hxx> #include <comphelper/accessibleselectionhelper.hxx> #include <rtl/ref.hxx> #include <svx/rectenum.hxx> @@ -128,13 +127,11 @@ private: tools::Long mnSelectedChild; }; -typedef ::cppu::ImplHelper3 < css::accessibility::XAccessible, - css::accessibility::XAccessibleValue, - css::accessibility::XAccessibleAction - > OAccessibleHelper_Base_3; - -class SvxRectCtlChildAccessibleContext final : public ::comphelper::OAccessibleComponentHelper, - public OAccessibleHelper_Base_3 +class SvxRectCtlChildAccessibleContext final : public cppu::ImplInheritanceHelper< + ::comphelper::OAccessibleComponentHelper, + css::accessibility::XAccessible, + css::accessibility::XAccessibleValue, + css::accessibility::XAccessibleAction> { public: SvxRectCtlChildAccessibleContext( @@ -143,9 +140,6 @@ public: const tools::Rectangle& rBoundingBox, tools::Long nIndexInParent ); - DECLARE_XINTERFACE( ) - DECLARE_XTYPEPROVIDER( ) - // XAccessibleComponent virtual void SAL_CALL grabFocus() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override; |