diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-26 17:24:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-27 08:32:21 +0000 |
| commit | 2f7dee3a2dd6c8696fc2929275fb6ab05b44a30d (patch) | |
| tree | ba7169127818afac0b5e1f051d2b66bfb72acb05 /accessibility | |
| parent | 969b3f1e5416bfbec8d8bf2871a8176393ddaa22 (diff) | |
Use ImplInheritanceHelper in VCLXAccessibleMenu
Change-Id: Ia086713b06cd9525e5bb03e74a1908bdd6058b18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146233
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/inc/standard/vclxaccessiblemenu.hxx | 19 | ||||
| -rw-r--r-- | accessibility/source/standard/vclxaccessiblemenu.cxx | 12 |
2 files changed, 6 insertions, 25 deletions
diff --git a/accessibility/inc/standard/vclxaccessiblemenu.hxx b/accessibility/inc/standard/vclxaccessiblemenu.hxx index e866a53a3d8a..ce7b3f0580de 100644 --- a/accessibility/inc/standard/vclxaccessiblemenu.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx @@ -22,29 +22,22 @@ #include <standard/vclxaccessiblemenuitem.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> -typedef ::cppu::ImplHelper1 < - css::accessibility::XAccessibleSelection > VCLXAccessibleMenu_BASE; - -class VCLXAccessibleMenu final : public VCLXAccessibleMenuItem, - public VCLXAccessibleMenu_BASE +class VCLXAccessibleMenu final : + public cppu::ImplInheritanceHelper< + VCLXAccessibleMenuItem, css::accessibility::XAccessibleSelection> { virtual bool IsFocused() override; virtual bool IsPopupMenuOpen() override; sal_Int64 implGetSelectedAccessibleChildCount(); public: - using VCLXAccessibleMenuItem::VCLXAccessibleMenuItem; - - // XInterface - DECLARE_XINTERFACE() - - // XTypeProvider - DECLARE_XTYPEPROVIDER() + VCLXAccessibleMenu( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = nullptr ): + ImplInheritanceHelper(pParent, nItemPos, pMenu) {} // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx index e3ad7c118014..5d1d54e4009f 100644 --- a/accessibility/source/standard/vclxaccessiblemenu.cxx +++ b/accessibility/source/standard/vclxaccessiblemenu.cxx @@ -61,18 +61,6 @@ bool VCLXAccessibleMenu::IsPopupMenuOpen() } -// XInterface - - -IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, VCLXAccessibleMenu_BASE ) - - -// XTypeProvider - - -IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, VCLXAccessibleMenu_BASE ) - - // XServiceInfo |