diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 11:51:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 19:01:24 +0000 |
| commit | fc2f4eb5ca457860605d0d93baa0d2198800bcbf (patch) | |
| tree | 26c8e41bd8d1fbc0827ca3ec09d249ccdda76ad1 /accessibility | |
| parent | ce1fbb09746bbc007c6286ead29e351ec5c06c0e (diff) | |
Use ImplInheritanceHelper in OAccessibleMenuComponent
Change-Id: I7399a7e707d4a5915925d2e1b606ed7f6a364337
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146182
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/standard/accessiblemenucomponent.hxx | 18 | ||||
| -rw-r--r-- | accessibility/source/standard/accessiblemenucomponent.cxx | 12 |
2 files changed, 5 insertions, 25 deletions
diff --git a/accessibility/inc/standard/accessiblemenucomponent.hxx b/accessibility/inc/standard/accessiblemenucomponent.hxx index 1e3feb81cb29..90c89922654a 100644 --- a/accessibility/inc/standard/accessiblemenucomponent.hxx +++ b/accessibility/inc/standard/accessiblemenucomponent.hxx @@ -21,15 +21,13 @@ #include <standard/accessiblemenubasecomponent.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> -typedef ::cppu::ImplHelper1< - css::accessibility::XAccessibleSelection > OAccessibleMenuComponent_BASE; - -class OAccessibleMenuComponent : public OAccessibleMenuBaseComponent, - public OAccessibleMenuComponent_BASE +class OAccessibleMenuComponent : public cppu::ImplInheritanceHelper< + OAccessibleMenuBaseComponent, + css::accessibility::XAccessibleSelection> { protected: virtual bool IsEnabled() override; @@ -40,15 +38,9 @@ protected: // OCommonAccessibleComponent virtual css::awt::Rectangle implGetBounds( ) override; - using OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent; - public: - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() + OAccessibleMenuComponent( Menu* pMenu ): ImplInheritanceHelper(pMenu) {} // XAccessibleContext virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override; diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index 4b6323126252..92718c9b52ba 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.cxx @@ -121,18 +121,6 @@ awt::Rectangle OAccessibleMenuComponent::implGetBounds() } -// XInterface - - -IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleMenuComponent, OAccessibleMenuBaseComponent, OAccessibleMenuComponent_BASE ) - - -// XTypeProvider - - -IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuComponent, OAccessibleMenuBaseComponent, OAccessibleMenuComponent_BASE ) - - // XAccessibleContext |